pavelbannov 986561d4e9 Merge branch 'develop' into feature/delete-portal ... # Conflicts: # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Caching/CachedQuotaService.cs # common/ASC.Core.Common/Caching/CachedTenantService.cs # common/ASC.Core.Common/Context/Impl/TenantManager.cs # common/ASC.Core.Common/Core/ITenantService.cs # common/ASC.Core.Common/Data/DbAzService.cs # common/ASC.Core.Common/Data/DbQuotaService.cs # common/ASC.Core.Common/Data/DbSubscriptionService.cs # common/ASC.Core.Common/Data/DbTenantService.cs # common/ASC.Core.Common/Data/DbUserService.cs # common/ASC.Core.Common/HostedSolution.cs # common/ASC.Data.Backup.Core/Core/DbHelper.cs # common/ASC.Data.Storage/TenantQuotaController.cs # common/ASC.Feed/Data/FeedAggregateDataProvider.cs # common/ASC.Feed/Data/FeedReadedDataProvider.cs # common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs # common/services/ASC.ApiSystem/Controllers/PeopleController.cs # migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs # migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs # products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs # products/ASC.People/Server/Api/ThirdpartyController.cs # web/ASC.Web.Api/Api/AuthenticationController.cs # web/ASC.Web.Api/Api/ConnectionsController.cs # web/ASC.Web.Api/Api/PortalController.cs # web/ASC.Web.Api/Api/Settings/LicenseController.cs # web/ASC.Web.Core/HttpHandlers/SsoHandler.cs # web/ASC.Web.Core/Sms/SmsManager.cs # web/ASC.Web.Core/Tfa/TfaManager.cs		2023-06-08 15:53:31 +03:00
..
Data	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +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