Commit Graph

2593 Commits

Author SHA1 Message Date
98c045cdbc Merge branch 'develop' into bugfix/info-panel 2024-01-25 22:19:30 +04:00
18d4300c20 Common:UserStore: fix update avatar info 2024-01-25 17:09:28 +03:00
1655944b0f Merge branch 'feature/shared-article' of github.com:ONLYOFFICE/DocSpace-client into feature/shared-article 2024-01-25 16:35:41 +03:00
ff9bac5a3b Common:UserStore: fix update avatar info 2024-01-25 16:35:32 +03:00
d25e48b711 Merge branch 'develop' into bugfix/info-panel 2024-01-25 17:29:07 +04:00
b9d0fac05d Web: Files: InfoPanel: removed forceUpdate 2024-01-25 15:41:25 +03:00
72d6116a89 Merge branch 'develop' into feature/shared-article 2024-01-25 16:33:13 +04: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
63b808754d Web: Files: InfoPanel: fixed context-menu 2024-01-25 14:41:27 +03:00
a04b687c35 Web: Files: InfoPanel: fixed icon, fixed updateInfoPanelSelection 2024-01-25 13:31:06 +03:00
17f681d09b Web: Files: InfoPanel: fix 2024-01-25 12:18:59 +03:00
ef1140b116 Bump version to v2.0.2 2024-01-24 20:49:25 +04:00
626b09241d Web: Files: InfoPanel: fixed selection bug 2024-01-24 17:16:58 +03:00
d3097a372c Web: Files: InfoPanel: setInfoPanelSelection 2024-01-24 16:16:28 +03:00
794e3d53f6 Web: Files: InfoPanel: removed calculateSelection 2024-01-24 15:59:12 +03:00
cd6d3969ae Merge branch 'develop' into feature/shared-article 2024-01-24 14:36:29 +03:00
aee905f2e6 Web: Files: InfoPanel: fixed setView 2024-01-24 14:03:56 +03:00
e2ffa1d739 Web: renamed the route to view media 2024-01-23 20:36:15 +05:00
22f4e89639 Merge branch 'develop' into bugfix/info-panel
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
#	packages/shared/components/selector/Selector.tsx
2024-01-23 17:34:47 +03:00
6560226699 Web: Files: InfoPanel: fixed selection 2024-01-23 17:31:38 +03:00
56194fc5cb Web: Files: InfoPanel: fixed membersList 2024-01-23 14:28:20 +03:00
18b4d00a66 Web: Files: InfoPanel: removed setUpdateRoomMembers, moved fetchMembers to InfoPanelStore 2024-01-23 13:44:11 +03:00
0481d96e24 Common:Components:Loaders: delete useless 2024-01-22 13:01:21 +03:00
3c9eea5ef5 Shared:Article: remove mobx and add wrappers 2024-01-22 12:27:10 +03:00
b1f28b5ac3 Shared:Skeletons:Article: rewrite loaders to TS 2024-01-22 12:26:23 +03:00
6c47a8be26 Merge branch 'feature/shared-filter' into feature/shared-article 2024-01-22 11:46:29 +03:00
6ec3000fa8 Merge branch 'develop' into feature/shared-filter 2024-01-22 10:03:42 +03:00
9bb54955c4 Shared:Article: rewrite to typescript 2024-01-22 09:40:45 +03:00
ab58fb9c53 Merge branch 'develop' into bugfix/info-panel 2024-01-19 17:24:17 +03:00
fbbcf55bbd Web: Files: InfoPanel: fixed members list 2024-01-19 16:59:06 +03:00
8b68123fba Merge branch 'feature/shared-filter' into feature/shared-article 2024-01-19 10:47:08 +03:00
798578ff0b Shared:Article: rewrite to typescript 2024-01-19 10:47:05 +03: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
04829e2878 Web: Files: InfoPanel: fixed isNoItem 2024-01-18 13:31:51 +03:00
edaab327c7 Web: Files: InfoPanel: removed updateSelectionParentRoomAction, refactoring 2024-01-17 16:36:10 +03:00
e3a0152fd2 Common:Components:Section: delete old component 2024-01-17 16:03:04 +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
5afe2434a3 Web: Files: InfoPanel: fixed Accounts page 2024-01-17 14:47:37 +03:00
e80273f869 Merge branch 'develop' into feature/my-documents-share 2024-01-17 13:15:14 +03:00
7aad2fdc23 Web: Files: InfoPanel: fixed selection item 2024-01-17 12:53:25 +03:00
a9a8de4722 Shared:Selectors:Room: rewrite to typescript and move from client 2024-01-17 10:13:30 +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
cbac08a712 Fixed incorrect check for timezone. 2024-01-16 16:57:02 +03:00
70a3df52a6 Web: Files: InfoPanel: removed selectionParentRoom 2024-01-16 12:54:18 +03:00
cd24b84391 Common: delete useless 2024-01-16 12:21:07 +03:00
3605282b81 Fix Bug 65419 - Editor: if the profile language is undefined (there is a combination of portal and profile languages) portal language will be displayed 2024-01-15 20:20:40 +05:00
68d21efd61 Merge branch 'develop' into feature/my-documents-share 2024-01-15 18:13:12 +03:00
2e3fc63ecc Merge branch 'develop' into feature/shared-navigation 2024-01-15 17:29:36 +04:00