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
..
EF	Merge branch 'develop' into feature/delete-portal	2023-06-19 11:46:35 +03:00
IntegrationEvents/Events	changed ICacheNotify to IEventBus	2023-04-24 15:52:56 +05:00
proto	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
Resources	added translations	2023-05-18 18:23:26 +03:00
ASC.Webhooks.Core.csproj	WebHooks: added resources, new methods and settings for disable webhook	2023-02-08 14:17:06 +03:00
DbWorker.cs	Merge branch 'develop' into feature/optimization-queries	2023-06-27 18:29:23 +03:00
GlobalUsings.cs	changed ICacheNotify to IEventBus	2023-04-24 15:52:56 +05:00
IWebhookPublisher.cs	added new table	2023-02-21 14:22:34 +03:00
WebhookManager.cs	added new table	2023-02-21 14:22:34 +03:00
WebhookPublisher.cs	CompileAsyncQuery:DbWorker	2023-05-29 15:01:13 +03:00
WebHooksSettings.cs	GetJournal(HttpGet("webhooks/log"): added group status for webhooks as bit flag; added deliveryFrom, deliveryTo; added search by configId;	2023-04-06 23:46:23 +05:00