Commit Graph

5445 Commits

Author SHA1 Message Date
Timofey Boyko
98ac515760 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 18:51:07 +03:00
Timofey Boyko
e273391c00 Web:Files:Section: add theme support for desktop sort button in tile view 2022-03-05 18:51:00 +03:00
84810de125 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-components/context-menu/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2022-03-05 17:52:01 +03:00
Timofey Boyko
d85ae13b7a Web:Files: fix table view in dark-theme 2022-03-05 17:47:56 +03:00
1a9ced4901 Web: Files: fixed context menu opening 2022-03-05 17:36:04 +03:00
Timofey Boyko
cc19cb38c2 Web:Files:Components: fix click item for catalog body for mobile devices 2022-03-05 16:57:30 +03:00
Timofey Boyko
a2e9518d3d Web:Common: add 1.2.1 view styles and scroll for context menu 2022-03-04 20:55:28 +03:00
Timofey Boyko
8f5ba33849 Web:Files: add theme as props in sharing panel 2022-03-04 11:12:53 +03:00
Timofey Boyko
680c050e11 Web:Files:Section: add sort button in folder header for tile view 2022-03-04 10:19:11 +03:00
Timofey Boyko
a0d2131d1e Web:Files: fix width table group menu for desktop 2022-03-03 16:46:24 +03:00
Timofey Boyko
61a1a7fbd3 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:25:34 +03:00
Timofey Boyko
0743c5bf83 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:10:03 +03:00
b909b5c031 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-03 14:37:14 +03:00
7105484604 Web: Files: fixed context menu opening 2022-03-03 14:37:08 +03:00
74345b1c3c Web: Files: ContextOptionsStore fixed onClickLinkEdit, fixed imports 2022-03-03 12:37:54 +03:00
Timofey Boyko
c4993b9d34 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-03 12:37:43 +03:00
Timofey Boyko
c83c09c1f1 Web:Files:Pages: fix double header when table group is active 2022-03-03 12:37:10 +03:00
ba2fc9fe88 Merge branch 'develop' into refactoring/refactoring-context-menu 2022-03-03 12:33:42 +03:00
54cecbd5b3 Web: Files: fixed ContextOptionsStore errors 2022-03-03 12:29:48 +03:00
5026e8d916 Web: Files: fixed re-rendering when checkbox is clicked 2022-03-03 12:19:47 +03:00
Timofey Boyko
ac17eca7a1 Web:Files:Pages: fix styles for section header 2022-03-03 10:05:25 +03:00
2978adcdf3 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-02 18:18:05 +03:00
2cc05247db Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function 2022-03-02 15:15:03 +03:00
Timofey
19937f50dd Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-01 22:05:41 +08:00
Timofey
37ccc2b542 Web:Files:Tests: update model screenshots 2022-03-01 19:46:21 +08:00
Timofey
c3db45f2b3 Web:Files:Tests: update mock method 2022-03-01 19:46:03 +08:00
Timofey
9d871fd7c0 Web:Files:Tests: add new tests for catalog, context menu and filter 2022-03-01 19:45:39 +08:00
Timofey
581405c0dc Web:Files:Tests: add new endpoints 2022-03-01 19:43:35 +08:00
Timofey
3278dcb059 Web:Files:Tests: update mock data and add new 2022-03-01 19:42:32 +08:00
f3afd79a3f Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
#	packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
#	packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/components/PageLayout/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/context-menu/styled-context-menu.js
#	packages/asc-web-components/drop-down/index.js
#	packages/asc-web-components/link-with-dropdown/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/themes/dark.js
#	products/ASC.Files/Client/public/images/files.menu.svg
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/QuickButtons.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.People/Client/public/images/people.menu.svg
#	products/ASC.People/Client/src/components/GroupSelector/index.js
#	products/ASC.People/Client/src/components/PeopleSelector/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
#	products/ASC.People/Client/src/pages/Home/index.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
2022-03-01 13:50:26 +03:00
e5ba722f7c Web: Files: fixed withBadges, withContent HOCs re-render 2022-02-28 15:46:06 +03:00
2092430bcf Web: Files: fixed getting filesList 2022-02-28 11:03:42 +03:00
cae358636e
Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 17:51:06 +03:00
04737a6c6d Web: Client: Files: Added fixedDirection property for AccessComboBox 2022-02-25 17:45:20 +03:00
63d10f291f Web: Files: RowView: Fixed editing input style for screens less than small tablet 2022-02-25 12:18:27 +03:00
6c0f8c18e1 Web: Files: EditingWrapperComponent: Fixed padding for table view 2022-02-25 12:16:12 +03:00
e319a5e31f Web: Files: EditingWrapperComponent: Fixed padding for cancel button 2022-02-25 11:07:08 +03:00
8da91b7f8f Web: Files: VersionHistory fixed Ipad styles 2022-02-24 19:29:01 +03:00
159dfe0028 Web: Files: fixed VersionHistory page styles 2022-02-24 19:13:40 +03:00
4be97f77e7 Merge branch 'bugfix/refactoring-table-view' of github.com:ONLYOFFICE/AppServer into bugfix/refactoring-table-view 2022-02-24 18:55:09 +03:00
9f5bae12ad Web: Files: fixed EditingWrapperComponent styles 2022-02-24 18:54:55 +03:00
7377507481 Web: Files: RowView: Fixed right margin for last badge item 2022-02-24 18:03:27 +03:00
7bc4e141fa Web: Files: RowView: Fixed displaying for quick buttons for small tablet width 2022-02-24 17:43:37 +03:00
7995f38ef9 Web: Files: Badges/QuickButtons: Restored show logic after merge 2022-02-24 16:36:06 +03:00
0814ce13cc Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 14:53:43 +03:00
6fb3547652 Files: fix sql 2022-02-24 14:45:58 +03:00
51f79fa0e9 Files: fix track 2022-02-24 14:35:14 +03:00
9d0f1500e6 Files: fix routing 2022-02-24 13:24:39 +03:00
f59fbe71ba Merge branch 'develop' into bugfix/refactoring-table-view 2022-02-24 12:04:15 +03:00
fab67e575c Web: Files: fixed files loader styles 2022-02-24 11:44:40 +03:00