|
|
350626d795
|
Files: FilterTypeEnum: removed unnecessary
|
2023-06-27 12:59:18 +03:00 |
|
|
|
36463541d7
|
Files: added apply filter option
|
2023-06-27 12:54:22 +03:00 |
|
|
|
0b9e19d95f
|
Files: added FoldersDocuments/FoldersImages filters
|
2023-06-26 11:06:34 +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 |
|
|
|
bd62a2a4fd
|
removed .result
|
2023-05-31 10:42:09 +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 |
|
|
|
d902e631a9
|
fix
|
2023-05-26 16:25:21 +03:00 |
|
|
|
dc6b076ea8
|
fix
|
2023-05-26 14:06:44 +03:00 |
|
|
|
8d088c30ce
|
remove internal methods
|
2023-05-26 13:45:41 +03:00 |
|
|
|
1412d17140
|
fix
|
2023-05-26 13:29:23 +03:00 |
|
|
|
44f1974ba4
|
fix
|
2023-05-25 18:32:10 +03:00 |
|
|
|
813c25404f
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-25 18:25:11 +03:00 |
|
|
|
48b580f1b0
|
added translations
|
2023-05-24 18:25:14 +03:00 |
|
|
|
15b2384f05
|
fix
|
2023-05-24 17:30:05 +03:00 |
|
|
|
7fb137ace1
|
valueTask instend of Task Internal
|
2023-05-24 12:40:59 +03:00 |
|
|
|
7d28fcb16d
|
fix
|
2023-05-24 10:18:07 +03:00 |
|
|
|
6159636a7d
|
do not run the task if there is no data
|
2023-05-23 00:15:48 +03:00 |
|
|
|
914d7856ff
|
thumbnails: setup MaxDegreeOfParallelism
|
2023-05-22 22:10:15 +03:00 |
|
|
|
baf51890c7
|
add ProtectUsers in EditorController
|
2023-05-22 13:26:40 +03:00 |
|
|
|
3bdda62576
|
fix
|
2023-05-21 20:01:02 +03:00 |
|
|
|
d7cee576a0
|
fix async
|
2023-05-21 00:48:08 +03:00 |
|
|
|
daeca613ae
|
Files: thumbnails doesn't includes in quota
|
2023-05-19 19:09:49 +03:00 |
|
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
|
|
8d7219c0e0
|
async refactoring
|
2023-05-19 14:42:02 +03:00 |
|
|
|
819c6597f4
|
added translations
|
2023-05-18 18:23:26 +03:00 |
|
|
|
5cbdfdef9b
|
Merge branch 'develop' into feature/optimization-ef
|
2023-05-17 11:01:32 +03:00 |
|
|
|
24081d3fdd
|
added translations
|
2023-05-16 18:43:39 +03:00 |
|
|
|
ab3a38d8a0
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-15 17:53:27 +03:00 |
|
|
|
47a8b890da
|
added translations
|
2023-05-15 17:52:57 +03:00 |
|
|
|
078864ae24
|
Bug 62544 - Settings:Restore
"_chunkedUploadSessionHolder.MoveAsync" before "_factoryIndexer.IndexAsync"
|
2023-05-15 14:33:32 +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 |
|
|
|
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 |
|
|
|
56f54c50b6
|
Merge pull request #1406 from ONLYOFFICE/bugfix/62245
fix bug 62245
|
2023-05-04 18:48:33 +03:00 |
|
NikitaVashchuk
|
e07d245405
|
Merge branch 'hotfix/v1.0.1' into bugfix/62245
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-05-04 20:38:20 +05: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 |
|
|
|
0f0128e4d0
|
Merge pull request #1394 from ONLYOFFICE/bugfix/notifications
Bugfix/notifications
|
2023-05-04 17:02:55 +03:00 |
|
NikitaVashchuk
|
114c42d385
|
fix bug 62245
|
2023-05-04 15:45:10 +05:00 |
|
NikitaVashchuk
|
1c301b572a
|
fix 4000, 4006 actions(create, update docspace user)
|
2023-05-03 19:09:17 +05:00 |
|
|
|
2742771897
|
added translations
|
2023-05-03 16:06:12 +03:00 |
|
|
|
7bed1e829c
|
edited Chinese
|
2023-05-02 15:14:05 +03:00 |
|
|
|
2fb3c9f975
|
added translations
|
2023-04-28 16:24:46 +03:00 |
|
|
|
39c1824162
|
Revert "backend: removed X-REWRITER-URL header"
This reverts commit 93ec325611.
|
2023-04-27 22:35:00 +03:00 |
|
|
|
8687b3ae99
|
edited translations
|
2023-04-27 17:42:34 +03:00 |
|
