Commit Graph

11140 Commits

Author SHA1 Message Date
df2b14a1da removed unused methods 2023-07-02 22:00:42 +03:00
4e95a973e0 fixed query 2023-06-30 17:44:48 +03:00
bed46a861b fixed query 2023-06-30 13:01:20 +03:00
3254c28429 fix 2023-06-29 14:33:45 +03:00
5f456f3ab6 fixed query 2023-06-29 14:23:48 +03:00
1e71f9f46b fix query 2023-06-29 13:33:15 +03:00
610345a595 fixed query 2023-06-29 13:31:47 +03:00
295c1948e2 fixed query 2023-06-29 13:24:41 +03:00
c8f453a5e9 fremoved unused method 2023-06-29 12:07:56 +03:00
0e91c423cf fix 2023-06-29 11:17:13 +03:00
95f86ddd1c fix query 2023-06-28 20:36:51 +03:00
4bb1475ce9 fix query 2023-06-28 13:27:32 +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
09bc9909d4
Merge pull request #1475 from ONLYOFFICE/feature/thumbnails-new-formats
Feature/thumbnails new formats
2023-06-27 02:45:21 -07:00
0bd332d2a9 fix migrations 2023-06-27 12:18:04 +03:00
ebe5553ec4 Thumbnails: new formats added according to conversion matrix https://api.onlyoffice.com/editors/conversionapi#text-matrix 2023-06-21 12:07:23 +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
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
9d2ac61d33 CompileAsyncQuery: Worker 2023-06-01 10:54:35 +03:00
dc5d05f5c9 CompileAsyncQuery: Token 2023-06-01 10:43:08 +03:00
0c273ef2fc CompileAsyncQuery: ThumbnailRequestedIntegrationEventHandler 2023-06-01 10:38:37 +03:00
b63d38b697 CompileAsyncQuery: ThirdPartyProviderDao 2023-06-01 10:24:12 +03:00
5a0276d8a5 CompileAsyncQuery: ThirdPartyTagDao 2023-06-01 10:20:40 +03:00
5961154443 CompileAsyncQuery: ThirdPartyFolderDao 2023-06-01 10:16:03 +03:00
a093fa8fcd CompileAsyncQuery: ThirdPartyFileDao 2023-05-31 18:04:43 +03:00
b1c741a6d5 CompileAsyncQuery: SharpBoxTagDao 2023-05-31 16:25:07 +03:00
4f648b00b1 CompileAsyncQuery: SharpBoxFolderDao 2023-05-31 15:01:41 +03:00
b1eec9510b CompileAsyncQuery: SharpBoxFileDao 2023-05-31 14:49:08 +03:00
488ba4c8fb CompileAsyncQuery: SharpBoxDaoBase 2023-05-31 14:26:54 +03:00
f3123fba94 CompileAsyncQuery: SharePointTagDao 2023-05-31 13:55:45 +03:00
105ca037e5 CompileAsyncQuery: SharePointFolderDao 2023-05-31 13:30:18 +03:00
663ec2b39f CompileAsyncQuery: SharePointDaoBase 2023-05-31 12:26:27 +03:00
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
bd62a2a4fd removed .result 2023-05-31 10:42:09 +03:00
dbbebc8c4b CompileAsyncQuery: ProviderAccountDao 2023-05-30 22:23:11 +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
1d6876404b CompileAsyncQuery: FileUtility 2023-05-30 14:09:44 +03:00
6ce91c34f5 CompileAsyncQuery: FilesSpaceUsageStatManager 2023-05-30 14:02:24 +03:00
80c7ee41b0 fix 2023-05-30 13:51:26 +03:00
b849378a29 CompileAsyncQuery: FactoryIndexerFolder 2023-05-29 18:09:09 +03:00
dae2ca3be8 CompileAsyncQuery:FactoryIndexerFile 2023-05-29 17:46:21 +03:00
19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
7f33ee9bf8 fix 2023-05-26 17:41:24 +03:00
d902e631a9 fix 2023-05-26 16:25:21 +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