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
..
Auth	asc.apicache	2022-12-16 15:41:09 +03:00
Convention	added new license headers	2022-03-15 21:00:53 +03:00
Core	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +03:00
Extensions	DI: fix startup	2023-04-12 14:07:37 +03:00
Log	refactoring	2022-08-09 19:13:07 +03:00
Middleware	nlog: CustomExceptionFilterAttribute change LogError => LogCritical	2023-06-15 19:03:00 +03:00
Model	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +03:00
Routing	fixed Bug 62708	2023-05-23 15:02:01 +03:00
Security	Core: Security: fixed validation	2023-06-27 14:17:46 +03:00
ASC.Api.Core.csproj	Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions	2023-08-01 11:39:57 +03:00
GlobalUsings.cs	asc.apicache	2022-12-16 15:41:09 +03:00