Commit Graph

141 Commits

Author SHA1 Message Date
2f133a2fe9 Shared:Selectors:People: add support show disabled and invited users 2024-03-26 11:35:47 +03: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
d7cd403b74 Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0
# Conflicts:
#	packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
#	packages/client/src/pages/PortalSettings/Layout/index.js
#	packages/client/src/store/UploadDataStore.js
#	packages/doceditor/src/hooks/useSelectFileDialog.ts
#	packages/doceditor/src/hooks/useSelectFolderDialog.ts
2024-03-21 18:12:23 +04:00
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
d548c0b54d Shared:Selectors:Files: delete console log 2024-03-21 15:48:29 +03:00
de6ba776c8 Shared:Selectors:Files: fix wrong fetch room list 2024-03-21 15:29:23 +03:00
819e26cd6b Shared:Selectors:Files: fix isRoom flag 2024-03-21 12:20:58 +03:00
a9a9d5d7c3 Fixed Bug 61308 - Files.Filter. The List accounts panel displays invited users who have not joined the portal 2024-03-19 14:48:15 +03:00
2efc34a6d0 Shared:Selectors:Files: fix bread crumbs for 'My documents' 2024-03-19 12:58:17 +03:00
b99ff63631 Merge branch 'release/v2.5.0' into develop
# Conflicts:
#	packages/doceditor/src/app/create/page.tsx
2024-03-19 11:37:59 +04:00
06d7059e01 Shared:Selectors:GroupMembers: delete 2024-03-18 17:36:55 +03:00
fd23e05164 Shared:Selectors:Files: add support double click 2024-03-18 16:23:45 +03:00
d3b2a7a88d Shared:Selectors:Groups: add support double click 2024-03-18 16:23:33 +03:00
3e9650bf1b Shared:Selectors:People: add support double click 2024-03-18 16:23:22 +03:00
82e2ce256d Shared:Selectors:Room: add support double click 2024-03-18 16:23:11 +03: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
8909e0da46 Shared:Selectors: add support loading button state after click Submit 2024-03-18 13:06:04 +03:00
ac47270751 Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0 2024-03-18 12:54:17 +03:00
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
dca1c8d636 Fix Bug 66962 - Rooms. Added display of planet icon in move dialog 2024-03-18 12:18:33 +03:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
Akmal Isomadinov
5fad4f34b8 Client:Article:MainButton: Added form file selection actions 2024-03-13 15:24:41 +05:00
Akmal Isomadinov
fe26a57c41 Merge branch 'develop' into feature/redesign-form-filling-room 2024-03-06 16:29:27 +05: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
namushka
d4134fa09b merge develop + merge fix
Conflicts:
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableContainer.js
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
2024-03-01 02:18:24 +03:00
namushka
2798591800 merge + merge fix 2024-02-28 13:22:28 +03:00
namushka
dae3fa60f7 added EditGroupMembersDialog 2024-02-28 13:11:40 +03:00
Akmal Isomadinov
f9472f4d9e Shared:Selectors:Files:FilesSelector Fixed the folder icon and disabling folders 2024-02-27 16:48:07 +05:00
4dec7fba2a Shared:Selectors:Files: update getting SettingsStore 2024-02-26 11:04:32 +03:00
1d4c1e7965 Doceditor:Dialogs: fix wrong file icons 2024-02-22 15:40:23 +03:00
e82b3894d2 Delete useless MF 2024-02-22 14:23:49 +03:00
ba36156387 Shared:Selectors:Files: delete useless 2024-02-22 14:13:55 +03:00
ae1dcebff6 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-22 10:53:18 +03:00
eacad7f98f Move translation keys from GroupsSelector to Common 2024-02-21 16:12:14 +03:00
80d788d5a2 Shared:Selectors:Groups: fix types 2024-02-21 15:58:57 +03:00
de84f7c1be Shared:Selectors:Groups: update types 2024-02-21 12:27:45 +03:00
dfe05b707a Merge branch 'develop' into bugfix/selectors 2024-02-20 14:36:45 +03:00
6cbfdf9ac6 Shared:Selectors:Files: remove useless theme provider 2024-02-19 11:40:28 +03:00
d780557c2b Web: Client: Add new empty screen image to GroupsSelector 2024-02-16 14:55:19 +01:00
ce8b0ab388 Shared:Selectors: add files selector wrapper 2024-02-14 13:36:27 +03:00
0c652ed1e5 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-14 10:27:11 +03:00
f57e3e1b96 Shared:Selectors: fix search rerender 2024-02-14 10:20:15 +03:00
904d828732 Web: Client: Add filters to People, Groups, InsideGroup (Accounts) 2024-02-13 21:48:47 +01:00
05739c17b3 Merge branch 'bugfix/selectors' into feature/editor-nextjs 2024-02-13 14:49:46 +03:00
cd321af411 Fix after merge 2024-02-13 13:48:15 +03:00
233f936876 Merge branch 'bugfix/selectors' of github.com:ONLYOFFICE/DocSpace-client into bugfix/selectors 2024-02-13 12:17:15 +03:00
10b382d88d Fix after merge 2024-02-13 12:11:33 +03:00
ccce651266 Merge branch 'develop' into bugfix/selectors 2024-02-13 11:05:39 +03:00
9761a340f5 Move many translation keys to Common 2024-02-13 04:42:10 +04:00
399d4604ea Merge branch 'develop' into feature/editor-nextjs 2024-02-12 12:39:10 +03:00
adff72de4b Shared:Selectors:Files: fix translation 2024-02-09 18:32:17 +03:00
Vladimir Khvan
137207b78b Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
2024-02-09 20:24:06 +05:00
678c6f22fe Selectors: fix search 2024-02-09 17:23:08 +03:00
60508c6fa6 Shared:Selectors:Files: fix empty list loader 2024-02-09 14:10:39 +03:00
e46207cf8b Shared:Selectors:Files: init, fix usage, rewrite to typescript additional components 2024-02-09 12:28:10 +03:00
f48c689a30 Shared:Selectors:People: fix types, refactoring, fix usage 2024-02-08 19:26:40 +03:00
8d1ed918d7 Shared:Selectors:Room: fix types, refactoring, fix usage 2024-02-08 18:15:35 +03:00
5ac4b3fa3a Fix RoomSelector crash 2024-02-08 03:19:59 +04:00
f7458458fe Fixed Bug 66399 - Accounts: Disabled user can be assigned as room owner 2024-02-07 14:24:04 +05:00
ba8a0eae46 Shared:Selector:Files: fix first render and init files settings 2024-02-06 12:12:41 +03:00
aba82040b9 Shared:Selector:Files: fix bugs 2024-02-05 17:43:22 +03:00
fd3d07ebe5 Shared: fix ts problems 2024-02-05 12:56:29 +03:00
89c210a4f7 Shared: fix nextjs problems 2024-02-02 14:30:57 +03:00
Vladimir Khvan
2bfd15a162 Merge branch 'develop' into feature/js-sdk-presets 2024-02-02 12:40:49 +05:00
9e8713567f Shared:Selector:RoomSelector: fix types 2024-02-01 12:02:09 +03:00
12784c6954 Shared:Selectors:Files: refactoring 2024-01-31 21:17:37 +03:00
adbfd55004 Shared:Selectors:Files: add getIcon inside selector 2024-01-31 20:14:09 +03:00
872411455f Client:Components:FilesSelector: delete useless 2024-01-31 15:18:18 +03:00
Vladimir Khvan
a8efee895b Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/client/src/pages/Sdk/index.js
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
2024-01-31 13:36:21 +05:00
cbd7fa9c41 Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors 2024-01-30 19:19:30 +03:00
883eb94fc9 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-30 19:11:57 +03:00
4ea916942b Shared:selectors:Files: fix 2024-01-30 19:00:02 +03:00
f8c71851fc Client:Components:FilesSelector: fix after move to shared 2024-01-30 18:42:05 +03:00
94eaa55676 Merge branch 'feature/rewrite-stores' into feature/refactoring-selectors 2024-01-30 17:53:18 +03:00
79d2861d1a Shared:Selectors:Files: move from client 2024-01-30 17:39:36 +03:00
e20ae17ab8 Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/client/src/pages/Sdk/index.js
#	packages/editor/src/client/components/Editor.js
#	packages/shared/selectors/Room/index.tsx
2024-01-30 18:33:56 +04:00
153ce3749c Shared:Selectors:Room: fix types 2024-01-30 11:09:00 +03:00
a96de99f99 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-29 10:37:44 +03:00
5c56a82748 Shared:Components:Selector: fix ts problems 2024-01-26 15:45:04 +03:00
d21cf88ad1 Shared:Components:Selector: fix select all 2024-01-26 15:41:25 +03:00
493b178988 Merge branch 'develop' into feature/refactoring-auth-store 2024-01-25 17:48:07 +03:00
b86924c936 Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/components/selector/sub-components/Item/Item.types.ts
#	packages/shared/package.json
#	packages/shared/selectors/Room/index.tsx
2024-01-25 16:32:37 +04:00
Vladimir Khvan
0e89e12d21 Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownDesktop.js
	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownMobile.js
	packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js
	packages/client/src/pages/Home/Hooks/useFiles.js
	packages/client/src/pages/Home/Section/Filter/index.js
	packages/client/src/pages/PortalSettings/categories/common/appearance.js
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/client/src/pages/Sdk/index.js
	packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js
	packages/client/src/store/FilesActionsStore.js
	packages/client/src/store/FilesStore.js
	packages/common/store/SettingsStore.js
	packages/shared/components/navigation/Navigation.styled.ts
	packages/shared/components/navigation/Navigation.types.ts
	packages/shared/components/navigation/sub-components/ControlBtn.tsx
	packages/shared/constants/index.ts
	packages/shared/selectors/Room/RoomSelector.types.ts
	packages/shared/selectors/Room/index.tsx
	packages/shared/skeletons/filter/FilterBlock/index.tsx
	packages/shared/utils/combineUrl.ts
	packages/shared/utils/common.ts
	packages/shared/utils/index.ts
2024-01-24 17:30:35 +05:00
Vladimir Khvan
56e669555d Merge branch 'develop' into feature/js-sdk-presets
Conflicts:
	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
	packages/common/components/Navigation/sub-components/control-btn.js
	packages/shared/components/navigation/Navigation.tsx
	packages/shared/selectors/Room/index.tsx
2024-01-23 16:38:55 +05:00
541943a9f3 Shared:Store:UserStore: move from common, rewrite to typescript and update using without auth store 2024-01-23 12:19:03 +03:00
b9a34f8c4e Shared: fix eslint and ts problems 2024-01-23 10:24:57 +03:00
4fd042b998 Shared:Selectors: fix infinity use effect 2024-01-17 17:14:46 +03:00
ab08a20435 Shared:Components:Filter: rewrite to typescript and move from common 2024-01-17 15:57:11 +03:00
fc2e58d701 Shared:Selectors:People: rewrite to typescript and move from client 2024-01-17 11:53:48 +03:00
a9a8de4722 Shared:Selectors:Room: rewrite to typescript and move from client 2024-01-17 10:13:30 +03:00