|
|
0c48a11f07
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/login/src/app/(root)/page.tsx
# packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
|
2024-08-12 19:10:02 +04:00 |
|
|
|
51fa9bc2c5
|
Management: fix mobile style
|
2024-08-12 17:07:46 +03:00 |
|
|
|
a2302aa248
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/Confirm/sub-components/activateUser.js
# packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/CertificateDialog.js
# packages/client/src/pages/PublicRoom/sub-components/RoomStyles.js
# packages/login/src/app/(root)/layout.tsx
# packages/login/src/app/(root)/page.tsx
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/types/index.ts
# packages/login/src/utils/actions.ts
# packages/shared/constants/index.ts
# packages/shared/themes/base.ts
|
2024-08-09 17:23:25 +04:00 |
|
|
|
9565631a85
|
Merge pull request #577 from ONLYOFFICE/feature/update-langs_2.6.1
Feature/update langs 2.6.1
|
2024-08-08 22:37:12 +04:00 |
|
|
|
04cf1999d7
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-06 13:59:26 +03:00 |
|
|
|
3df780c3c9
|
added translations
|
2024-08-06 13:37:18 +03:00 |
|
|
|
50f593032b
|
Deleted useless request.
|
2024-08-06 10:12:27 +03:00 |
|
|
|
c708b6cda3
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-05 14:01:25 +03:00 |
|
|
|
547301e286
|
Merge branch 'develop' into feature/update-react-router-dom
|
2024-08-05 12:23:06 +03:00 |
|
|
|
7c85b7038c
|
added translations
|
2024-08-02 18:50:28 +03:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
|
adc9d0c3db
|
Merge branch 'hotfix/v2.6.1' into feature/translations_v2.6
# Conflicts:
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/lo-LA/Settings.json
|
2024-08-01 18:08:40 +04:00 |
|
|
|
171b60e553
|
Add lo, ru; numerious fixes for multiple languages
|
2024-08-01 13:14:48 +03:00 |
|
|
|
05e6532851
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-31 22:36:13 +03:00 |
|
|
|
948add3bf4
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-07-30 20:33:27 +04:00 |
|
|
|
a37d7ccb98
|
Bump version to v2.6.1
|
2024-07-30 19:53:48 +04:00 |
|
|
|
447003315c
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-30 13:00:40 +03:00 |
|
|
|
31323d26ba
|
Merge branch 'refs/heads/develop' into feature/rtl-refactor
# Conflicts:
# packages/client/src/components/ItemIcon.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownMobile.js
# packages/client/src/components/panels/EditLinkPanel/StyledEditLinkPanel.js
# packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
# packages/client/src/components/panels/UploadPanel/FileRow.js
# packages/client/src/pages/FormGallery/Filter/SortFilter/index.styled.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/storage-management/StyledComponent.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/styled-main-profile.js
# packages/shared/components/media-viewer/MediaViewer.styled.ts
|
2024-07-29 15:28:49 +02:00 |
|
|
|
165f57ea88
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-24 15:04:46 +03:00 |
|
|
|
1bc4ea8606
|
Translations: Fix WrongTranslationTagsTest issue (DeletePortalText)
|
2024-07-19 18:49:49 +04:00 |
|
|
|
ea46b0496c
|
Add translations for ZH
|
2024-07-19 17:15:22 +03:00 |
|
|
|
292d420caa
|
Rebranding: move PRODUCT_NAME to Common.json
|
2024-07-18 18:48:09 +04:00 |
|
|
|
205df2f68b
|
Rebranding: move organizationName to Common.json
|
2024-07-18 18:20:37 +04:00 |
|
|
|
de16527f54
|
Management: refactor rtl
|
2024-07-16 10:30:33 +02:00 |
|
|
|
82cd218289
|
Merge branch 'develop' into feature/update-react-router-dom
|
2024-07-12 15:04:01 +03:00 |
|
|
|
10300cefcf
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-28 14:04:00 +03:00 |
|
|
|
ce1bb3ae6b
|
Bump version to v2.6.0
|
2024-06-27 08:18:39 +03:00 |
|
|
|
7d2f4142d5
|
Merge branch 'develop' into feature/update-react-router-dom
|
2024-06-24 11:37:49 +03:00 |
|
|
|
e6a803320a
|
Management: fix after changes routes
|
2024-06-24 10:59:27 +03:00 |
|
|
|
6d9c54fba5
|
Client: add lazy loading for all client pages
|
2024-06-21 16:53:12 +03:00 |
|
|
|
3899336f06
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-20 16:29:15 +03:00 |
|
|
|
a74bcac2f1
|
edited variables sr-cyrl
|
2024-06-18 11:28:09 +03:00 |
|
|
|
2a57c57e07
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-14 16:53:06 +05:00 |
|
|
|
e247ba3db3
|
Renaming.
|
2024-06-14 13:07:19 +03:00 |
|
|
|
6101c7ad60
|
Fixed after merge.
|
2024-06-14 11:03:07 +03:00 |
|
|
|
5593c4b655
|
Merge branch 'develop' into feature/values-renaming
|
2024-06-14 11:27:02 +04:00 |
|
|
|
784d2d3fa3
|
Management: fix missing color
|
2024-06-13 18:10:28 +05:00 |
|
|
|
a25d362723
|
Management: use colors from theme
|
2024-06-13 17:44:09 +05:00 |
|
|
|
c4dfeca90d
|
Management: use colors from theme
|
2024-06-13 16:52:02 +05:00 |
|
|
|
0730775b36
|
Merge branch 'feature/sr-cyrl' into develop
# Conflicts:
# packages/client/public/locales/en/PrivacyPage.json
# packages/client/public/locales/sr-Latn-RS/ChangeUserStatusDialog.json
# packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
# packages/client/public/locales/sr-Latn-RS/Files.json
# packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
# packages/client/public/locales/sr-Latn-RS/Notifications.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PrivacyPage.json
# packages/client/public/locales/sr-Latn-RS/Settings.json
# packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
# packages/client/public/locales/sr-Latn-RS/Webhooks.json
# public/locales/sr-Latn-RS/Common.json
|
2024-06-13 14:23:08 +04:00 |
|
|
|
3fb8f58206
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# public/locales/ar-SA/Common.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/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/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/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/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2024-06-13 11:28:33 +03:00 |
|
|
|
d1a1c9b477
|
Merge branch 'develop' into bugfix/standalone
# Conflicts:
# packages/client/public/locales/ar-SA/PaymentsEnterprise.json
# packages/client/public/locales/az/PaymentsEnterprise.json
# packages/client/public/locales/bg/PaymentsEnterprise.json
# packages/client/public/locales/cs/PaymentsEnterprise.json
# packages/client/public/locales/de/PaymentsEnterprise.json
# packages/client/public/locales/el-GR/PaymentsEnterprise.json
# packages/client/public/locales/en/PaymentsEnterprise.json
# packages/client/public/locales/es/PaymentsEnterprise.json
# packages/client/public/locales/fi/PaymentsEnterprise.json
# packages/client/public/locales/fr/PaymentsEnterprise.json
# packages/client/public/locales/hy-AM/PaymentsEnterprise.json
# packages/client/public/locales/it/PaymentsEnterprise.json
# packages/client/public/locales/ja-JP/PaymentsEnterprise.json
# packages/client/public/locales/ko-KR/PaymentsEnterprise.json
# packages/client/public/locales/lo-LA/PaymentsEnterprise.json
# packages/client/public/locales/lv/PaymentsEnterprise.json
# packages/client/public/locales/nl/PaymentsEnterprise.json
# packages/client/public/locales/pl/PaymentsEnterprise.json
# packages/client/public/locales/pt-BR/PaymentsEnterprise.json
# packages/client/public/locales/pt/PaymentsEnterprise.json
# packages/client/public/locales/ro/PaymentsEnterprise.json
# packages/client/public/locales/ru/PaymentsEnterprise.json
# packages/client/public/locales/si/PaymentsEnterprise.json
# packages/client/public/locales/sk/PaymentsEnterprise.json
# packages/client/public/locales/sl/PaymentsEnterprise.json
# packages/client/public/locales/sr-Latn-RS/PaymentsEnterprise.json
# packages/client/public/locales/tr/PaymentsEnterprise.json
# packages/client/public/locales/uk-UA/PaymentsEnterprise.json
# packages/client/public/locales/vi/PaymentsEnterprise.json
|
2024-06-11 18:27:24 +03:00 |
|
|
|
bfddeae2e2
|
Fixed after merge.
|
2024-06-11 17:17:09 +03:00 |
|
|
|
7ff7a35520
|
Merge branch 'develop' into feature/values-renaming
# Conflicts:
# packages/client/public/locales/ar-SA/JavascriptSdk.json
# packages/client/public/locales/ar-SA/Settings.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/az/Translations.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/bg/Translations.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/cs/Translations.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/de/Translations.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/el-GR/Translations.json
# packages/client/public/locales/en/JavascriptSdk.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/es/Translations.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fi/Translations.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/fr/Translations.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/hy-AM/Translations.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# packages/client/public/locales/it/Translations.json
# packages/client/public/locales/ja-JP/JavascriptSdk.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/ja-JP/Translations.json
# packages/client/public/locales/ko-KR/JavascriptSdk.json
# packages/client/public/locales/ko-KR/Settings.json
# packages/client/public/locales/ko-KR/Translations.json
# packages/client/public/locales/lo-LA/Settings.json
# packages/client/public/locales/lo-LA/Translations.json
# packages/client/public/locales/lv/JavascriptSdk.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/lv/Translations.json
# packages/client/public/locales/nl/JavascriptSdk.json
# packages/client/public/locales/nl/Settings.json
# packages/client/public/locales/nl/Translations.json
# packages/client/public/locales/pl/JavascriptSdk.json
# packages/client/public/locales/pl/Settings.json
# packages/client/public/locales/pl/Translations.json
# packages/client/public/locales/pt-BR/JavascriptSdk.json
# packages/client/public/locales/pt-BR/Settings.json
# packages/client/public/locales/pt-BR/Translations.json
# packages/client/public/locales/pt/JavascriptSdk.json
# packages/client/public/locales/pt/Settings.json
# packages/client/public/locales/pt/Translations.json
# packages/client/public/locales/ro/JavascriptSdk.json
# packages/client/public/locales/ro/Settings.json
# packages/client/public/locales/ro/Translations.json
# packages/client/public/locales/ru/JavascriptSdk.json
# packages/client/public/locales/ru/Settings.json
# packages/client/public/locales/ru/Translations.json
# packages/client/public/locales/si/JavascriptSdk.json
# packages/client/public/locales/si/Settings.json
# packages/client/public/locales/si/Translations.json
# packages/client/public/locales/sk/JavascriptSdk.json
# packages/client/public/locales/sk/Settings.json
# packages/client/public/locales/sk/Translations.json
# packages/client/public/locales/sl/JavascriptSdk.json
# packages/client/public/locales/sl/Settings.json
# packages/client/public/locales/sl/Translations.json
# packages/client/public/locales/sr-Latn-RS/JavascriptSdk.json
# packages/client/public/locales/sr-Latn-RS/Settings.json
# packages/client/public/locales/sr-Latn-RS/Translations.json
# packages/client/public/locales/tr/JavascriptSdk.json
# packages/client/public/locales/tr/Settings.json
# packages/client/public/locales/tr/Translations.json
# packages/client/public/locales/uk-UA/JavascriptSdk.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/public/locales/uk-UA/Translations.json
# packages/client/public/locales/vi/JavascriptSdk.json
# packages/client/public/locales/vi/Settings.json
# packages/client/public/locales/vi/Translations.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/FilesSelector/utils.ts
# packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
# packages/client/src/components/dialogs/DeletePortalDialog/index.js
# packages/client/src/components/panels/InvitePanel/utils/index.js
# packages/client/src/pages/Confirm/sub-components/changePhone.js
# packages/client/src/pages/Confirm/sub-components/continuePortal.js
# packages/client/src/pages/Confirm/sub-components/deactivatePortal.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
# packages/client/src/pages/Home/Section/AccountsBody/People/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/DocSpace.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/sub-components/MainElementParameter.js
# packages/client/src/pages/PortalSettings/categories/payments/SaaS/PaymentContainer.js
# packages/client/src/store/AccountsContextOptionsStore.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/PeopleStore.js
# packages/management/public/locales/ar-SA/Management.json
# packages/management/public/locales/az/Management.json
# packages/management/public/locales/bg/Management.json
# packages/management/public/locales/cs/Management.json
# packages/management/public/locales/de/Management.json
# packages/management/public/locales/el-GR/Management.json
# packages/management/public/locales/en/Management.json
# packages/management/public/locales/es/Management.json
# packages/management/public/locales/fi/Management.json
# packages/management/public/locales/fr/Management.json
# packages/management/public/locales/it/Management.json
# packages/management/public/locales/ja-JP/Management.json
# packages/management/public/locales/ko-KR/Management.json
# packages/management/public/locales/lv/Management.json
# packages/management/public/locales/nl/Management.json
# packages/management/public/locales/pl/Management.json
# packages/management/public/locales/pt-BR/Management.json
# packages/management/public/locales/pt/Management.json
# packages/management/public/locales/ro/Management.json
# packages/management/public/locales/ru/Management.json
# packages/management/public/locales/sk/Management.json
# packages/management/public/locales/sl/Management.json
# packages/management/public/locales/sr-Latn-RS/Management.json
# packages/management/public/locales/tr/Management.json
# packages/management/public/locales/uk-UA/Management.json
# packages/management/public/locales/vi/Management.json
# packages/management/src/categories/spaces/sub-components/ConfigurationSection.tsx
# packages/management/src/categories/spaces/sub-components/dialogs/CreatePortalDialog/index.tsx
# packages/shared/utils/common.ts
# public/locales/ar-SA/Common.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/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/ko-KR/Common.json
# public/locales/lo-LA/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/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/si/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/sr-Latn-RS/Common.json
# public/locales/tr/Common.json
# public/locales/uk-UA/Common.json
# public/locales/vi/Common.json
|
2024-06-11 17:15:32 +03:00 |
|
|
|
55c9942146
|
Renaming portalName value.
|
2024-06-11 13:28:32 +03:00 |
|
|
|
e29d99c9d2
|
Renaming portalName value.
|
2024-06-11 13:24:00 +03:00 |
|
|
|
a287238d47
|
Renaming PORTAL value.
|
2024-06-11 13:20:10 +03:00 |
|
|
|
e16ffcda06
|
Added ClientConfig.
|
2024-06-11 11:23:31 +03:00 |
|
|
|
88b8c9b68c
|
Renaming classes.
|
2024-06-11 11:11:46 +03:00 |
|
|
|
07d8235d2f
|
Added PortalName key.
|
2024-06-10 20:38:57 +03:00 |
|
