pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop ... # Conflicts: # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Data.Storage/StorageHandler.cs # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # config/appsettings.json # config/nlog.config # migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs # migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs # packages/client/src/pages/Confirm/sub-components/createUser.js # packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js # packages/common/components/MoreLoginModal/index.tsx # packages/login/src/client/components/sub-components/LoginForm.tsx # products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs # products/ASC.Files/Core/Services/DocumentService/Configuration.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Core/CspSettingsHelper.cs # web/ASC.Web.Core/Users/UserManagerWrapper.cs # yarn.lock		2023-09-25 10:53:06 +03:00
..
AzRecordStore.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
CachedAzService.cs	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
CachedQuotaService.cs	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
CachedSubscriptionService.cs	UserDbContext - async	2023-03-24 10:53:49 +03:00
CachedTenantService.cs	Merge branch 'hotfix/v1.1.3' into develop	2023-09-25 10:53:06 +03:00
CachedUserService.cs	added counting users with filter	2023-08-01 12:47:33 +03:00
ICachedService.cs	added new license headers	2022-03-15 21:00:53 +03:00
UserGroupRefStore.cs	added new license headers	2022-03-15 21:00:53 +03:00