pavelbannov 6c78438b75 Merge branch 'develop' into feature/optimization-ef ... # Conflicts: # common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs # common/ASC.Core.Common/Context/Impl/TenantManager.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/RegionHelper.cs # common/ASC.Core.Common/Data/DbQuotaService.cs # common/ASC.Core.Common/GeolocationHelper.cs # common/ASC.Data.Backup.Core/Core/NotifyHelper.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs # products/ASC.Files/Service/Thumbnail/Builder.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/ConnectionsController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/RadicaleController.cs # web/ASC.Web.Api/Api/Settings/TfaappController.cs # web/ASC.Web.Api/Core/QuotaHelper.cs # web/ASC.Web.Core/Notify/NotifyConfiguration.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs		2023-05-30 14:13:02 +03:00
..
Extensions	Bug 62544 - Settings:Restore: add elastic.json in ASC.Data.Backup.BackgroundTasks	2023-05-12 14:56:36 +03:00
IntegrationEvents/EventHandling	add CustomSynchronizationContext	2023-03-27 15:04:50 +03:00
Log	remove waste modules	2022-08-30 14:16:41 +03:00
Properties	rebbitmq: split default queue on separate queue	2022-10-26 17:21:37 +03:00
Services	GetTenantAsync	2023-04-07 10:39:28 +03:00
appsettings.json	add support rabbitmq. split ASC.Data.Backup service on two services	2022-02-04 20:44:03 +03:00
ASC.Data.Backup.BackgroundTasks.csproj	merge from develop	2022-12-01 14:52:46 +03:00
GlobalUsings.cs	refactoring	2022-11-24 17:22:34 +03:00
Program.cs	refactoring	2023-02-27 18:38:01 +03:00
Startup.cs	DI: fix startup	2023-04-12 14:07:37 +03:00