pavelbannov bfb9a096e6 Merge branch 'develop' into feature/optimization-queries ... # Conflicts: # common/ASC.Core.Common/Billing/License/LicenseReader.cs # common/ASC.Core.Common/Billing/TariffService.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.Data.Backup.Core/Core/DbHelper.cs # common/ASC.Feed/Data/FeedAggregateDataProvider.cs # common/ASC.Feed/Data/FeedReadedDataProvider.cs # common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs # common/ASC.Webhooks.Core/DbWorker.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs		2023-06-27 18:29:23 +03:00
..
Config	fix bug 61992	2023-05-05 21:44:35 +05:00
Extensions	nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property	2022-09-15 17:44:04 +03:00
IntegrationEvents/EventHandling	add CustomSynchronizationContext	2023-03-27 15:04:50 +03:00
Log	add logger	2022-05-13 14:02:39 +03:00
Properties	rebbitmq: split default queue on separate queue	2022-10-26 17:21:37 +03:00
Services	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
appsettings.json	Added notify service	2019-07-29 12:15:48 +03:00
ASC.Notify.csproj	migrate from .net6 to .net7	2022-11-10 13:10:18 +03:00
DbWorker.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
GlobalUsings.cs	fix usings	2022-11-07 12:34:50 +03:00
MailSendingState.cs	added new license headers	2022-03-15 21:00:53 +03:00
Program.cs	fix ide001	2022-11-07 12:49:29 +03:00
Startup.cs	DI: fix startup	2023-04-12 14:07:37 +03:00