Commit Graph

1820 Commits

Author SHA1 Message Date
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
478366acfb Merge branch 'release/v2.6.0' into feature/regional-logo 2024-07-19 16:08:52 +04:00
4dca95bb82 images: added regional logos 2024-07-19 15:06:42 +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
Akmal Isomadinov
820f32dd67 Doceditor:Components:CompletedForm Added a new design 2024-07-13 21:17:08 +05: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
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
d7bd794854 Fix Bug 69074 2024-07-10 13:56:21 +03: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
0eba3145e5 Shared:Components:Selector:Fixed icon size 2024-07-09 12:42:36 +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
7ff6ccd604 Web:Public:Images: Added icons 2024-07-08 19:36:43 +05:00
Akmal Isomadinov
eab4ef7d64 Merge branch 'release/v2.6.0' into feature/form-room 2024-07-08 16:53:59 +05:00
0d7a02a7fc Fix Bug 69003 - Hide history display for rooms based on third-party storage. 2024-07-08 13:00:54 +03:00
Akmal Isomadinov
0474be1fa0 Client:Components: Added ShareCollectSelector 2024-07-05 16:59:43 +05:00
dd435561a5 setup default config for oauth origin parameter 2024-07-04 18:51:04 +03:00
ec50a38834 Fix Bug 68956: Wrong documents icon on tablet/mobile 2024-07-03 13:20:59 +02:00
c69e321daa Fix bug 68262 - Add hint text above the new password input. 2024-07-02 16:01:27 +03:00
5f712f87f3 Add oauth origin for client config 2024-06-28 18:44:39 +03:00
0fb2b762c0 Merge branch 'develop' into feature/oauth2-client 2024-06-24 14:01:36 +03:00
35ef0b8832 images: notifications: new icon 2024-06-22 15:08:03 +03:00
8c976678d2 Merge branch 'develop' into feature/embedding-settings 2024-06-21 11:38:29 +04:00
51bb9ccbfe Translations: Fix EmptyValueKeysTest issues 2024-06-20 16:51:42 +04:00
056cad63a4 Merge branch 'develop' into feature/embedding-settings 2024-06-20 15:41:14 +03: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
f16ba9f57e Public:Scripts:Config: add oauth2 publicClient flag 2024-06-19 15:19:18 +03:00
252eb14be5 Merge branch 'develop' into feature/oauth2-client 2024-06-19 15:16:18 +03:00
Akmal Isomadinov
99cd9ad8cc Merge branch 'develop' into bugfix/form-room 2024-06-19 15:59:19 +05:00
Akmal Isomadinov
4d48d3563e Public:Locales Fixed translation 2024-06-19 14:47:38 +05:00
Akmal Isomadinov
a9f38e7586 Client:Home:InfoPanel Added anonymous 2024-06-19 14:45:57 +05:00
8a001cf415 Added new images for notifications 2024-06-18 18:25:18 +03:00
6145817cb8 Merge branch 'develop' into feature/oauth2-client 2024-06-18 13:12:53 +03:00
Akmal Isomadinov
1b99bc534f Merge branch 'develop' into bugfix/form-room 2024-06-18 14:44:51 +05:00
a74bcac2f1 edited variables sr-cyrl 2024-06-18 11:28:09 +03:00
Akmal Isomadinov
181f412e8c Doceditor: Fixed share PDF form 2024-06-18 12:02:21 +05:00
Akmal Isomadinov
67f9c3097e Public:Locales Fixed context menu 2024-06-17 16:43:04 +05:00
a639635c98 Merge branch 'develop' into feature/ldap-settings
# Conflicts:
#	packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
#	packages/login/src/components/LoginForm/index.tsx
#	packages/shared/store/SettingsStore.ts
#	public/locales/en/Common.json
2024-06-17 15:17:07 +04:00
834513ecd3 Client: Added common flag for "sr-Cyrl-RS" 2024-06-17 14:55:55 +04:00