AlexeySafronov bedfad1ec5 Merge branch 'master' into develop ... # Conflicts: # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs # common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/store/DialogsStore.js # products/ASC.Files/Client/src/store/FilesActionsStore.js # products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs # products/ASC.Files/Server/DocStore # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2021-12-28 18:21:44 +03:00
..
Billing	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Caching	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Configuration	Net: fix requests	2021-11-24 22:34:39 +03:00
Context	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Core	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Data	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
EF	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Encryption	net6: warning SYSLIB0023	2021-10-07 12:00:26 +03:00
Migrations	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Notify	Net: fix requests	2021-11-24 22:34:39 +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	net6: bugfix encrypt	2021-11-26 13:53: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	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +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