|
f57e3e1b96
|
Shared:Selectors: fix search rerender
|
2024-02-14 10:20:15 +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 |
|
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 |
|
|
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 |
|
Vladimir Khvan
|
2bfd15a162
|
Merge branch 'develop' into feature/js-sdk-presets
|
2024-02-02 12:40:49 +05: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 |
|
|
883eb94fc9
|
Merge branch 'develop' into feature/refactoring-auth-store
|
2024-01-30 19:11:57 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|