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
..
Auth	UserDbContext - async	2023-03-24 10:53:49 +03:00
Convention	added new license headers	2022-03-15 21:00:53 +03:00
Core	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Extensions	Merge branch 'develop' into feature/optimization-ef	2023-05-17 11:01:32 +03:00
Log	refactoring	2022-08-09 19:13:07 +03:00
Middleware	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Model	Merge branch 'develop' into feature/optimization-ef	2023-05-17 11:01:32 +03:00
Routing	fixed Bug 62708	2023-05-23 15:02:01 +03:00
Security	fix merge	2023-04-06 17:24:14 +03:00
ASC.Api.Core.csproj	downgrade AspNetCore.HealthChecks.Elasticsearch	2023-03-07 15:30:08 +03:00
GlobalUsings.cs	asc.apicache	2022-12-16 15:41:09 +03:00