Vladimir Khvan
|
33b32c21a5
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-06 13:27:38 +05:00 |
|
|
|
708835adf9
|
Web: StorageManagement: Added link to help center.
|
2024-02-05 17:05:51 +03:00 |
|
|
|
e885c0485d
|
Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
# packages/client/src/pages/Home/Hooks/usePublic.js
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
# public/locales/ja-JP/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/uk-UA/Common.json
# public/locales/zh-CN/Common.json
|
2024-02-02 16:15:04 +04:00 |
|
Vladimir Khvan
|
bb74cc4947
|
Web: Client: JavascriptSDK: translations were corrected
|
2024-02-02 16:25:35 +05:00 |
|
|
|
cf9f65b21f
|
Web: Files: fixed empty-screen for public room
|
2024-02-02 13:11:17 +03:00 |
|
Vladimir Khvan
|
2bfd15a162
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-02 12:40:49 +05:00 |
|
Vladimir Khvan
|
81fd71cb5d
|
Web: Client: JavascriptSDK: button view was added
|
2024-02-02 00:27:09 +05:00 |
|
Vladimir Khvan
|
5419548399
|
Web: Client: JavascriptSDK: modified translations / corrected margin
|
2024-02-01 19:13:21 +05:00 |
|
|
|
ee2f010de3
|
edited oform -> PDF form
|
2024-02-01 16:06:21 +03:00 |
|
Vladimir Khvan
|
dcb4b3d276
|
Web: Client: JavascriptSDK: simple room was added
|
2024-02-01 13:46:45 +05:00 |
|
|
|
496e2de0d2
|
Fix Bug 65381 - Rooms. Public. Fixed opening files of unsupported formats.
|
2024-01-30 14:13:30 +03:00 |
|
|
|
c1d0bb9995
|
Web: Files: Public-room: fixed links row
|
2024-01-30 11:05:54 +03:00 |
|
|
|
0dc2f20a5a
|
The correct translation was returned.
|
2024-01-30 09:05:43 +03:00 |
|
|
|
863027d874
|
Web: Added a banner when using the personal quota limit for administrators.
|
2024-01-30 09:02:19 +03:00 |
|
|
|
eac73ab174
|
Web: Added a banner with information on reaching the portal quota limit for standalone mode.
|
2024-01-30 08:35:30 +03:00 |
|
|
|
19e9079671
|
Web: Files: Public-room: fixed translations
|
2024-01-29 15:48:52 +03:00 |
|
|
|
683c628c28
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Details/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/common/components/Loaders/index.js
# packages/shared/api/files/index.ts
# public/locales/en/Common.json
|
2024-01-28 20:44:38 +03:00 |
|
Vladimir Khvan
|
56e669555d
|
Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
packages/common/components/Navigation/sub-components/control-btn.js
packages/shared/components/navigation/Navigation.tsx
packages/shared/selectors/Room/index.tsx
|
2024-01-23 16:38:55 +05:00 |
|
|
|
1adf6b3634
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-19 17:04:46 +04:00 |
|
Vladimir Khvan
|
a8f8c4c1ce
|
Web: Client: JavascriptSDK: help buttons were added
|
2024-01-19 17:43:20 +05:00 |
|
|
|
968573ce02
|
Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
# packages/components/toast/styled-toastr.js
|
2024-01-19 16:20:16 +04:00 |
|
|
|
1e0c383514
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/api/files/index.js
# packages/common/constants/index.js
# packages/common/store/CurrentQuotaStore.js
# packages/components/combobox/index.js
# packages/components/themes/base.js
# packages/components/toggle-button/index.js
# packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
# packages/management/src/categories/spaces/sub-components/RowView/SpacesRoomRow.tsx
# packages/shared/api/people/filter.js
# packages/shared/api/rooms/filter.js
# packages/shared/utils/common.ts
# yarn.lock
|
2024-01-19 11:32:34 +03:00 |
|
Vladimir Khvan
|
b1039c6cb6
|
Web: Client: JavascriptSDK: button customization was added to Room selector preset
|
2024-01-18 23:25:26 +05:00 |
|
|
|
825c765b7d
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-18 20:38:44 +03:00 |
|
|
|
b57ae5a872
|
Translations: Set BETA on EN for any languages
|
2024-01-18 14:29:01 +04:00 |
|
Vladimir Khvan
|
58c235c9af
|
Web: Client: Webhooks: loading state and success toast were added for webhook creation
|
2024-01-17 18:49:30 +05:00 |
|
|
|
596a832dbe
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/GlobalEvents/EditRoomEvent.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/files/index.js
# packages/components/table-container/TableHeader.js
|
2024-01-10 12:25:13 +03:00 |
|
Vladimir Khvan
|
9807aa072f
|
Web: Client: JavascriptSDK: file selector was complimented (added withBreadCrumbs, withSubtitle and filterParam)
|
2024-01-08 18:28:18 +05:00 |
|
|
|
889d653170
|
Merge branch 'develop' into feature/form-room-pdf
|
2023-12-28 15:07:10 +04:00 |
|
Vladimir Khvan
|
2c9c2728d2
|
Web: Client: JavascriptSDK: viewer and editor were fixed
|
2023-12-26 17:51:52 +05:00 |
|
Vladimir Khvan
|
4a09b3c1cd
|
Web: Client: JavascriptSDK: viewer was complemented
|
2023-12-26 14:01:23 +05:00 |
|
Vladimir Khvan
|
2f7b05d4ea
|
Web: Client: JavascriptSDK: editor was complemented
|
2023-12-26 13:42:44 +05:00 |
|
Vladimir Khvan
|
d9a11e4b52
|
Web: Client: JavascriptSDK: file-selector was complemented
|
2023-12-26 12:51:26 +05:00 |
|
Vladimir Khvan
|
8b90b47a0e
|
Web: Client: JavascriptSDK: room-selector preset was complemented
|
2023-12-25 17:06:00 +05:00 |
|
Vladimir Khvan
|
df2a6d3033
|
Web: Client: JavascriptSDK: manager preset was complemented
|
2023-12-25 16:25:47 +05:00 |
|
|
|
50fd484599
|
added groups and shared folders options for google workspace
|
2023-12-23 23:11:31 +05:00 |
|
|
|
52092c3aa2
|
added groups and shared folders options for onlyoffice workspace
|
2023-12-23 22:13:36 +05:00 |
|
|
|
872bae0b00
|
Client: add translate
|
2023-12-20 14:46:33 +03:00 |
|
|
|
7f454ecc64
|
Web: Added showing a bar when the user reaches the quota.
|
2023-12-20 12:20:29 +03:00 |
|
Vladimir Khvan
|
ec701681d3
|
Merge branch 'develop' into feature/js-sdk-presets
|
2023-12-18 17:47:25 +05:00 |
|
Vladimir Khvan
|
ab3bdbf08b
|
Web: Client: JavascriptSDK: presets tiles were added
|
2023-12-18 17:46:23 +05:00 |
|
|
|
1b700299ee
|
Merge branch 'develop' into feature/my-documents-share
|
2023-12-15 18:22:25 +03:00 |
|
|
|
f489a737c2
|
Client: add translate
|
2023-12-15 12:43:13 +03:00 |
|
|
|
cf782df79f
|
added translations
|
2023-12-14 16:06:09 +03:00 |
|
|
|
213afa8974
|
added translations
|
2023-12-14 15:13:07 +03:00 |
|
Akmal Isomadinov
|
a5fe28b7ab
|
Client:Locales:Files fix
|
2023-12-14 14:45:10 +05:00 |
|
Akmal Isomadinov
|
64f85fdd6e
|
Client:EmptyContainer Added empty screen for the subfolder form
|
2023-12-14 14:41:48 +05:00 |
|
|
|
cbc4358686
|
added vi
|
2023-12-13 19:13:52 +03:00 |
|
|
|
b52db74bf2
|
Merge branch 'develop' into feature/my-documents-share
|
2023-12-13 20:11:22 +04:00 |
|
|
|
d501b2a77e
|
Client: add translations
|
2023-12-13 16:25:33 +03:00 |
|
|
|
ee63b6b0b8
|
added sk, az
|
2023-12-13 15:41:23 +03:00 |
|
|
|
f849664079
|
added translations
|
2023-12-12 12:47:19 +03:00 |
|
|
|
6862bb529f
|
added/edited translations
|
2023-12-11 17:54:33 +03:00 |
|
|
|
15f735d292
|
Client: add translates
|
2023-12-07 17:15:12 +03:00 |
|
|
|
f169ac910f
|
edited ja (additional links)
|
2023-12-07 16:21:24 +03:00 |
|
|
|
0c3fdcd53e
|
added translations
|
2023-12-07 16:11:01 +03:00 |
|
|
|
8abec67cd7
|
added si
|
2023-12-06 18:10:23 +03:00 |
|
Vladimir Khvan
|
ee7ae29d85
|
Merge branch 'develop' into feature/data-migration
|
2023-12-06 15:43:41 +05:00 |
|
|
|
c904de1438
|
added si
|
2023-12-05 18:29:36 +03:00 |
|
|
|
9542ec2fbe
|
Merge branch 'develop' into feature/my-documents-share
|
2023-12-05 14:21:38 +03:00 |
|
Vladimir Khvan
|
56d6268e82
|
Web: Client: Data import: translations were corrected
|
2023-12-05 16:01:14 +05:00 |
|
Akmal Isomadinov
|
1b90b8dad7
|
Merge branch 'hotfix/v2.0.1' into feature/form-room
# Conflicts:
# packages/client/src/components/Article/Body/Items.js
# packages/client/src/components/Badges.js
# packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/Hooks/useFiles.js
# packages/client/src/pages/Home/index.js
|
2023-12-05 15:11:00 +05:00 |
|
|
|
d4b26b805b
|
updated translations
|
2023-12-05 12:58:49 +03:00 |
|
|
|
b678d6fd78
|
added translations
|
2023-12-04 18:39:13 +03:00 |
|
|
|
e40c555ab0
|
added translate for import step
|
2023-12-04 15:23:57 +05:00 |
|
|
|
68360f2650
|
added translations
|
2023-12-04 11:17:22 +03:00 |
|
|
|
5bf8a28485
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-30 13:02:02 +03:00 |
|
|
|
fdbeff909c
|
fix bad merge
|
2023-11-30 15:01:19 +05:00 |
|
|
|
ecd5ac40e1
|
Web: add translates
|
2023-11-30 13:00:39 +03:00 |
|
|
|
574170ce3e
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/People.json
# packages/client/public/locales/ru/Settings.json
# public/locales/ru/Common.json
|
2023-11-30 14:55:26 +05:00 |
|
|
|
34234e9377
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace-client into develop
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/People.json
# packages/client/public/locales/ru/Settings.json
# public/locales/ru/Common.json
|
2023-11-30 14:50:08 +05:00 |
|
Vladimir Khvan
|
b864cc12db
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/People.json
packages/client/public/locales/ru/Settings.json
public/locales/ru/Common.json
|
2023-11-30 14:31:07 +05:00 |
|
|
|
78ae5ad7f1
|
fix translate
|
2023-11-29 21:46:55 +05:00 |
|
|
|
7243fbb400
|
Merge branch 'release/v2.0.0' into feature/adding-ru
|
2023-11-29 19:08:16 +04:00 |
|
|
|
eac5c51f66
|
added ru keys
|
2023-11-29 17:21:54 +03:00 |
|
|
|
5797325536
|
added cn translations
|
2023-11-29 15:51:07 +03:00 |
|
|
|
56fba54592
|
Web: Returned translation.
|
2023-11-29 13:50:16 +03:00 |
|
|
|
7f3ee86798
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/PeopleRowContainer.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/store/FilesStore.js
# packages/common/store/CurrentQuotaStore.js
# packages/common/utils/index.ts
# packages/components/table-container/TableHeader.js
# public/locales/en/Common.json
|
2023-11-29 10:56:04 +03:00 |
|
|
|
d5298d2430
|
Client: add translate
|
2023-11-29 04:29:32 +03:00 |
|
|
|
fc7425b0ac
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-29 04:28:55 +03:00 |
|
|
|
c155d04e84
|
Fix WrongTranslationVariablesTest issues
|
2023-11-28 19:18:13 +04:00 |
|
|
|
d98e0f3f2b
|
Fix EnDublicatesByContentTest issues
|
2023-11-28 19:09:56 +04:00 |
|
|
|
e9e96102cf
|
Merge branch 'feature/updating_translations' of https://github.com/ONLYOFFICE/DocSpace-client into feature/updating_translations
# Conflicts:
# packages/client/public/locales/ja-JP/DeleteProfileEverDialog.json
# packages/client/public/locales/ko-KR/DeleteProfileEverDialog.json
# packages/client/public/locales/lv/DeleteProfileEverDialog.json
# packages/client/public/locales/nl/DeleteProfileEverDialog.json
# packages/client/public/locales/pl/DeleteProfileEverDialog.json
# packages/client/public/locales/pt-BR/DeleteProfileEverDialog.json
# packages/client/public/locales/pt/DeleteProfileEverDialog.json
# packages/client/public/locales/ro/DeleteProfileEverDialog.json
# packages/client/public/locales/ru/DeleteProfileEverDialog.json
# packages/client/public/locales/sk/DeleteProfileEverDialog.json
# packages/client/public/locales/sl/DeleteProfileEverDialog.json
# packages/client/public/locales/tr/DeleteProfileEverDialog.json
# packages/client/public/locales/uk-UA/DeleteProfileEverDialog.json
# packages/client/public/locales/vi/DeleteProfileEverDialog.json
# packages/client/public/locales/zh-CN/DeleteProfileEverDialog.json
|
2023-11-28 17:49:56 +03:00 |
|
|
|
4c3057c645
|
Add translations of multiple languages (ar, ja, ko, lo, lv, nl, pl, pt, ro, ru, sk, sl, tr, uk, vi, zh)
|
2023-11-28 16:53:55 +03:00 |
|
Akmal Isomadinov
|
2d0407d43e
|
Merge branch 'release/v2.0.0' into feature/form-room
|
2023-11-27 17:54:46 +05:00 |
|
|
|
9e471c021d
|
added translate for onlyoffice workspace
|
2023-11-25 13:45:18 +05:00 |
|
|
|
3425c04044
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# packages/client/public/locales/az/DeleteProfileEverDialog.json
# packages/client/public/locales/bg/DeleteProfileEverDialog.json
# packages/client/public/locales/cs/DeleteProfileEverDialog.json
# packages/client/public/locales/de/DeleteProfileEverDialog.json
# packages/client/public/locales/el-GR/DeleteProfileEverDialog.json
# packages/client/public/locales/es/DeleteProfileEverDialog.json
# packages/client/public/locales/fi/DeleteProfileEverDialog.json
# packages/client/public/locales/fr/DeleteProfileEverDialog.json
# packages/client/public/locales/hy-AM/DeleteProfileEverDialog.json
# packages/client/public/locales/it/DeleteProfileEverDialog.json
|
2023-11-23 15:52:14 +04:00 |
|
Vladimir Khvan
|
caa7c632c4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/Settings.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/components/table-container/TableHeaderCell.js
public/locales/en/Common.json
|
2023-11-22 19:45:10 +05:00 |
|
|
|
b5cd411ada
|
Added translations.
|
2023-11-22 16:30:47 +03:00 |
|
|
|
8d61328213
|
Web: Added the ability to group delete accounts.
|
2023-11-22 15:46:33 +03:00 |
|
|
|
57a9de7746
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-21 12:56:27 +03:00 |
|
|
|
b496a04db9
|
Fix WrongTranslationTagsTest issues
|
2023-11-20 17:11:29 +04:00 |
|
|
|
aea67b70e7
|
Fix WrongTranslationVariablesTest
|
2023-11-20 17:08:12 +04:00 |
|
|
|
8bbe0deb53
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# i18next/client.babel
# i18next/common.babel
# packages/client/public/locales/az/Files.json
# packages/client/public/locales/az/FormGallery.json
# packages/client/public/locales/az/InfoPanel.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/bg/Files.json
# packages/client/public/locales/bg/FormGallery.json
# packages/client/public/locales/bg/InfoPanel.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Files.json
# packages/client/public/locales/cs/FormGallery.json
# packages/client/public/locales/cs/InfoPanel.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/de/Files.json
# packages/client/public/locales/de/FormGallery.json
# packages/client/public/locales/de/InfoPanel.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/el-GR/Files.json
# packages/client/public/locales/el-GR/FormGallery.json
# packages/client/public/locales/el-GR/InfoPanel.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/es/Files.json
# packages/client/public/locales/es/FormGallery.json
# packages/client/public/locales/es/InfoPanel.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/fi/Files.json
# packages/client/public/locales/fi/FormGallery.json
# packages/client/public/locales/fi/InfoPanel.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fr/Files.json
# packages/client/public/locales/fr/FormGallery.json
# packages/client/public/locales/fr/InfoPanel.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/hy-AM/Files.json
# packages/client/public/locales/hy-AM/FormGallery.json
# packages/client/public/locales/hy-AM/InfoPanel.json
# packages/client/public/locales/hy-AM/JavascriptSdk.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/it/Files.json
# packages/client/public/locales/it/FormGallery.json
# packages/client/public/locales/it/InfoPanel.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
|
2023-11-20 15:55:26 +04:00 |
|
|
|
83a670d256
|
Fix UselessTranslationKeysTest (removed old translations)
|
2023-11-20 13:16:33 +04:00 |
|
|
|
a284aafe64
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-17 17:44:38 +03:00 |
|
|
|
310cda28b5
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/common/utils/image-helpers.js
|
2023-11-17 18:32:28 +04:00 |
|
|
|
71a496d472
|
Update translations: az, bg, cs, de, el, es, fi, fr, hy, it
|
2023-11-17 16:15:11 +03:00 |
|
|
|
f079ab9e75
|
Client: add translate
|
2023-11-17 13:56:28 +03:00 |
|
|
|
599056a82d
|
Merge branch 'release/v2.0.0' into feature/plugin-sdk
|
2023-11-17 13:33:34 +04:00 |
|
|
|
c41f2e7d14
|
Client:PluginSDK: add plugin list
|
2023-11-17 12:01:59 +03:00 |
|
|
|
07aef4ca41
|
Client:PluginSDK: init
|
2023-11-17 10:01:27 +03:00 |
|
Akmal Isomadinov
|
99b0c90219
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/common/utils/image-helpers.js
|
2023-11-17 11:30:49 +05:00 |
|
|
|
40e941d4db
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-16 23:03:36 +04:00 |
|
namushka
|
becc3ca8b0
|
remake of ErrorView component as an EmpySceenContainer instance
|
2023-11-16 15:22:43 +03:00 |
|
|
|
7d87515d0c
|
Fix UselessTranslationKeysTest (removed useless FolderId key)
|
2023-11-16 13:53:11 +04:00 |
|
|
|
b7dad01e22
|
Fix UselessTranslationKeysTest (removed useless FolderContents key)
|
2023-11-16 13:37:15 +04:00 |
|
|
|
f4863d06fe
|
Fix UselessTranslationKeysTest (removed useless EmptyFolderHeader key)
|
2023-11-16 13:32:25 +04:00 |
|
|
|
eb488e6caf
|
Fix UselessTranslationKeysTest (removed useless Destroy key)
|
2023-11-16 13:28:04 +04:00 |
|
|
|
2a0fa54d13
|
Fix UselessTranslationKeysTest (removed useless DeleteGroupUsersSuccessMessage key)
|
2023-11-16 13:25:40 +04:00 |
|
|
|
effc12a846
|
Fix UselessTranslationKeysTest (removed useless ConnectEmpty key)
|
2023-11-16 13:23:12 +04:00 |
|
|
|
9a920c0d45
|
Fix UselessTranslationKeysTest (removed useless UploadPluginsHere key)
|
2023-11-16 13:19:09 +04:00 |
|
|
|
766019c7c9
|
Fix UselessTranslationKeysTest (removed useless Webhook key)
|
2023-11-16 13:13:19 +04:00 |
|
|
|
d3f32a3f38
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:09:46 +04:00 |
|
|
|
553c66ad33
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:05:52 +04:00 |
|
|
|
64ac2715a6
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:02:19 +04:00 |
|
|
|
4430b177fe
|
Fix UselessTranslationKeysTest (removed useless AutoBackupHelp and AutoBackupHelpNote keys)
|
2023-11-16 12:55:40 +04:00 |
|
|
|
a371331c60
|
Fix UselessTranslationKeysTest (removed useless AdminsMessageDescription and AdminsMessageHelper keys)
|
2023-11-16 12:52:23 +04:00 |
|
|
|
b185b5a7cc
|
Fix translation MessageEmailActivationInstuctionsSentOnEmail key
|
2023-11-16 12:41:15 +04:00 |
|
|
|
ec8d56951b
|
Web: Client: fix when text overflows in version history badge
|
2023-11-15 18:34:56 +01:00 |
|
|
|
86484af409
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-15 15:44:20 +03:00 |
|
|
|
e9a292004a
|
Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations)
|
2023-11-15 14:47:32 +04:00 |
|
|
|
e161432f3a
|
Fix EmptyValueKeysTest (removed useless EmptyScreenDescription, GalleryEmptyScreenDescription, GalleryEmptyScreenHeader)
|
2023-11-15 14:38:49 +04:00 |
|
|
|
3a2c002d72
|
Fix FullEnDublicatesTest (moved "Plugins" key to Common translations)
|
2023-11-15 14:32:58 +04:00 |
|
|
|
331a06b67f
|
Auto-sorting
|
2023-11-15 14:08:59 +04:00 |
|
Akmal Isomadinov
|
36bb6da9ce
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-11-13 10:33:45 +05:00 |
|
|
|
65bf52310b
|
Merge branch 'release/v2.0.0' into bugfix/portal-restriction
|
2023-11-10 22:47:44 +04:00 |
|
|
|
0fa27aeb8e
|
Added translation key "ErrorAccountAlreadyUse"
|
2023-11-10 16:39:22 +03:00 |
|
|
|
c8ee4d0560
|
Web: Files: Public-room: fixed translations
|
2023-11-10 13:41:37 +03:00 |
|
|
|
500bafeac7
|
Web: Added portal restriction error component.
|
2023-11-10 12:53:20 +03:00 |
|
|
|
5be61afd7d
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-09 19:05:58 +03:00 |
|
|
|
56b0bb1f8b
|
Web: Files: changed delete-link translation, added new icon
|
2023-11-09 17:12:51 +03:00 |
|
Akmal Isomadinov
|
8fd1f5d546
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/MembersHelper.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
|
2023-11-05 22:20:45 +05:00 |
|
mushka-n
|
2fcebdd5d8
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-11-01 18:43:11 +03:00 |
|
mushka-n
|
0b54b0d1c2
|
code cleanup
|
2023-11-01 12:39:17 +03:00 |
|
mushka-n
|
fed4bf3235
|
new empty info panel view + translation and styling fixes
|
2023-10-30 15:30:38 +03:00 |
|
Elyor Djalilov
|
22b281c3de
|
useless translate was deleted
|
2023-10-30 16:12:04 +05:00 |
|
Elyor Djalilov
|
54ecdf8b95
|
useless translate was deleted
|
2023-10-30 15:17:50 +05:00 |
|
mushka-n
|
6ac7700678
|
merge release + merge fix
|
2023-10-27 15:10:43 +03:00 |
|
Viktor Fomin
|
d858434750
|
Client: PortalSettings: TFA: delete useless
|
2023-10-26 14:29:35 +03:00 |
|
mushka-n
|
5805f1b995
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-20 11:09:31 +03:00 |
|
|
|
abbeba5d32
|
Web: Files: removed unused translations
|
2023-10-19 14:29:24 +03:00 |
|
|
|
cdb2aaae15
|
Merge branch 'release/v2.0.0' into feature/public-room-translations
|
2023-10-18 20:10:29 +04:00 |
|
|
|
704e40ab6e
|
Merge branch 'release/v2.0.0' into feature/room-index
|
2023-10-18 16:54:38 +03:00 |
|
|
|
24d8530aa2
|
Web: Files: fixed translations
|
2023-10-18 16:16:28 +03:00 |
|
|
|
fc93d059b9
|
Web: Files: added new translations for the public-room
|
2023-10-18 14:49:15 +03:00 |
|
mushka-n
|
65e809cd97
|
merge release + merge resolve
|
2023-10-18 14:26:12 +03:00 |
|
|
|
d4722fd01b
|
Merge pull request #17 from ONLYOFFICE/bugfix/Bug57787
Bugfix/bug57787
|
2023-10-17 18:58:14 +04:00 |
|
|
|
38b1bb5c06
|
Merge pull request #16 from ONLYOFFICE/feature/room-primary-link
Feature/room primary link
|
2023-10-17 18:45:29 +04:00 |
|
|
|
ed36ed779a
|
Web: Files: added CopyPrimaryLink translation
|
2023-10-17 13:57:35 +03:00 |
|
|
|
3bcef0dace
|
Web: Files: fixed link translation
|
2023-10-17 13:52:43 +03:00 |
|
|
|
6a70407eb9
|
Web: Files: fixed translations
|
2023-10-17 13:20:29 +03:00 |
|
|
|
7cac4ffee2
|
Merge branch 'release/v2.0.0' into feature/room-index
|
2023-10-17 12:34:39 +03:00 |
|
Viktor Fomin
|
51728a6d66
|
Client: add translate
|
2023-10-17 11:30:50 +03:00 |
|
|
|
b99c5591b1
|
Fix ru translation
|
2023-10-17 11:14:43 +04:00 |
|
Viktor Fomin
|
2251c6f310
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-16 20:14:33 +03:00 |
|
Vladimir Khvan
|
ea7b067e7f
|
Merge branch 'develop' into 'feature/data-migration' | conflict components/paging/styled-paging.js
|
2023-10-16 20:09:10 +05:00 |
|
Subhonbek
|
17ebbccf57
|
web client add locales word
|
2023-10-16 17:28:01 +03:00 |
|
|
|
6ac05b3a56
|
Web: Files: Fixed archive view
|
2023-10-16 15:51:56 +03:00 |
|
|
|
582e96991a
|
Web: Files: fixed custom room view
|
2023-10-16 14:55:25 +03:00 |
|
|
|
1f6e3aa3a3
|
Merge branch 'develop' into feature/room-primary-link
# Conflicts:
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/EditLinkPanel/index.js
|
2023-10-13 18:27:53 +03:00 |
|
|
|
3172bcdd02
|
Web: Files: DeleteLinkDialog: added new translations
|
2023-10-11 18:19:35 +03:00 |
|
Akmal Isomadinov
|
ac13bb8303
|
Client: moved into common translation
|
2023-10-11 16:49:13 +05:00 |
|
Akmal Isomadinov
|
fe81178f91
|
Client:Store:FilesActionsStore: Added toast for pinning/unpinning multiple rooms
|
2023-10-11 12:25:14 +05:00 |
|
Akmal Isomadinov
|
66d8177ab8
|
Client: Fixed public room selection
|
2023-10-09 13:32:33 +05:00 |
|
Viktor Fomin
|
6cb3ef610d
|
Client: delete useless
|
2023-10-06 15:03:29 +03:00 |
|
mushka-n
|
d1b60f6b5b
|
fixed MessageEmailActivationInstuctionsSentOnEmail translation key
|
2023-10-06 12:02:43 +03:00 |
|
|
|
3cdbdd6521
|
Web: Files: added new translations
|
2023-10-05 15:41:50 +03:00 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
Akmal Isomadinov
|
477d648980
|
Web: Added badge
|
2023-10-05 12:31:06 +05:00 |
|
|
|
c43d8c891a
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs
# common/ASC.ActiveDirectory/LdapUserManager.cs
# common/ASC.Api.Core/Model/EmployeeFullDto.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/IUserService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/Tenants/TenantUserQuotaSettings.cs
# common/ASC.Core.Common/Users/UserQuotaSettings.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/IQuotaController.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# packages/client/public/locales/en/Settings.json
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/people/index.js
# packages/common/constants/index.js
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbFolder.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/Entries/OrderBy.cs
# products/ASC.Files/Core/Core/Entries/Tag.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/UsersQuotaSyncOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/UserController.cs
# public/locales/en/Common.json
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/RequestsDto/QuotaSettingsRequestsDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/QuotaDto.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2023-10-04 16:56:49 +03:00 |
|
|
|
477976da29
|
Revert "Merge branch 'develop' into feature/oauth2-client"
This reverts commit 9d93525a91.
|
2023-10-04 16:10:13 +03:00 |
|
|
|
148def0bb5
|
Merge branch 'develop' into feature/data-migration
|
2023-10-04 15:23:34 +03:00 |
|
|
|
9d93525a91
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-04 13:24:59 +03:00 |
|
edjalilov
|
5c380834ab
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# ASC.Web.sln
# ASC.Web.slnf
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
# common/ASC.Data.Storage/DataOperators/IDataOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
# common/ASC.Migration/ASC.Migration.Core.csproj
# common/ASC.Migration/Core/AbstractMigration.cs
# common/ASC.Migration/Core/IMigration.cs
# common/ASC.Migration/Core/ImportableEntity.cs
# common/ASC.Migration/Core/MigrationIntegrationEvent.cs
# common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
# common/ASC.Migration/Core/MigrationLogger.cs
# common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
# common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
# common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
# common/ASC.Migration/Core/Models/Api/MigrationCore.cs
# common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
# common/ASC.Migration/Core/Models/MigratingFiles.cs
# common/ASC.Migration/Core/Models/MigratingUser.cs
# common/ASC.Migration/Core/Models/MigrationInfo.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
# common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
# common/ASC.Migration/GlobalUsings.cs
# common/ASC.Migration/Resources/MigrationResource.Designer.cs
# common/ASC.Migration/Resources/MigrationResource.resx
# config/nginx/onlyoffice.conf
# config/storage.json
# packages/client/src/components/dialogs/index.js
# packages/client/src/store/index.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Startup.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
# web/ASC.Web.Studio/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-10-04 14:57:29 +05:00 |
|
Akmal Isomadinov
|
bdddc705bb
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilterTypeEnum.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.Files/Core/Helpers/DocSpaceHelper.cs
|
2023-10-04 14:34:03 +05:00 |
|
Viktor Fomin
|
f6f3369b8a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-02 12:21:15 +03:00 |
|
mushka-n
|
e91f1f2e61
|
added translation keys
|
2023-10-02 03:52:47 +03:00 |
|
|
|
13d090c178
|
Web: Added ru translations + autofixes
|
2023-09-29 17:59:55 +04:00 |
|
Akmal Isomadinov
|
0748d05c19
|
Web: Added alert badge
|
2023-09-29 18:41:26 +05:00 |
|
Elyor Djalilov
|
b92a25719d
|
transferring changes from Google to NextCloud
|
2023-09-29 18:14:24 +05:00 |
|
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
|
2fc6e600f8
|
Web: Added quota change when creating a room.
|
2023-09-28 19:06:57 +03:00 |
|
Viktor Fomin
|
a220a39f38
|
Client: add translate
|
2023-09-28 18:50:23 +03:00 |
|
Viktor Fomin
|
9bfe6a57af
|
Client: delete useless
|
2023-09-28 18:50:14 +03:00 |
|
Elyor Djalilov
|
3116c25d9f
|
Merge branch 'develop' into feature/data-migration
|
2023-09-28 18:17:38 +05:00 |
|
Viktor Fomin
|
d11f3a997f
|
Client: add translate
|
2023-09-28 15:56:49 +03:00 |
|
Akmal Isomadinov
|
ec45eebb88
|
Web:FormRoom: Added empty screen
|
2023-09-28 17:21:07 +05:00 |
|
|
|
3e204513a4
|
Web: added ru translation (FileManagement key) + autosorting
|
2023-09-28 12:44:30 +04:00 |
|
Viktor Fomin
|
005e1b4ff5
|
Merge branch 'develop' into feature/profile-redesign
|
2023-09-27 12:26:24 +03:00 |
|
|
|
1167cfa68f
|
Web: Added default quota reset.
|
2023-09-27 11:48:48 +03:00 |
|
Viktor Fomin
|
6604167a14
|
Client: add translate
|
2023-09-27 00:04:52 +03:00 |
|
Elyor Djalilov
|
7a4e734699
|
added empty screen
|
2023-09-26 13:40:12 +05:00 |
|
|
|
ea3c18dcc7
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 12:21:59 +04:00 |
|
|
|
88b283a28a
|
Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys
|
2023-09-26 12:21:40 +04:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
mushka-n
|
10f8b0e00a
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-25 14:25:46 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
Akmal Isomadinov
|
d70c057848
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2023-09-25 10:40:22 +05:00 |
|
mushka-n
|
a843a45b09
|
merge develop + merge fix
|
2023-09-23 23:52:51 +03:00 |
|
mushka-n
|
4cf63b74b7
|
added empty screen translation key
|
2023-09-23 23:49:13 +03:00 |
|
|
|
3c9dfca8c8
|
Web: Removed useless translations
|
2023-09-22 17:16:52 +04:00 |
|
|
|
a6d9ea95e9
|
Web: Removed useless key DNSSettingsTooltip
|
2023-09-22 17:13:57 +04:00 |
|
|
|
a4a89ed1c4
|
web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing
|
2023-09-22 16:25:41 +04:00 |
|
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
Akmal Isomadinov
|
0d46cd6394
|
Web:CreateEditRoomDialog: Added SystemFolders component
|
2023-09-22 16:41:06 +05:00 |
|
Elyor Djalilov
|
af407378de
|
fix bad merge
|
2023-09-22 14:44:40 +05:00 |
|
Akmal Isomadinov
|
d4211afcab
|
Web: Added translations
|
2023-09-21 19:31:10 +05:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
Elyor Djalilov
|
94685e3794
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# common/ASC.Data.Storage/DataOperators/WriteOperators/ZipWriteOperator.cs
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/index.js
# products/ASC.People/Server/Startup.cs
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2023-09-21 15:30:39 +05:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
b3023358f2
|
Client: delete useless
|
2023-09-20 17:35:56 +03:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
|
|
f1da568484
|
Merge branch 'develop' into feature/split-invite
|
2023-09-20 18:16:31 +04:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
3d20697ac0
|
Web: Translation: Fix UTC key duplication + sorting
|
2023-09-20 15:36:34 +04:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
Viktor Fomin
|
915eef9d91
|
Client: add translate
|
2023-09-20 11:30:28 +03:00 |
|
mushka-n
|
693a1bf02b
|
merge with develop (and submit-to-form-gallery)
|
2023-09-19 16:42:56 +03:00 |
|
Viktor Fomin
|
19e1b51887
|
Merge branch 'develop' into feature/split-invite
|
2023-09-19 14:04:18 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
|
|
fb6d0b06a9
|
edited 'Move to Trash' description
|
2023-09-19 12:29:04 +03:00 |
|
mushka-n
|
2b58726b86
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-19 12:02:57 +03:00 |
|
|
|
ca76336fc3
|
Merge branch 'develop' into feature/leave-room
|
2023-09-19 10:44:07 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
gazizova-vlada
|
c34f60577d
|
Web:Client:Add translation.
|
2023-09-19 09:08:14 +03:00 |
|
|
|
91ae0883e9
|
Web:Client:Plugins: fix plugin dialog
|
2023-09-19 08:58:48 +03:00 |
|
gazizova-vlada
|
4d1fc192d0
|
Web:Client:Change translation Account list to List accounts.
|
2023-09-18 18:43:18 +03:00 |
|
mushka-n
|
d98680b350
|
moved translations and updated selector
|
2023-09-18 17:10:16 +03:00 |
|
|
|
74f9ea784b
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 16:31:27 +04:00 |
|
|
|
2f1f2ef4fa
|
Web: Client: fix long text in theme edit button
|
2023-09-18 13:28:32 +02:00 |
|
|
|
e0b4b232df
|
Web: Files: Leave-room: fixed translations
|
2023-09-18 13:50:33 +03:00 |
|
|
|
95424d49f9
|
Web: Added ru translations + autofixes
|
2023-09-18 14:17:00 +04:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
|
|
0deac4bf00
|
Merge branch 'develop' into feature/mobile-sdk
|
2023-09-18 13:45:20 +04:00 |
|
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
Viktor Fomin
|
71e5179f64
|
Merge branch 'develop' into feature/split-invite
|
2023-09-15 18:12:30 +03:00 |
|
|
|
c32c2b61f7
|
Web: Files: fixed translations
|
2023-09-15 17:56:05 +03:00 |
|
|
|
4ad47b9797
|
Merge branch 'develop' into feature/cron
|
2023-09-15 18:15:37 +04:00 |
|
|
|
a5662b7cdd
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/public/locales/en/Files.json
|
2023-09-15 16:54:26 +03:00 |
|
Viktor Fomin
|
6229112857
|
Client: add translate
|
2023-09-15 12:06:39 +03:00 |
|
mushka-n
|
a81c62a099
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-15 00:45:03 +03:00 |
|
mushka-n
|
cf735a6fbe
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-15 00:43:58 +03:00 |
|
|
|
e26bcc6ee2
|
Web:Client:Plugins: update list of plugins at portal settings, change settings plugin dialog
|
2023-09-14 18:27:37 +03:00 |
|
Viktor Fomin
|
d363808d00
|
Merge branch 'develop' into feature/split-invite
|
2023-09-14 12:24:28 +03:00 |
|
|
|
23202b8477
|
web: Files: fixed translation key
|
2023-09-14 12:04:19 +03:00 |
|
