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
..
Data	Merge branch 'develop' into feature/optimization-ef	2023-04-06 17:24:05 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Models	- added functionality for adding ip restrictions for users and admins separately	2022-09-05 15:48:41 +04:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
Services	TenantDbContext -async part2	2023-03-22 11:27:01 +03:00
Utils	Merge branch 'develop' into feature/optimization-ef	2023-05-30 14:13:02 +03:00
ASC.IPSecurity.csproj	update external dependency	2023-01-19 19:05:07 +03:00
GlobalUsings.cs	fix usings	2022-11-07 12:34:50 +03:00
IpRestrictionsSettings.cs	Settings: ignore id	2022-07-12 15:33:46 +03:00