Commit Graph

213 Commits

Author SHA1 Message Date
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
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
746962bc06 Merge branch 'develop' into features/security-elasticsearch 2023-06-01 15:45:31 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03: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
8360f77177 Merge branch 'feature/optimization-ef' into feature/optimization-queries 2023-05-26 15:09:33 +03:00
dc6b076ea8 fix 2023-05-26 14:06:44 +03:00
8d088c30ce remove internal methods 2023-05-26 13:45:41 +03:00
f39b300a2e CompileAsyncQuery: BaseIndexer 2023-05-25 12:51:55 +03:00
d7cee576a0 fix async 2023-05-21 00:48:08 +03:00
76e80de7be fix ElasticSearchService- ReIndex 2023-05-21 00:23:44 +03:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
322fb1aba3 fixed slow stopping service 2023-05-10 10:51:26 +03:00
bdbe009f01 add Authentication and ApiKey for elasticsearch 2023-04-13 14:14:14 +03:00
07d847fdd1 Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
e1b01e2d81 fix methods with task and without async 2023-03-28 13:13:13 +03:00
0bcd45f0ce fix async 2023-03-28 10:43:46 +03:00
44317ee151 WebstudioDbContext -async 2023-03-24 19:24:59 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
393887f67b FilesDbContext- async 2023-03-15 16:24:02 +03:00
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +03:00
32e3769176 Search: exception handling 2023-03-13 14:51:32 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
8a8143950d replace CreateScope() => CreateScopeAsync() 2023-01-24 20:33:27 +03:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
ee04a7a55c removed unused dependencies 2022-11-24 14:40:13 +03:00
e17ef78c00 fix 2022-11-15 14:22:53 +03:00
56ad3d2287 fix 2022-11-15 13:53:53 +03:00
61b401d906 fix 2022-11-15 13:28:25 +03:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
789ab8f956 Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Core/FilesModule.cs
#	products/ASC.Files/Service/Core/FoldersModule.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
9edcce8858 moved from ddf515b8 2022-06-09 15:11:45 +03:00
91c4e454c5 add loggers 2022-05-20 18:24:41 +03:00
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
cf0e9c322d ElasticSearch: fix 2022-04-29 16:17:52 +03:00
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00