Commit Graph

826 Commits

Author SHA1 Message Date
e9f5327d7c Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/shared/components/room-icon/index.tsx
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
#	packages/shared/themes/globalColors.ts
2024-08-22 12:29:56 +04:00
38e17d813d Fix Bug 69791
Don't display favicon in Safari
2024-08-21 15:55:26 +03:00
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
b614938b2b Login: Ldap: fix display wrong placeholder on disabled LDAP settings 2024-08-12 18:56:12 +04:00
7332d45c03 Shared:Utils:Common: pass culture to handler logo url 2024-08-12 15:40:03 +03:00
810b20ca5f Login: return select language for mobile 2024-08-09 17:11:10 +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
1b968c3149 Login: move getPortalCultures from server to client 2024-08-09 12:42:39 +03:00
1cb8af424c Login: fix ldap 2024-08-09 12:40:17 +03:00
7dc348e05a Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-08-09 10:04:31 +03:00
9e040104ec Login: move thirdparty requests for server and fix image blinking 2024-08-08 17:48:54 +03:00
dd1996b37b edited translations 2024-08-08 11:26:24 +03:00
560e57947f Merge branch 'hotfix/v2.6.1' into feature/update-langs_2.6.1 2024-08-07 15:59:24 +04:00
665dc98870 added translations 2024-08-07 13:27:58 +03:00
ebbdbaab73 Merge branch 'develop' into refactoring/global-colors 2024-08-07 14:18:27 +04:00
a15e40d24d Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/shared/components/share/sub-components/LinkRow.tsx
2024-08-07 11:47:58 +04:00
a5fb33ba7e added translations 2024-08-06 17:07:50 +03:00
3df780c3c9 added translations 2024-08-06 13:37:18 +03:00
25f11b05c8 added translations 2024-08-05 18:40:08 +03:00
23f4d60d96 Fix Bug 69385 - Added border for language combobox. 2024-08-05 16:05:57 +03:00
34a5785660 added translations 2024-08-05 15:25:46 +03:00
c708b6cda3 Merge branch 'develop' into refactoring/global-colors 2024-08-05 14:01:25 +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
Vlada Gazizova
ea8c7adab8 Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1 2024-07-30 18:56:43 +03:00
Vlada Gazizova
0fba5917fd Fixed Bug 69435 - Security:Session Lifetime. Duplicate error when logging out after ending a session 2024-07-30 18:56:38 +03: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
602ce53411 Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
2024-07-29 16:13:17 +04:00
a5640c4628 Add translations for multiple languages 2024-07-26 15:04:24 +03:00
165f57ea88 Merge branch 'develop' into refactoring/global-colors 2024-07-24 15:04:46 +03:00
02ad0b2719 Fix Bug 69376 - Settings: SDK. The portal does not load when embedding html code on the site 2024-07-24 14:00:23 +04:00
116702d286 Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx
#	packages/login/src/components/Invalid.tsx
2024-07-22 20:23:04 +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
97d7847fd3 Fix Bug 69244
Custom logo doesn't fit on mobile
2024-07-17 12:21:20 +03:00
e08a86bd99 Merge branch 'refs/heads/develop' into feature/rtl-refactor
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/UsersRowContent.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
#	packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
#	packages/client/src/pages/PortalSettings/categories/data-import/sub-components/StepLayout.tsx
2024-07-16 11:09:25 +02:00
2358f9aac5 Login: refactor rtl 2024-07-16 10:30:33 +02:00
f1e6f79704 Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/login/src/components/LoginForm/index.tsx
2024-07-12 11:11:05 +04:00
0266d5cb74 Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0 2024-07-11 17:21:53 +03:00
6ca6763215 Fixed Bug 69125 - Mobile. The Recover access button is hidden on the login page when a captcha appears 2024-07-11 17:21:44 +03:00
554826a185 Login: LoginForm: Fixed checkConfirmLink for login inside confirm flow 2024-07-11 16:16:05 +03:00
99e265ebee Merge branch 'release/v2.6.0' into develop
# Conflicts:
#	packages/client/src/components/PrivateRouteWrapper/index.tsx
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/login/src/app/layout.tsx
#	packages/login/src/components/LoginForm/index.tsx
#	packages/login/src/middleware.ts
#	packages/login/src/utils/index.ts
#	packages/shared/components/table/TableHeader.tsx
#	packages/shared/routes/Route.private.tsx
2024-07-11 12:27:31 +04:00
6142d26b61 Login: fix health check for localhost 2024-07-10 11:20:05 +03:00
66c6062c76 Login: fix autocomplete 2024-07-08 13:08:07 +03:00