|
|
bce52a2549
|
fixed query
|
2023-06-28 13:52:14 +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 |
|
|
|
09ffbbba7e
|
create migration context
|
2023-06-21 15:40:55 +03:00 |
|
|
|
1905566b90
|
refactoring
|
2023-06-09 14:28:49 +03:00 |
|
|
|
ba345c0f06
|
fix merge
|
2023-06-09 14:04:55 +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 |
|
|
|
f5620a3666
|
Merge branch 'develop' into feature/optimization-queries
|
2023-06-01 23:52:40 +03:00 |
|
|
|
1f9ec5087b
|
fix
|
2023-06-01 14:30:20 +03:00 |
|
|
|
75ebc4ce65
|
fix await using
|
2023-06-01 14:27:27 +03:00 |
|
|
|
1dce9ba876
|
refactoring
|
2023-06-01 13:54:19 +03:00 |
|
|
|
eaa733b7fa
|
CompileAsyncQuery: TelegramDao
|
2023-05-31 18:03:36 +03:00 |
|
|
|
869519758a
|
CompileAsyncQuery: TariffService
|
2023-05-31 17:07:09 +03:00 |
|
|
|
a6cfdc252e
|
fix
|
2023-05-31 12:04:20 +03:00 |
|
|
|
9a3f0278a3
|
CompileAsyncQuery: RegisterInstanceDao
|
2023-05-31 10:55:03 +03:00 |
|
|
|
bd62a2a4fd
|
removed .result
|
2023-05-31 10:42:09 +03:00 |
|
|
|
dbbebc8c4b
|
CompileAsyncQuery: ProviderAccountDao
|
2023-05-30 22:23:11 +03:00 |
|
|
|
b99f5e24f3
|
CompileAsyncQuery: FirebaseDao
|
2023-05-30 14:15: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 |
|
|
|
7724669c7e
|
fix ef Find
|
2023-05-30 12:36:46 +03:00 |
|
|
|
f364696ae2
|
CompileAsyncQuery: DbUserService
|
2023-05-29 12:48:09 +03:00 |
|
|
|
845aaa085f
|
Quota: cache by region
|
2023-05-27 19:44:29 +03:00 |
|
|
|
5c2fb03209
|
fix
|
2023-05-26 18:44:27 +03:00 |
|
|
|
9dc458e64d
|
CompileAsyncQuery: DbTenantService
|
2023-05-26 17:41:44 +03:00 |
|
|
|
8360f77177
|
Merge branch 'feature/optimization-ef' into feature/optimization-queries
|
2023-05-26 15:09:33 +03:00 |
|
|
|
ce2bc4cb54
|
CompileAsyncQuery: DbSettingsManager
|
2023-05-26 11:24:58 +03:00 |
|
|
|
18d04bf45a
|
fix
|
2023-05-25 18:24:26 +03:00 |
|
|
|
2a1c97bf2a
|
CompileAsyncQuery: DbSettingsManager
|
2023-05-25 17:53:05 +03:00 |
|
|
|
b217384437
|
CompileAsyncQuery: DbRadicale
|
2023-05-25 17:36:01 +03:00 |
|
|
|
659eb22801
|
CompileAsyncQuery: DbQuotaService
|
2023-05-25 17:06:24 +03:00 |
|
|
|
fa17019f70
|
CompileAsyncQuery: DbLoginEventsManager
|
2023-05-25 16:29:51 +03:00 |
|
|
|
23171528ef
|
CompileAsyncQuery: DbAzService
|
2023-05-25 15:58:21 +03:00 |
|
|
|
76db809e3b
|
fix
|
2023-05-24 17:39:00 +03:00 |
|
|
|
d78a777a9d
|
fix
|
2023-05-24 17:16:41 +03:00 |
|
|
|
f34cab4bf3
|
remove wait
|
2023-05-24 10:15:16 +03:00 |
|
|
|
8d7219c0e0
|
async refactoring
|
2023-05-19 14:42:02 +03:00 |
|
|
|
5cc7d38737
|
fix
|
2023-05-18 19:26:23 +03:00 |
|
|
|
986361b4a0
|
People: new filter AccountLoginType
|
2023-05-17 11:20:27 +03:00 |
|
|
|
9b5d90ff6f
|
fix merge
|
2023-05-17 11:01:43 +03:00 |
|
|
|
5cbdfdef9b
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-17 11:01:32 +03:00 |
|
|
|
e0f82c1a86
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
|
2023-05-16 11:25:26 +03:00 |
|
|
|
fd45e59e51
|
transfer commit from cs (2e8788596a826d5bb2c015ae9f4314e8385188c6)
|
2023-05-15 20:49:23 +03:00 |
|
|
|
0338a029e8
|
Payments: fixed price for eu
|
2023-05-15 19:30:14 +03:00 |
|
|
|
4dc8faeea9
|
fixed RegionHelper
|
2023-05-13 21:37:04 +03:00 |
|
|
|
6efa64b91b
|
remove unused resources
|
2023-05-12 22:48:47 +03:00 |
|
|
|
5a92a23467
|
remove crm resource
|
2023-05-12 17:36:47 +03:00 |
|
|
|
605e4376ce
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 13:23:15 +03:00 |
|
|
|
a0bbc7d40f
|
Core: RegionHelper: added null check
|
2023-05-10 13:22:57 +03:00 |
|
|
|
1da3a38513
|
Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
|
2023-05-10 13:07:24 +03:00 |
|
|
|
8f9e698b88
|
RegisterInstanceWorkerService: optimization
|
2023-05-10 10:58:33 +03:00 |
|
|
|
3076d3d45d
|
Merge branch 'hotfix/v1.0.1' into bugfix/61992
|
2023-05-08 17:40:16 +03:00 |
|
