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 |
|
|
d4756780fc
|
Web: Shared: Utils: removed unnecessary operations in combineUrl
|
2024-01-24 14:49:57 +05:00 |
|
|
429044ea05
|
Web: Shared: Utils: extended the combine url function to accept numbers
|
2024-01-24 14:09:50 +05:00 |
|
|
1df1f8f46b
|
Merge branch 'develop' into feature/viewer-route-rename
|
2024-01-24 12:39:50 +05:00 |
|
|
8c7b7306d0
|
Merge branch 'develop' into feature/color-input
|
2024-01-23 22:15:06 +04:00 |
|
Akmal Isomadinov
|
b7b3860044
|
Fixed order of the rooms
|
2024-01-23 20:46:33 +05:00 |
|
Akmal Isomadinov
|
9f2ebab438
|
Shared: Added type guard
|
2024-01-23 20:46:17 +05:00 |
|
|
e2ffa1d739
|
Web: renamed the route to view media
|
2024-01-23 20:36:15 +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 |
|
Vladimir Khvan
|
4647a3663e
|
Merge branch 'develop' into feature/color-input
|
2024-01-23 14:58:48 +05:00 |
|
Vladimir Khvan
|
b2d9df11dc
|
Web: Shared: ColorInput components was added
|
2024-01-23 14:49:20 +05:00 |
|
Vladimir Khvan
|
c5e35d0efa
|
Web: Shared: isPickerOnly option was added to ColorPicker
|
2024-01-23 14:48:45 +05:00 |
|
|
98397b2e47
|
Merge branch 'develop' into bugfix/interface-jumping
|
2024-01-22 19:51:56 +04:00 |
|
|
2095ba744e
|
Shared:Components:Navigation: fix public room logo
|
2024-01-22 18:20:38 +03:00 |
|
|
62b51cf569
|
Shared:Components:ModalDialog: fix container render
|
2024-01-22 17:00:59 +03:00 |
|
|
c661d12cf9
|
Shared:Components:Table: fix table header hide columns
|
2024-01-22 15:30:06 +03:00 |
|
Vladimir Khvan
|
8ab4612bf9
|
Web: Shared: ColorPicker component was implemented in Typescript
|
2024-01-22 17:16:03 +05:00 |
|
Vladimir Khvan
|
31009aa410
|
Web: Client: Appearance: HexColorPickerComponent was moved to shared/components as ColorPicker
|
2024-01-22 17:13:21 +05:00 |
|
|
e47ab29048
|
Shared:Components:ComboBox: fix close drop down
|
2024-01-22 14:28:25 +03:00 |
|
|
6ec3000fa8
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-22 10:03:42 +03:00 |
|
|
b599aad308
|
Shared: Components: Selector: fix crash
|
2024-01-19 17:59:36 +03:00 |
|
|
1adf6b3634
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-19 17:04:46 +04:00 |
|
|
968573ce02
|
Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
# packages/components/toast/styled-toastr.js
|
2024-01-19 16:20:16 +04:00 |
|
|
825c765b7d
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-18 20:38:44 +03:00 |
|
|
eeede19a30
|
Merge branch 'develop' into feature/form-room-pdf
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/SelectedFolderStore.js
# packages/client/src/store/SettingsStore.js
# packages/common/constants/index.js
# packages/common/store/InfoPanelStore.js
# packages/components/room-logo/index.js
# packages/shared/utils/common.ts
|
2024-01-18 19:31:46 +04:00 |
|
|
4fd042b998
|
Shared:Selectors: fix infinity use effect
|
2024-01-17 17:14:46 +03:00 |
|
|
5b86d792ac
|
Client: fix section import
|
2024-01-17 16:22:20 +03:00 |
|
|
144f673e17
|
Merge branch 'develop' into feature/shared-filter
|
2024-01-17 15:58:33 +03:00 |
|
|
ab08a20435
|
Shared:Components:Filter: rewrite to typescript and move from common
|
2024-01-17 15:57:11 +03:00 |
|
|
0250d66230
|
Shared: Components: Section: add submenu
|
2024-01-17 15:25:24 +03:00 |
|
|
a170d6e566
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-17 15:55:38 +04:00 |
|
|
e80273f869
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-17 13:15:14 +03:00 |
|
|
387a4dd6be
|
Shared: API: Files: ts fix
|
2024-01-17 13:09:25 +03:00 |
|
|
4e10a6baaf
|
Merge branch 'develop' into feature/shared-section
|
2024-01-17 14:07:10 +04: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 |
|
|
9181f91dc7
|
Shared: Components: ComboBox: fix type
|
2024-01-17 01:01:39 +03:00 |
|
|
441a7ba604
|
Merge branch 'develop' into bugfix/management-payments
# Conflicts:
# packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js
# packages/shared/utils/convertTime.ts
|
2024-01-16 19:26:53 +03:00 |
|
|
82ad593fcc
|
Shared:Components:Section: fix import React
|
2024-01-16 14:39:45 +03:00 |
|
|
83d405680b
|
Merge branch 'develop' into feature/shared-section
|
2024-01-16 14:33:05 +03:00 |
|
|
ea78572c5d
|
Shared:Components:Section: delete console log
|
2024-01-16 14:31:39 +03:00 |
|
|
f477ef4d52
|
Shared:Components:Section: rewrite to typescript, move from common and add wrapper to Client and Managment
|
2024-01-16 14:31:08 +03:00 |
|
|
fd20d07e6b
|
Shared: API: add new method
|
2024-01-16 12:21:42 +03:00 |
|
|
ffcb4f5dea
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-16 12:13:34 +03:00 |
|
|
5976642b65
|
Merge branch 'hotfix/v2.0.1' into develop
|
2024-01-16 12:34:15 +04:00 |
|
|
37398d6932
|
Shared: API: fix after merge
|
2024-01-15 18:20:37 +03:00 |
|
|
68d21efd61
|
Merge branch 'develop' into feature/my-documents-share
|
2024-01-15 18:13:12 +03:00 |
|
|
a9c9547bf9
|
Shared:Components:Navigation: fix color of text
|
2024-01-15 17:03:07 +03:00 |
|
|
2fbc625709
|
Merge branch 'feature/shared-navigation' of github.com:ONLYOFFICE/DocSpace-client into feature/shared-navigation
|
2024-01-15 16:57:09 +03:00 |
|
|
9cf264003e
|
Shared:Components:Navigation: fix accounts
|
2024-01-15 16:57:02 +03:00 |
|