AlexeySafronov 6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io ... # Conflicts: # products/ASC.Files/Client/webpack.config.js # products/ASC.Files/Server/DocStore # yarn.lock		2022-01-10 11:06:32 +03:00
..
Billing	Merge branch 'master' into release/v1.1.0	2021-11-21 14:26:20 +03:00
Caching	moved from 043e301	2021-11-16 20:40:15 +03:00
Configuration	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
Context	moved from 043e301	2021-11-16 20:40:15 +03:00
Core	moved from 043e301	2021-11-16 20:40:15 +03:00
Data	moved from 043e301	2021-11-16 20:40:15 +03:00
EF	Files: fixed files_convert data	2021-11-30 14:35:43 +03:00
Encryption	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
Migrations	Files: fixed files_convert data	2021-11-30 14:35:43 +03:00
Notify	Web: Socket: Changed room settings	2021-12-30 15:54:23 +03:00
Properties	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
protos	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
Security	Merge branch 'develop' into feature/two-factor-auth	2021-06-07 11:54:06 +03:00
Settings	Scope: refactoring	2020-10-19 18:53:15 +03:00
Tenants	Quota: Price2 removed	2021-08-30 18:19:20 +03:00
Tests	Tests moved to separate projects.	2021-06-01 12:21:51 +03:00
Users	fixed warnings	2021-06-16 18:00:27 +03:00
WhiteLabel	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.Core.Common.csproj	fixed run via vs	2021-08-23 15:55:19 +03:00
BaseCommonLinkUtility.cs	Files: thumbnails. 2e37dcd0	2021-05-30 21:52:32 +03:00
GeolocationHelper.cs	private: firtst version	2020-08-12 12:58:08 +03:00
HostedSolution.cs	moved from 043e301	2021-11-16 20:40:15 +03:00
MultiRegionHostedSolution.cs	Refactoting & optimization	2020-11-24 13:15:11 +03:00