pavelbannov 4dbf1e70b7 Merge branch 'develop' into feature/stripe ... # Conflicts: # common/ASC.ActiveDirectory/GlobalUsings.cs # common/ASC.Data.Storage/StorageFactory.cs # common/ASC.Data.Storage/TenantQuotaController.cs # migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs # migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs # packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js # products/ASC.People/Server/Api/UserController.cs # products/ASC.People/Server/GlobalUsings.cs # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Core/PublicResources/Resource.resx # web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs		2022-10-10 19:16:03 +03:00
..
DbAzService.cs	Common: added dbcontext pool	2022-07-28 15:29:03 +03:00
DbLoginEventsManager.cs	Common, files: added dbcontext pool	2022-07-28 21:00:49 +03:00
DbQuotaService.cs	removed DbUsersQuotaRow	2022-10-07 16:37:57 +03:00
DbSettingsManager.cs	Quota: fix	2022-10-06 15:55:47 +03:00
DbSubscriptionService.cs	Common: added dbcontext pool	2022-07-28 15:29:03 +03:00
DbTenantService.cs	Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController	2022-08-25 23:09:12 +03:00
DbUserService.cs	Common: added dbcontext pool	2022-07-28 15:29:03 +03:00