Commit Graph

1814 Commits

Author SHA1 Message Date
f60ef3547d Renaming. 2024-06-14 13:19:28 +03:00
e247ba3db3 Renaming. 2024-06-14 13:07:19 +03:00
45b363a770 Changed import. 2024-06-14 12:41:49 +03:00
e02d05c43f Merge branch 'develop' into feature/values-renaming 2024-06-14 12:19:34 +04:00
6ef8481e88
Merge pull request #479 from ONLYOFFICE/feature/hcaptcha
Feature/hcaptcha
2024-06-14 12:13:39 +04:00
a7d26ad8f7
Merge pull request #481 from ONLYOFFICE/bugfix/bug-68497
bugfix/bug-68497
2024-06-14 12:09:47 +04:00
5593c4b655 Merge branch 'develop' into feature/values-renaming 2024-06-14 11:27:02 +04:00
600d076f5c Merge branch 'develop' into feature/hcaptcha 2024-06-14 09:52:15 +03:00
f98433c0bd
Merge pull request #482 from ONLYOFFICE/feature/max-image-upload-size
Feature/max image upload size
2024-06-13 17:23:44 +04:00
c948f377f1 Accounts: change pending status and translation 2024-06-13 16:22:52 +04:00
e6bd7fbc63 Deleted useless settings parameter. 2024-06-13 15:04:49 +03:00
ac39456e8c Shared:Components:ImageEditor: add support maxImageSize 2024-06-13 14:34:00 +03:00
8af20b8e41 Shared:API:Settings: add maxUploadImageSize 2024-06-13 14:33:27 +03:00
850c667145 Renaming. 2024-06-13 14:10:28 +03:00
Akmal Isomadinov
8b027f5709 Client:Components Fixed bug 68497 added tooltip 2024-06-13 15:32:58 +05: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
83aa877b74 Merge branch 'develop' into feature/hcaptcha 2024-06-13 10:40:17 +03:00
a78086c680 Shared: add captchaKey and captchaType for login 2024-06-13 10:38:15 +03:00
cb0fd44eb3 Merge branch 'develop' into bugfix/standalone 2024-06-11 20:32:48 +04: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
Akmal Isomadinov
fb940c9add Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/client/public/locales/en/EmptyView.json
#	packages/client/src/components/Article/MainButton/index.js
#	packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
2024-06-11 20:15:15 +05: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
00b54b88e3
Merge pull request #471 from ONLYOFFICE/bugfix/fixed-multiple-windows-table
Web: Components: fixed table for multiple windows
2024-06-11 14:23:10 +03:00
Akmal Isomadinov
70e0561351 Shared:Selectors:Files Fixed socket 2024-06-11 16:22:08 +05:00
6531435d84 Merge branch 'develop' into feature/values-renaming 2024-06-11 13:53:39 +03:00
07050701a8 Fixed translations. 2024-06-11 13:33: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
7b57fc663a Web: Components: fixed table for multiple windows 2024-06-11 11:03:45 +03:00
6ad60b9446 Merge branch 'develop' into feature/branding-translation-correction 2024-06-10 23:32:26 +04:00
e2dfd760be Accounts: Filter: Change filtration status to EmployeeStatus totally (+new pending) 2024-06-10 23:23:30 +04:00
dd0ab01575 Deleted useless code. 2024-06-10 21:29:28 +03:00
1197023bd6 Renaming the function to portalSettingsUrl name. 2024-06-10 21:27:26 +03:00
d05b37638f Renaming the component to PortalLogo name. 2024-06-10 21:21:38 +03:00
9cc09bb00f Added PortalAdmin key. 2024-06-10 20:40:58 +03:00
40dc2c1c1b Added new constant. 2024-06-10 17:14:25 +03:00
Akmal Isomadinov
58dbc2f406 Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/client/public/locales/en/EmptyView.json
#	packages/client/src/components/Article/MainButton/index.js
#	packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
2024-06-10 17:40:22 +05:00
b789129fbf Added value for interpolation. 2024-06-10 14:42:59 +03:00
Akmal Isomadinov
6f29496a91 Client:Store:UploadDataStore Refactoring 2024-06-10 15:08:00 +05:00
Akmal Isomadinov
d4d350c8af Shared:Selectors:Files:Hooks:UseRoomsHelper Added filter by type 2024-06-10 11:22:57 +05:00
c8df2d9703 Merge branch 'develop' into feature/branding-correction
# Conflicts:
#	packages/client/public/locales/ar-SA/CreateEditRoomDialog.json
#	packages/client/public/locales/az/CreateEditRoomDialog.json
#	packages/client/public/locales/bg/CreateEditRoomDialog.json
#	packages/client/public/locales/cs/CreateEditRoomDialog.json
#	packages/client/public/locales/de/CreateEditRoomDialog.json
#	packages/client/public/locales/el-GR/CreateEditRoomDialog.json
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/es/CreateEditRoomDialog.json
#	packages/client/public/locales/fi/CreateEditRoomDialog.json
#	packages/client/public/locales/fr/CreateEditRoomDialog.json
#	packages/client/public/locales/hy-AM/CreateEditRoomDialog.json
#	packages/client/public/locales/it/CreateEditRoomDialog.json
#	packages/client/public/locales/ja-JP/CreateEditRoomDialog.json
#	packages/client/public/locales/ko-KR/CreateEditRoomDialog.json
#	packages/client/public/locales/lo-LA/CreateEditRoomDialog.json
#	packages/client/public/locales/lv/CreateEditRoomDialog.json
#	packages/client/public/locales/nl/CreateEditRoomDialog.json
#	packages/client/public/locales/pl/CreateEditRoomDialog.json
#	packages/client/public/locales/pt-BR/CreateEditRoomDialog.json
#	packages/client/public/locales/pt/CreateEditRoomDialog.json
#	packages/client/public/locales/ro/CreateEditRoomDialog.json
#	packages/client/public/locales/ru/CreateEditRoomDialog.json
#	packages/client/public/locales/si/CreateEditRoomDialog.json
#	packages/client/public/locales/sk/CreateEditRoomDialog.json
#	packages/client/public/locales/sl/CreateEditRoomDialog.json
#	packages/client/public/locales/sr-Latn-RS/CreateEditRoomDialog.json
#	packages/client/public/locales/tr/CreateEditRoomDialog.json
#	packages/client/public/locales/uk-UA/CreateEditRoomDialog.json
#	packages/client/public/locales/vi/CreateEditRoomDialog.json
#	packages/client/public/locales/zh-CN/CreateEditRoomDialog.json
2024-06-07 15:49:36 +03:00
350530171f Fix Bug 68201 - Mobile: fixed select 2024-06-07 13:55:52 +03:00
6bb7a52bcf Merge branch 'develop' into bugfix/standalone 2024-06-07 10:35:11 +04:00
b10b85e8ab Merge branch 'develop' into feature/form-room
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
2024-06-06 23:14:40 +04:00
3e80644009 Shared:Utils:MoveTranslations: init 2024-06-06 17:50:20 +03:00
96cf33146f Shared:Selectors:Files: now replace input item from socket, but not from selector component 2024-06-06 17:47:56 +03:00
6c83c3a044 Added Bonus page for Spaces. Added page redirection. 2024-06-06 16:37:00 +03:00
0fc19070dc Login: add recaptcha component 2024-06-06 16:12:25 +03:00
539a0aa1cd Merge branch 'develop' into feature/create-room-selector 2024-06-06 16:28:57 +04:00