Commit Graph

17 Commits

Author SHA1 Message Date
37efdc292a Merge branch 'develop' into feature/rtl-interface-direction
# Conflicts:
#	packages/client/src/components/panels/HotkeysPanel/index.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	packages/components/date-time-picker/index.js
#	packages/components/selected-item/styled-selected-item.js
2023-07-26 17:47:13 +02:00
Vladimir Khvan
bda0d671e9 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-14 20:17:01 +05:00
Vladimir Khvan
ebb3cd96d8 forwarded ref was added 2023-07-14 20:15:39 +05:00
24fba12ce3 Merge branch 'develop' into feature/public-room
# Conflicts:
#	packages/client/public/locales/en/CreateEditRoomDialog.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBar.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBlock.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/StyledPublicRoom.js
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/store/ContextOptionsStore.js
#	packages/client/src/store/FilesStore.js
#	packages/common/constants/index.js
#	packages/components/date-picker/index.js
#	packages/components/selected-item/index.js
2023-07-14 15:40:47 +03:00
01ce3357ee Merge branch 'develop' into feature/rtl-interface-direction 2023-07-10 09:57:04 +02:00
Vladimir Khvan
9ad34c3c77 text component was substituted with StyledLabel 2023-07-07 17:44:20 +05:00
Vladimir Khvan
2f18735005 Merge branch 'develop' into feature/add-id-element 2023-07-07 16:18:23 +05:00
7a7beb380f Web: Components: Fix SelectedItem RTL after merging develop 2023-07-06 17:42:04 +02:00
Vladimir Khvan
81e583867b label in selectedItem component can receive object 2023-07-05 14:16:04 +05:00
61a5c1e900 Web:Add id, class for calendar. 2023-06-30 12:55:31 +03:00
Vladimir Khvan
e30bfa704d Date-time-picker was added as a component 2023-06-13 18:28:02 +05:00
Vladimir Khvan
e037f04d1e selectedItem component was updated 2023-06-13 12:29:01 +05:00
9c16916704 Web: Components: SelectedItem - descriptions changed 2023-04-17 17:48:34 +05:30
DmitrySychugov
1d78a45a3a Web: Components: corrected the display selected item all story 2023-04-03 18:20:24 +05:00
Timofey Boyko
baa30e0305 Web:Common/Client/Components: add PUBLIC_DIR alias 2023-01-27 17:08:30 +03:00
Timofey Boyko
25818e9ad0 Web: delete equal md5 equal name duplicates images 2023-01-10 17:29:12 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00