Commit Graph

141 Commits

Author SHA1 Message Date
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