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
..
Data	async: fixed	2023-03-10 16:09:32 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Models	added more descriptions and data types	2023-04-25 19:23:54 +03:00
protos	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
Services	- added functionality for adding ip restrictions for users and admins separately	2022-09-05 15:48:41 +04:00
Utils	backend: using RemoteIpAddress method for get a client ip	2023-04-20 18:24:31 +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	added more descriptions and data types	2023-04-25 19:23:54 +03:00