Sergey Linnik d2e23e3ed4 Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions ... # Conflicts: # common/ASC.Core.Common/Tenants/TenantQuota.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Server/Api/FoldersController.cs # products/ASC.Files/Server/Api/OperationController.cs # products/ASC.Files/Server/Api/SettingsController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/CapabilitiesController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs # web/ASC.Web.Api/Api/SmtpSettingsController.cs # web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs		2023-08-01 11:39:57 +03:00
..
Helpers	Revert "Revert "backend: removed X-REWRITER-URL header""	2023-05-10 13:07:24 +03:00
LoginProviders	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +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	async: fixed	2023-03-10 16:09:32 +03:00
ASC.FederatedLogin.csproj	Hide documentation warnings (4dfeea2969)	2023-03-29 20:29:53 +05: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