Commit Graph

115 Commits

Author SHA1 Message Date
43c7b85a14 logger: used only nlog logger provider. 2023-07-18 20:08:55 +03:00
918f8a0618 logger: used only nlog logger provider. 2023-07-18 20:05:07 +03:00
d231ad2577 fix DbWorker 2023-07-10 10:53:53 +03:00
dff3333862 fix query 2023-06-29 11:32:05 +03:00
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
3d694ad5ae Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Webhooks.Core/EF/Model/WebhooksLog.cs
#	web/ASC.Web.Studio/GlobalUsings.cs
#	web/ASC.Web.Studio/Startup.cs
2023-06-19 11:46:35 +03:00
1905566b90 refactoring 2023-06-09 14:28:49 +03:00
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
f4f5edec05 Merge branch 'develop' into feature/webhooks-page
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
2023-06-06 01:49:14 +03:00
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
9b456a71ae fix 2023-06-01 15:59:17 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
Vladimir Khvan
7619fe03e8 Merge branch 'develop' into feature/webhooks-page 2023-05-31 16:05:47 +05:00
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
6c78438b75 Merge branch 'develop' into feature/optimization-ef
# Conflicts:
#	common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/RegionHelper.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/GeolocationHelper.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/RadicaleController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Core/QuotaHelper.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
2023-05-30 14:13:02 +03:00
20320a8fb1 CompileAsyncQuery:DbWorker 2023-05-29 15:01:13 +03:00
NikitaVashchuk
d1eeb6263c removed uri size limit for webhook config 2023-05-22 16:10:15 +05:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
819c6597f4 added translations 2023-05-18 18:23:26 +03:00
5521b925e8 Webhooks: added total for Webhooks journal 2023-05-16 12:22:53 +03:00
63b0370a07 Webhooks: fixed query 2023-05-16 11:51:02 +03:00
4f10368a78 added translations 2023-05-11 19:12:10 +03:00
a0293fee03 added translations 2023-05-10 18:42:42 +03:00
64c176855c Webhooks: optimization 2023-05-06 19:55:12 +03:00
82c38be053 update migration 2023-04-26 15:23:55 +03:00
ca9662e45b fix 2023-04-25 13:19:48 +03:00
146fc43d8a add "AddDbTenant" and foreignkeys 2023-04-25 00:27:54 +03:00
4a1e1a88e7 add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
NikitaVashchuk
c1d97f1462 changed ICacheNotify to IEventBus 2023-04-24 15:52:56 +05:00
NikitaVashchuk
828d4ca35c fix groupStatus 2023-04-18 14:58:18 +05:00
NikitaVashchuk
26c566e7d2 fix CreateWebhook, added query parameters for UpdateWebhook 2023-04-14 21:31:36 +05:00
NikitaVashchuk
61533655d5 added log filter by eventId 2023-04-12 16:35:15 +05:00
NikitaVashchuk
acff2c4439 fix ssl 2023-04-11 14:59:02 +05:00
NikitaVashchuk
3fc877a422 GetJournal(HttpGet("webhooks/log"): added group status for webhooks as bit flag; added deliveryFrom, deliveryTo; added search by configId;
GetTenantWebhooks(HttpGet("webhook")): added status for last webhook;
UpdateWebhook([HttpPut("webhook")]): added ssl option;
Updated db migrations
2023-04-06 23:46:23 +05:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
Vashchuk Nikita
e6005f5ab7 added name attribute, modified migrations 2023-03-14 21:27:12 +05:00
beb1834a0a EF: batch operations 2023-02-27 16:39:52 +03:00
0787427bce fix 2023-02-21 15:12:57 +03:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
d5d8373125 EnableSSLVerification is true by default 2023-02-15 15:06:22 +03:00
afe82d599d ASC.Webhooks.Service moved to ASC.Web.Studio 2023-02-08 20:31:58 +03:00
6d363d4abd Webhooks: settings 2023-02-08 14:46:33 +03:00
e58175f69e WebHooks: added resources, new methods and settings for disable webhook 2023-02-08 14:17:06 +03:00
d49ee80fd8 Merge branch 'develop' into feature/fix-webhooks-second 2023-02-08 13:18:59 +03:00
Vashchuk Nikita
d8b9fada67 added functionality for disable SSL verification on WebhookSender requests 2023-01-31 00:25:51 +05:00
Vashchuk Nikita
cf37c1704d remove name from returned parameters 2023-01-30 21:31:31 +05:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00