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
..
Helpers	Revert "Revert "backend: removed X-REWRITER-URL header""	2023-05-10 13:07:24 +03:00
LoginProviders	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Profile	fix ide001	2022-11-07 12:49:29 +03:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
AccountLinker.cs	fix async	2023-03-30 15:11:45 +03:00
ASC.FederatedLogin.csproj	update external dependency	2023-01-19 19:05:07 +03:00
callback.htm	Web: Fixed callback pages, added login callback for desktop client	2021-10-19 10:31:34 +03:00
GlobalUsings.cs	fix usings	2022-11-07 12:34:50 +03:00
Login.cs	Revert "Revert "backend: removed X-REWRITER-URL header""	2023-05-10 13:07:24 +03:00
LoginMode.cs	added new license headers	2022-03-15 21:00:53 +03:00
OAuth20Token.cs	fix usings	2022-11-07 12:34:50 +03:00
ProviderConstants.cs	moved from ddf515b8	2022-06-09 18:36:57 +03:00