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
..
Settings	optimization	2022-10-09 19:35:59 +03:00
Skins	refactoring	2022-04-15 12:08:06 +03:00
CommonLinkUtility.cs	Web.Core: added confirm type	2022-09-14 14:50:03 +03:00
IFileUploadHandler.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
PasswordSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00
SearchHandlerManager.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00
TenantExtra.cs	Payment: rename	2022-09-19 18:20:21 +03:00
TenantLogoHelper.cs	refactoring	2022-04-15 12:08:06 +03:00
TransferResourceHelper.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00
UrlShortener.cs	refactoring	2022-04-15 12:08:06 +03:00
UrlSwitcher.cs	Merge branch 'feature/backend-refactor' into feature/warnings	2022-03-22 13:20:43 +03:00