Commit Graph

168 Commits

Author SHA1 Message Date
45b363a770 Changed import. 2024-06-14 12:41:49 +03: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
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
Akmal Isomadinov
70e0561351 Shared:Selectors:Files Fixed socket 2024-06-11 16:22:08 +05: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
dd0ab01575 Deleted useless code. 2024-06-10 21:29:28 +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
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
96cf33146f Shared:Selectors:Files: now replace input item from socket, but not from selector component 2024-06-06 17:47:56 +03:00
13504dd59a Components:Selectors:Files: add create room with define room type 2024-06-06 12:21:41 +03:00
6fd4975e19 Shared:Selectors:Files: fix pagination when withCreate true 2024-06-06 10:38:49 +03:00
eb52645766 Shared:Components:Selector: add hotkeys for create 2024-06-05 18:30:51 +03:00
68cda600d8 Shared:Selectors:Files: add create room 2024-06-05 15:50:42 +03:00
295aacc651 Fixed import. 2024-05-30 14:40:10 +03:00
53529ce19a Added interpolation for 'EmptyDescription' key. 2024-05-30 14:04:56 +03:00
54d52d5f68 Merge branch 'refs/heads/develop' into bugfix/infinite-scroll-issues 2024-05-29 13:27:55 +02:00
76d42010b7 Shared: PeopleSelector: Fix infinite loading 2024-05-28 11:24:12 +02:00
6263c94563 Shared:Selectors:Files: fix socket add item 2024-05-28 10:24:23 +03:00
2eb8bda527 Shared:Selectors:Files: add create folder and back to parent buttons for empty screen 2024-05-27 17:24:07 +03:00
4618e8a100 Shared:Selectors:Files: remove opening folder after creation, now it add to top of list 2024-05-27 10:52:23 +03:00
6ff08972c2 Shared:Selectors:Files: open new folder after create 2024-05-23 17:19:28 +03:00
594e3eba89 Shared:Selectors:Files: add create folder 2024-05-23 14:44:57 +03:00
ed41266757 Shared:Selectors: refactoring 2024-05-22 16:33:31 +03:00
27679f7b5e Shared:Selector: refactoring types 2024-05-22 14:27:02 +03:00
f900585de5 Merge branch 'hotfix/v2.5.1' into develop 2024-05-15 18:36:42 +04:00
Vladimir Khvan
234d8630b2 Web: Client: File selector: cancelButtonLabel prop was passed 2024-05-14 15:22:39 +05:00
247cc04924 Fixed Bug 67937 - Files.Trash.Search. Error ‘Request failed with status code 400’ when selecting a room based on a third-party storage in the Search options panel. 2024-05-14 13:10:25 +03:00
Vladimir Khvan
6c7e8caa8d Merge branch 'develop' into feature/sdk-presets 2024-05-07 15:30:30 +05:00
e1b3dff05c Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
#	packages/login/src/components/Login/index.tsx
2024-05-06 20:06:08 +04:00
ecca618f17 Shared:Selectors:Files: fix onClearSearchAction if search value is empty string 2024-05-06 13:11:03 +03:00
0d84facaf8 Shared:Selectors:files: fix isUserOnly opening folder 2024-05-03 16:38:32 +03:00
6fef4648b9 Shared: Selector: Added original icon size at TSelectorItemLogo 2024-05-03 14:48:19 +03:00
4f2295c2d8 Merge branch 'hotfix/v2.5.1' into develop 2024-05-03 14:51:27 +04:00
16350b4d50 Web: Shared: FilesSelector: fixed title 2024-05-03 13:08:38 +03:00
ee84c16335 Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00
3e77c40488 Shared:Selectors:Files: add openRoot flag 2024-05-02 13:50:49 +03:00
63dfb64457 Merge branch 'hotfix/v2.5.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.5.1 2024-05-02 12:44:11 +03:00
5e64d624d8 Shared:Selectors:Files: fix opening isUserOnly 2024-05-02 12:43:59 +03:00
fc07122e25 Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 13:29:20 +04:00
5dbbff2cab Fix Bug 67785 - Rooms.ChangeOwner. Fixed Selector checkbox 2024-05-02 11:54:19 +03:00
Vladimir Khvan
8c8bd5a910 Web: Client: JavascriptSDK: reworked file selector's type selection 2024-04-30 01:47:49 +05:00
Vladimir Khvan
45e3133382 Merge branch 'develop' into feature/sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/presets/Manager.js
2024-04-23 14:05:15 +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
f9526f2010 Fixed Bug 67495 - Rooms. Room icons look like folder icons in the Move to/Copy panel in a room with third-party storage. 2024-04-18 12:20:35 +03:00
Vladimir Khvan
f9589b6f83 Merge branch 'develop' into feature/sdk-presets 2024-04-15 14:23:23 +05:00
e27bad8eae Merge branch 'release/v2.5.0' into develop 2024-04-12 20:13:01 +04:00
ddb9f74d83 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/doceditor/src/app/(root)/create/page.tsx
#	public/locales/en/Common.json
2024-04-12 19:14:59 +04:00