Commit Graph

229 Commits

Author SHA1 Message Date
c4692c0e69 fixed query 2023-06-28 20:17:22 +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
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +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
2a15974880 CompileAsyncQuery: AccountLinker 2023-05-25 10:58:09 +03:00
1da3a38513 Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
2023-05-10 13:07:24 +03:00
39c1824162 Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
2023-04-27 22:35:00 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
6309d9530c fix async 2023-03-30 15:11:45 +03:00
e1b01e2d81 fix methods with task and without async 2023-03-28 13:13:13 +03:00
aac1896a0f remove CreateDbContextAsync and fix ExecuteAsync 2023-03-28 00:25:55 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
1d87baec93 AccountLinkContext - async 2023-03-13 23:07:37 +03:00
722df36493 async: fixed 2023-03-10 16:09:32 +03:00
05571943dc backend: refactoring. replace sync methods to async within ExecutionStrategy block 2023-03-09 14:42:18 +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
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
2ae75ec762 fix ide001 2022-11-07 12:49:29 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
fabb3ceac5 remove waste asc.federatedLogin 2022-09-07 18:36:52 +03:00
d426b2f5d2 FederatedLogin: deleted unnecessary 2022-08-30 13:08:55 +03:00
15f5b67008 FederationLogin: refactor 2022-08-29 22:08:55 +03:00
834a52707f FederatedLogin: fix 2022-08-25 18:31:07 +03:00
0c596956f6 Merge branch 'develop' into feautre/private-virtual-rooms 2022-08-25 15:30:11 +03:00
4dcd9be041 fix: removed IOptionsSnapshot 2022-08-25 13:29:08 +03:00
9b22d27306 Files: added keys check 2022-08-25 11:55:54 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
5bcbae5711 fix 2022-06-23 11:48:31 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
e2cee2c2fc Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
8ea04bcc81 Merge branch 'develop' into feature/12.0
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
a9b826f8f5 moved from ddf515b8 2022-06-09 18:36:57 +03:00
c1d152becc moved from ddf515b8 2022-06-07 21:00:08 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
ca3a49c25b fix 56849 2022-05-05 17:07:24 +03:00
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
cb2580dd50 refactoring 2022-04-15 12:08:06 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00