|
|
b404c0eb15
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-09 17:51:42 +04: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 |
|
|
|
ac5094c2ea
|
Merge branch 'develop' into feature/ssr-confirm
|
2024-08-09 17:15:21 +04:00 |
|
|
|
65ded50972
|
Client:Public:Locales:Fix indent
|
2024-08-09 17:10:32 +04:00 |
|
|
|
101865503e
|
Client:Public:Locales: add Deactivate translation
|
2024-08-09 15:49:11 +04:00 |
|
|
|
dd1996b37b
|
edited translations
|
2024-08-08 11:26:24 +03:00 |
|
|
|
81a7458921
|
edited de
|
2024-08-08 10:36:46 +03:00 |
|
|
|
665dc98870
|
added translations
|
2024-08-07 13:27:58 +03: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 |
|
|
|
34a5785660
|
added translations
|
2024-08-05 15:25:46 +03:00 |
|
|
|
5c9a26987c
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# packages/shared/api/rooms/index.ts
|
2024-08-05 15:37:22 +04:00 |
|
|
|
f47a65777b
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-05 15:35:03 +04:00 |
|
|
|
7c85b7038c
|
added translations
|
2024-08-02 18:50:28 +03:00 |
|
|
|
cd0fb0e4e0
|
Translations: Fix UselessTranslationKeysTest issues
|
2024-08-02 17:34:28 +04:00 |
|
|
|
88c0df3a88
|
Merge branch 'hotfix/v2.6.1' into develop
|
2024-08-02 17:24:09 +04:00 |
|
|
|
fd81e8e302
|
Merge branch 'hotfix/v2.6.1' into bugfix/65023
|
2024-08-02 16:56:14 +04:00 |
|
|
|
ab6f8a9e8a
|
Web: Doceditor: FilePassword: fixed text styles
|
2024-08-02 14:13:55 +03:00 |
|
|
|
35edf993ca
|
Fix Bug 69046 - Rooms. Added password dialog for public files
|
2024-08-02 13:17:03 +03:00 |
|
|
|
21b585fc7e
|
Web: Shared: LinkRow: reworked link regeneration to link deletion
|
2024-08-01 17:28:02 +03:00 |
|
|
|
171b60e553
|
Add lo, ru; numerious fixes for multiple languages
|
2024-08-01 13:14:48 +03:00 |
|
|
|
873d91e977
|
Fix Bug 65023 - Files. Added confirmation dialog when copying/moving a folder
|
2024-07-31 12:03:59 +03:00 |
|
|
|
a5640c4628
|
Add translations for multiple languages
|
2024-07-26 15:04:24 +03:00 |
|
|
|
1972f6dc15
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# public/locales/en/Common.json
|
2024-07-25 11:25:59 +03: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 |
|
|
|
a98b6adba7
|
Merge branch 'release/v2.6.0' into feature/confirmation-screen
|
2024-07-20 12:57:17 +04:00 |
|
Akmal Isomadinov
|
e4cfaa244a
|
Client: move translation LinkCopySuccess to Common
|
2024-07-19 20:51:39 +05:00 |
|
|
|
bbcff840ad
|
Merge branch 'release/v2.6.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-19 17:15:59 +03:00 |
|
|
|
ea46b0496c
|
Add translations for ZH
|
2024-07-19 17:15:22 +03:00 |
|
|
|
080f560a38
|
Client: Added/applied ProductEditorsName translation key
|
2024-07-19 13:17:40 +04: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 |
|
|
|
aee66ff680
|
Translations: fix UselessTranslationKeysTest issues
|
2024-07-17 15:36:49 +04:00 |
|
|
|
c2fc3eada7
|
Merge branch 'develop' into feature/public-edit
|
2024-07-11 13:00:47 +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 |
|
|
|
3a3c4a6d3c
|
Web: Files: added public-room editing
|
2024-07-10 19:07:53 +03:00 |
|
Akmal Isomadinov
|
a4b7a3663e
|
Merge branch 'release/v2.6.0' into feature/form-room
|
2024-07-10 18:26:12 +05:00 |
|
Akmal Isomadinov
|
76fe42b1f0
|
Client:Components:CreatedPDFFormDialog Added checkbox and changed functionality
|
2024-07-10 18:22:25 +05:00 |
|
|
|
b1b7c75941
|
Fix UselessTranslationKeysTest issues
|
2024-07-10 13:16:14 +04:00 |
|
Akmal Isomadinov
|
773c36839f
|
Shared:Components:Selector: Added info bar
|
2024-07-09 18:39:34 +05:00 |
|
Akmal Isomadinov
|
9233ab844b
|
Client Fixed translations
|
2024-07-09 12:27:56 +05:00 |
|
Akmal Isomadinov
|
4cb330bca8
|
Shared:Components:Selector Added empty screen
|
2024-07-08 19:39:48 +05:00 |
|
Akmal Isomadinov
|
0474be1fa0
|
Client:Components: Added ShareCollectSelector
|
2024-07-05 16:59:43 +05:00 |
|
|
|
c69e321daa
|
Fix bug 68262 - Add hint text above the new password input.
|
2024-07-02 16:01:27 +03:00 |
|
|
|
0fb2b762c0
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-24 14:01:36 +03:00 |
|
|
|
51bb9ccbfe
|
Translations: Fix EmptyValueKeysTest issues
|
2024-06-20 16:51:42 +04:00 |
|
|
|
b5ae010c29
|
Translations: Fix WrongTranslationVariablesTest issues
|
2024-06-20 16:27:14 +04:00 |
|
|
|
13cc8c1ad5
|
Translations: Fix UselessTranslationKeysTest
|
2024-06-20 15:29:24 +04:00 |
|
|
|
8283ed16e6
|
Merge branch 'develop' into feature/sr-cyrl
|
2024-06-20 12:46:42 +04:00 |
|
