Commit Graph

50 Commits

Author SHA1 Message Date
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
a5560a7411 Shared: fix SSR issue 2024-08-08 16:40:51 +03:00
447003315c Merge branch 'develop' into refactoring/global-colors 2024-07-30 13:00:40 +03:00
Akmal Isomadinov
fbbf03f366 Fixed modal form 2024-07-26 15:57:28 +05:00
165f57ea88 Merge branch 'develop' into refactoring/global-colors 2024-07-24 15:04:46 +03:00
292d420caa Rebranding: move PRODUCT_NAME to Common.json 2024-07-18 18:48:09 +04:00
c056f494ee Shared: removed useless constant 2024-07-18 18:27:53 +04:00
ca460ca70a Translations corrected. 2024-07-10 14:29:32 +03:00
34de0fcf90 Fixed translations. 2024-07-10 13:51:13 +03:00
c69e321daa Fix bug 68262 - Add hint text above the new password input. 2024-07-02 16:01:27 +03:00
dd33d42d3b Shared: use colors from theme 2024-06-25 18:13:25 +03:00
64e41eb0e4 Merge branch 'develop' into refactoring/global-colors 2024-06-24 15:37:48 +03:00
99d4eb86b2 Web: fixed SDK_SCRIPT_URL 2024-06-21 17:38:27 +03:00
cca4ca8621 Merge branch 'develop' into refactoring/global-colors 2024-06-21 16:26:04 +03:00
0e816d2d12 Web: Files: moved SDK_SCRIPT_URL to constants 2024-06-21 16:00:18 +03:00
dedbc057ae Shared: use colors from theme 2024-06-21 12:50:12 +03:00
f60ef3547d Renaming. 2024-06-14 13:19:28 +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
a287238d47 Renaming PORTAL value. 2024-06-11 13:20:10 +03:00
e16ffcda06 Added ClientConfig. 2024-06-11 11:23:31 +03:00
dd0ab01575 Deleted useless code. 2024-06-10 21:29:28 +03:00
40dc2c1c1b Added new constant. 2024-06-10 17:14:25 +03:00
c0ee32f303 Added interpolation for 'DocspaceAdmin' key. 2024-05-30 13:13:43 +03:00
4e34a66481 Shared: apply save system theme as cookie 2024-05-02 10:15:45 +03:00
Akmal Isomadinov
0623e57d9e Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/doceditor/src/utils/index.ts
2024-04-19 16:42:10 +05:00
8a202e1d79 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/Article/MainButton/index.js
#	packages/shared/utils/common.ts
2024-04-19 13:13:00 +04:00
Akmal Isomadinov
73e5573b48 Client:Store:DialogsStore fix create a form from document 2024-04-18 16:53:53 +05:00
85955cca2f Client: Login: DocEditor Set system font for arabic lang 2024-04-17 10:55:33 +02:00
Akmal Isomadinov
ab5c076dc6 Client:Store:FilesStore Added ws for PDF modals 2024-04-01 20:46:32 +05:00
027646f8ea Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
#	packages/doceditor/src/app/global-error.tsx
#	packages/doceditor/src/components/Root.tsx
#	packages/doceditor/src/hooks/useUpdateSearchParamId.ts
#	packages/doceditor/src/utils/actions.ts
#	packages/doceditor/src/utils/index.ts
2024-03-22 16:20:48 +04:00
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
043f584109 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
2024-03-18 14:55:42 +04:00
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Akmal Isomadinov
fe1ace1795 Merge branch 'develop' into feature/redesign-form-filling-room
# Conflicts:
#	public/locales/en/Common.json
2024-03-13 16:38:57 +05:00
Akmal Isomadinov
5fad4f34b8 Client:Article:MainButton: Added form file selection actions 2024-03-13 15:24:41 +05:00
2c5c39114c Shared: fix some typescript errors 2024-03-06 12:37:13 +03:00
b0a94d1629 Shared: fix eslint errors and warnings 2024-03-06 11:45:42 +03:00
a1c8069301 Fix NotFoundKeysTest issues 2024-03-06 02:23:47 +04:00
Akmal Isomadinov
2a9fa214dd Client:PublicRoom Fixed preview in the public room 2024-03-04 17:14:33 +05:00
e46207cf8b Shared:Selectors:Files: init, fix usage, rewrite to typescript additional components 2024-02-09 12:28:10 +03:00
f2b1e4d0a0 Merge branch 'feature/shared-article' into feature/refactoring-auth-store 2024-01-24 14:41:25 +03:00
e2ffa1d739 Web: renamed the route to view media 2024-01-23 20:36:15 +05:00
f77842b26f Shared:Store:CurrentQuotaStore: rewrite to typescript 2024-01-23 18:13:44 +03:00
1d2cabdc4e Shared:Constants\Enums: move from common 2023-12-29 10:06:37 +03:00
db64b1a06f Shared: fix imports 2023-12-06 21:11:14 +03:00
56088f90bb Shared:Components:Textarea: rewrite to typescript 2023-12-06 15:03:40 +03:00
38d19eb0b4 Shared: refactoring and apply code guide style 2023-12-05 19:52:30 +03:00
7b5df6161e Shared: fix eslint warnings 2023-11-24 10:43:45 +03:00
5be7801fb9 Shared: init workspace, fix storybook, fix jest, add react-testing-library 2023-11-23 18:25:24 +03:00