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
..
Api	Merge branch 'develop' into feature/delete-portal	2023-06-08 15:53:31 +03:00
ApiModels	Merge branch 'develop' into feature/optimization-ef	2023-05-17 11:01:32 +03:00
Log	Log: refactoring	2022-05-26 12:01:54 +03:00
Properties
Resources	added translations	2023-05-11 19:12:10 +03:00
.gitignore
appsettings.json
ASC.People.csproj	Merge pull request #1149 from ONLYOFFICE/feature/dotnet7	2023-01-19 22:00:57 +03:00
GlobalUsings.cs	CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture	2023-04-27 13:15:42 +03:00
PeopleProduct.cs	IDE1006	2022-03-25 19:26:06 +03:00
Program.cs	refactoring	2023-02-27 18:38:01 +03:00
Startup.cs	WebHooks: added resources, new methods and settings for disable webhook	2023-02-08 14:17:06 +03:00