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
..
Api	remove internal methods	2023-05-26 13:45:41 +03:00
DocStore@8933c733a8	DocsStore: remake update	2023-04-18 18:04:45 +05:00
Extensions	nlog: fixed config	2022-09-15 18:17:23 +03:00
Helpers	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
Log	add loggers	2022-05-12 11:14:00 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	merge from develop	2022-12-01 14:52:46 +03:00
GlobalUsings.cs	get reference data	2022-12-13 14:00:20 +03:00
ProductEntryPoint.cs	changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName	2023-03-09 16:40:36 +05:00
Program.cs	backend: refactoring	2023-02-20 23:10:49 +03:00
Startup.cs	WebHooks: added resources, new methods and settings for disable webhook	2023-02-08 14:17:06 +03:00