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
..
AzRecord.cs	Core: fix cache	2021-06-16 22:25:02 +03:00
DBResourceManager.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
EmployeeActivationStatus.cs	init commit	2019-05-15 17:56:09 +03:00
EmployeeStatus.cs	init commit	2019-05-15 17:56:09 +03:00
EmployeeType.cs	fixed check confirm method	2020-07-02 19:14:03 +03:00
Group.cs	IDE0019, IDE0020	2019-08-15 16:41:38 +03:00
GroupInfo.cs	fix	2020-08-27 17:01:37 +03:00
IAzService.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
IncludeType.cs	init commit	2019-05-15 17:56:09 +03:00
IQuotaService.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
ISubscriptionService.cs	moved from 2e37dcd0	2020-12-28 16:22:08 +03:00
ITenantService.cs	moved from 043e301	2021-11-16 20:40:15 +03:00
IUserService.cs	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Partner.cs	Fix License	2020-07-08 18:30:23 +03:00
PartnerDisplayType.cs	init commit	2019-05-15 17:56:09 +03:00
PartnerPaymentMethod.cs	init commit	2019-05-15 17:56:09 +03:00
PartnerStatus.cs	init commit	2019-05-15 17:56:09 +03:00
PartnerType.cs	init commit	2019-05-15 17:56:09 +03:00
SubscriptionMethod.cs	Added sendjoininvite, sendadmmail	2020-07-24 17:01:20 +03:00
UserGroupRef.cs	fix	2020-08-27 17:01:37 +03:00
UserGroupRefDictionary.cs	init commit	2019-05-15 17:56:09 +03:00
UserGroupRefType.cs	init commit	2019-05-15 17:56:09 +03:00
UserInfo.cs	revert discard	2020-10-12 22:39:23 +03:00