Commit Graph

8533 Commits

Author SHA1 Message Date
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
48b580f1b0 added translations 2023-05-24 18:25:14 +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
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
819c6597f4 added translations 2023-05-18 18:23:26 +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
NikitaVashchuk
aaf7885f50 fix bug 62268 2023-04-26 17:08:35 +05:00
cf05348934
Merge pull request #1382 from ONLYOFFICE/bugfix/bug-62137
Bugfix/bug 62137
2023-04-24 16:29:34 +03:00
93ec325611 backend: removed X-REWRITER-URL header 2023-04-24 16:23:42 +03:00
d46661eb85 edited translations 2023-04-24 13:46:53 +03:00
43126ee7c5 fix 2023-04-24 01:16:06 -07:00
f5d3372af2 Merge branch 'release/v1.0.0' into develop 2023-04-24 11:33:58 +04:00
NikitaVashchuk
f64450b6d9 fix bug 62197 2023-04-20 19:02:35 +05:00
48f9073302 Merge branch 'release/v1.0.0' into develop 2023-04-20 12:31:46 +04:00
34a86cb02f fix 62142 2023-04-19 18:55:49 +03:00
NikitaVashchuk
d2e2138b8b Notifications: fixed UserFileUpdated event 2023-04-19 14:50:25 +05:00
c3725e3099 DocsStore: remake update 2023-04-18 18:04:45 +05:00
78e6688211 added translations 2023-04-18 14:30:55 +03:00
e6c2f39e39 fix translations 2023-04-18 09:58:41 +03:00
d7e4dd729e Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-18 09:10:43 +03:00
5455d0112f fix first visit 2023-04-18 09:10:31 +03:00
3b4c396391 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-17 18:26:09 +03:00
03acba483c added translations 2023-04-17 18:25:51 +03:00
NikitaVashchuk
20a9cfb925 AbstractDao: fix TenantID 2023-04-17 19:18:26 +05:00
95ca8e7811 added bg 2023-04-17 15:19:46 +03:00
7ba38a4a4e Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-17 14:18:44 +03:00