|
|
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 |
|
|
|
e9fb560511
|
Web: Editor: Fix display list of protected users
|
2023-05-25 13:36:39 +04:00 |
|
|
|
e9a26b813c
|
Web: Editor: Fix setup usersInRoom
|
2023-05-25 12:59:06 +04:00 |
|
|
|
47dc8b63fc
|
Web: Editor: Added new API method getProtectUsers
|
2023-05-22 22:42:13 +04:00 |
|
|
|
589830e208
|
Fix Bug 62625 - [DocSpace] Desktop: Document is created when creating a new table/presentation
|
2023-05-17 19:48:06 +04:00 |
|
|
|
a3ead0bf8c
|
Fix Bug 61063 - Desktop: File opens in a browser tab when opened in an application connected to the DocSpace portal
|
2023-05-12 12:40:15 +04:00 |
|
Viktor Fomin
|
4c686bbc5e
|
Fix Bug 62357: Interface theme is not transferred to editors
|
2023-04-29 14:25:20 +03:00 |
|
|
|
615cc4e183
|
Bump version to v1.0.1
|
2023-04-25 14:32:55 +04:00 |
|
|
|
f5d3372af2
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-24 11:33:58 +04:00 |
|
|
|
a97351f4ae
|
Editor: Fix favicon on oform/docxf and other files without documentType
|
2023-04-21 14:34:43 +04:00 |
|
|
|
48f9073302
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-20 12:31:46 +04:00 |
|
|
|
97cd9824e1
|
Add translations (vi)
|
2023-04-19 16:32:38 +03:00 |
|
Timofey Boyko
|
1300df6333
|
Merge branch 'develop' into feature/react-router-6
|
2023-04-17 10:42:19 +03:00 |
|
|
|
100bddeb4a
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-17 11:38:48 +04:00 |
|
Timofey Boyko
|
474937a412
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-14 10:54:27 +03:00 |
|
|
|
7e5c048415
|
logger: configure logStreamName in aws logger target on startup
|
2023-04-13 17:41:23 +03:00 |
|
|
|
18bf4167f7
|
Merge branch 'release/v1.0.0' into develop
|
2023-04-13 13:27:58 +04:00 |
|
Timofey Boyko
|
e6f1969879
|
Merge branch 'develop' into branch feature/react-router-6
|
2023-04-12 13:56:41 +03:00 |
|
|
|
d0a4bff865
|
added translations
|
2023-04-11 17:12:13 +03:00 |
|
|
|
df62b3862f
|
Merge branch 'release/v1.0.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/components/scrollbar/custom-scrollbars-virtual-list.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Helpers/Global.cs
|
2023-04-10 17:24:09 +03:00 |
|
|
|
ee49a99dde
|
Update translations: bg, el, lo, pt
|
2023-04-10 15:35:14 +03:00 |
|
Timofey Boyko
|
75cff9e01f
|
Web: change useMatch to useParams or delete useless code
|
2023-04-10 15:20:28 +03:00 |
|
|
|
91489a069c
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-06 17:48:26 +03:00 |
|
|
|
dcca9fda56
|
Add translations
|
2023-04-06 17:48:09 +03:00 |
|
|
|
e27306570f
|
Merge pull request #1331 from ONLYOFFICE/feature/health-route
Feature/health route
|
2023-04-06 13:58:57 +04:00 |
|
|
|
84d1a9a899
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# packages/client/public/locales/pl/DeleteDialog.json
# packages/client/public/locales/ro/Payments.json
# packages/client/public/locales/ro/Translations.json
|
2023-04-05 17:44:00 +03:00 |
|
|
|
48e011ea19
|
Add translations: nl, pl, ro, sk, tr
|
2023-04-05 17:37:15 +03:00 |
|
|
|
0c4d1f8810
|
added translations
|
2023-04-05 17:03:14 +03:00 |
|
|
|
a9cdf6f841
|
Web: Editor: added health route
|
2023-04-05 14:41:26 +03:00 |
|
|
|
e7b2e0916b
|
added translations
|
2023-04-04 18:38:04 +03:00 |
|
|
|
65cd469c4a
|
added translations
|
2023-04-03 18:09:00 +03:00 |
|
|
|
d44706498d
|
added translations
|
2023-03-28 18:43:17 +03:00 |
|
Timofey Boyko
|
2f1ca9c9b8
|
Web:Editor: add React.Suspense to server and return to client
|
2023-03-27 17:47:30 +03:00 |
|
Timofey Boyko
|
8f84d52143
|
Web:Editor:Client: delete useless React.Suspense
|
2023-03-27 12:14:06 +03:00 |
|
|
|
4a0a86efb1
|
Merge branch 'develop' into feature/react-18
|
2023-03-24 17:01:00 +04:00 |
|
|
|
57e168642c
|
Merge branch 'release/v1.0.0' into develop
|
2023-03-24 16:59:33 +04:00 |
|
|
|
53311f0e36
|
added translations
|
2023-03-23 19:05:25 +03:00 |
|
|
|
a0810ad718
|
Web: Applied changes to new React v18
|
2023-03-23 19:56:23 +04:00 |
|
|
|
4390389163
|
Upgrade dependencies
|
2023-03-23 19:55:49 +04:00 |
|
|
|
11065de511
|
Merge branch 'release/v1.0.0' into develop
|
2023-03-23 18:04:41 +04:00 |
|
Timofey Boyko
|
1262901ab2
|
Web:Editor:Server: disable change for branging logo
|
2023-03-21 10:28:12 +03:00 |
|
|
|
04f745d530
|
Merge pull request #1300 from ONLYOFFICE/dependabot/npm_and_yarn/webpack-5.76.0
Bump webpack from 5.52.1 to 5.76.0
|
2023-03-16 18:44:27 +04:00 |
|
|
|
aa483f1eb7
|
Web: Editor: Added parameter check.
|
2023-03-16 13:52:34 +03:00 |
|
|
|
892a9bafe7
|
Web: Editor: Added redirect to the portal in case of non-payment.
|
2023-03-16 13:50:59 +03:00 |
|
|
|
ee825c6f94
|
Web: Upgrade @onlyoffice/document-editor-react to v1.3.0
|
2023-03-15 12:45:53 +04:00 |
|
dependabot[bot]
|
f79fb953e9
|
Bump webpack from 5.52.1 to 5.76.0
Bumps [webpack](https://github.com/webpack/webpack) from 5.52.1 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.52.1...v5.76.0)
---
updated-dependencies:
- dependency-name: webpack
dependency-type: direct:development
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-03-14 17:27:56 +00:00 |
|
|
|
4bb0bc9d1c
|
Web: Change version to v1.0.0
|
2023-03-13 12:19:48 +04:00 |
|
Timofey Boyko
|
d25a3bdaea
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-10 17:34:38 +03:00 |
|
Timofey Boyko
|
74822fe5f6
|
Web:Editor:Client: hide createNewFile for desktop editors
|
2023-03-10 17:34:30 +03:00 |
|
|
|
29abce027d
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
|
2023-03-06 15:37:45 +03:00 |
|
