|
|
091f943497
|
fixed query
|
2023-06-28 12:50:39 +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 |
|
|
|
0bd332d2a9
|
fix migrations
|
2023-06-27 12:18:04 +03:00 |
|
|
|
beb2debb44
|
fix
|
2023-06-19 16:15:39 +03:00 |
|
|
|
e8071dbcc8
|
fix context
|
2023-06-19 14:05:17 +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 |
|
|
|
75ebc4ce65
|
fix await using
|
2023-06-01 14:27:27 +03:00 |
|
|
|
1dce9ba876
|
refactoring
|
2023-06-01 13:54:19 +03:00 |
|
|
|
d3f95ac9bf
|
CompileAsyncQuery: StatisticManager
|
2023-05-31 16:25:18 +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 |
|
|
|
98fb5838b9
|
CompileAsyncQuery: MobileAppInstallRegistrator
|
2023-05-30 15:56:07 +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 |
|
|
|
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 |
|
|
|
37a3f5648e
|
Consumers: fixed instruction
|
2023-05-26 14:57:52 +03:00 |
|
|
|
8d088c30ce
|
remove internal methods
|
2023-05-26 13:45:41 +03:00 |
|
|
|
48b580f1b0
|
added translations
|
2023-05-24 18:25:14 +03:00 |
|
NikitaVashchuk
|
294ba3ffa8
|
sending Saas lettters for startup plan
|
2023-05-24 15:50:54 +05:00 |
|
|
|
7fb137ace1
|
valueTask instend of Task Internal
|
2023-05-24 12:40:59 +03:00 |
|
|
|
f34cab4bf3
|
remove wait
|
2023-05-24 10:15:16 +03:00 |
|
|
|
347bcfc2e5
|
fix
|
2023-05-22 20:46:23 +03:00 |
|
|
|
3727c65845
|
fix
|
2023-05-22 19:38:25 +03:00 |
|
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
|
|
8d7219c0e0
|
async refactoring
|
2023-05-19 14:42:02 +03:00 |
|
|
|
4e6671ea76
|
fix
|
2023-05-18 21:31:57 +03:00 |
|
|
|
819c6597f4
|
added translations
|
2023-05-18 18:23:26 +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 |
|
|
|
f5cb9d9e21
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
# Conflicts:
# common/services/ASC.AuditTrail/AuditReportResource.de.resx
# common/services/ASC.AuditTrail/AuditReportResource.tr.resx
# common/services/ASC.AuditTrail/AuditReportResource.uk-UA.resx
|
2023-05-16 21:53:23 +03:00 |
|
|
|
24081d3fdd
|
added translations
|
2023-05-16 18:43:39 +03:00 |
|
|
|
e0f82c1a86
|
Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources
|
2023-05-16 11:25:26 +03:00 |
|
|
|
47a8b890da
|
added translations
|
2023-05-15 17:52:57 +03:00 |
|
|
|
6efa64b91b
|
remove unused resources
|
2023-05-12 22:48:47 +03:00 |
|
|
|
dbe48a260d
|
added translations
|
2023-05-12 18:18:10 +03:00 |
|
|
|
4f10368a78
|
added translations
|
2023-05-11 19:12:10 +03:00 |
|
|
|
4817ccbfb3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 18:43:17 +03:00 |
|
|
|
a0293fee03
|
added translations
|
2023-05-10 18:42:42 +03:00 |
|
|
|
1da3a38513
|
Revert "Revert "backend: removed X-REWRITER-URL header""
This reverts commit 39c1824162.
|
2023-05-10 13:07:24 +03:00 |
|
NikitaVashchuk
|
4888973e73
|
fix bug 62456
|
2023-05-05 22:09:17 +05:00 |
|
|
|
13a156bea9
|
added translations
|
2023-05-05 18:57:21 +03:00 |
|
|
|
fa1bfb8acd
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-04 19:21:08 +03:00 |
|
|
|
738ae4e38d
|
added translations
|
2023-05-04 19:20:39 +03:00 |
|
|
|
95eea07d41
|
Merge pull request #1401 from ONLYOFFICE/bugfix/daily-feed
fix 4000, 4006 actions(create, update docspace user)
|
2023-05-04 18:31:18 +03:00 |
|
NikitaVashchuk
|
b613e66cb7
|
Merge branch 'hotfix/v1.0.1' into bugfix/62369
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.ja-JP.resx
|
2023-05-04 19:24:15 +05:00 |
|
|
|
32053e0c05
|
Merge pull request #1399 from ONLYOFFICE/bugfix/aws
Bugfix/aws
|
2023-05-04 17:10:17 +03:00 |
|
|
|
0f0128e4d0
|
Merge pull request #1394 from ONLYOFFICE/bugfix/notifications
Bugfix/notifications
|
2023-05-04 17:02:55 +03:00 |
|
NikitaVashchuk
|
dc20e2cb2d
|
fix settings naming
|
2023-05-04 18:57:57 +05:00 |
|
NikitaVashchuk
|
9745e65d07
|
fix settings naming
|
2023-05-04 18:55:14 +05:00 |
|
