Commit Graph

178 Commits

Author SHA1 Message Date
1e6d27dc34 Web: Files: fixed hotkey border, fixed table border 2022-04-27 14:19:12 +03:00
10506fe2c0 Web: Components: TableContainer: fix header text jumping 2022-04-25 14:24:55 +03:00
13eaf8fcac Web: Components: TableContainer: fix group menu height 2022-04-25 14:01:41 +03:00
Timofey Boyko
bba207a4c9 Web:Components:TableContainer: hide disabled item for table group menu 2022-04-20 16:57:06 +03:00
002a432b4d Web: fixed info-panel icon 2022-04-11 11:11:44 +03:00
5a6badff68 Web: Components: Ipad: fixed arrow icon size for table header 2022-04-08 14:48:02 +03:00
aa91c6389c Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js
2022-04-06 20:36:36 +03:00
f6926ac460 Web: Components: Table: fixed columns resize 2022-04-06 15:45:58 +03:00
3bf51c882b Web: Components: fixed table resize 2022-04-06 14:34:00 +03:00
Timofey Boyko
8936caf353 Web:Components:TableContainer: change background primary button to base for group menu item 2022-04-05 11:05:09 +03:00
Timofey Boyko
b171994c94 Web:Components:TableContainer: remove disabled color for group menu item of table group menu 2022-04-05 10:45:55 +03:00
mushka
40cb0fd01f Merge branch 'feature/info-panel' of github.com:ONLYOFFICE/AppServer into feature/info-panel 2022-04-01 12:18:29 +03:00
mushka
e4ab022fb9 dark theme redesign 2022-03-30 21:59:00 +03:00
f41c65623b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	config/kafka.json
2022-03-30 11:14:47 +03:00
mushka
4e4ecec78f added dark theme support & moved context options "view details" button 2022-03-29 13:59:56 +03:00
Timofey Boyko
822abd7a08 Web:Components:Themes: fix border image source width for table container header and fix section width 2022-03-28 18:15:29 +03:00
mushka
5accb9ba8e fixed SectionHeader and CheckboxMenu differenciation 2022-03-28 16:45:17 +03:00
mushka
9de69a3ff6 some tweaks 2022-03-25 12:10:23 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
mushka
1d80eb1a9d refactored open/close behaviour + redesigned checkbox header 2022-03-24 17:57:36 +03:00
Timofey Boyko
fadec284ed Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 12:56:14 +03:00
Timofey Boyko
d19406a592 Web:Components: fix padding-top for button in group menu item of table container 2022-03-21 12:48:05 +03:00
46d238e520 Web: Components: TableContainer: fix group menu item icon color 2022-03-21 12:33:28 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
f6f869a029 Web: Components: Fixed table view style. 2022-03-17 13:28:09 +03:00
cc293f60c2 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-15 14:11:00 +03:00
2a045fc1ef Web: Files: removed contextMenuData, moved getContextModel to withFileActions HOC 2022-03-10 10:09:10 +03:00
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
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
11708952e9 Web: People: fixed context-menu 2022-03-05 10:48:27 +03:00
291052112d Web: People: fixed TableRow 2022-03-05 10:22:53 +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
mushka
384a92c30f finished merging 2022-03-04 12:52:34 +03:00
mushka
807fe75b72 change code formatting 3 2022-03-03 14:25:10 +03:00
mushka
424a7a7e3c change code formatting 2022-03-03 13:43:43 +03:00
mushka
e77a97e105 added checkbox menu interaction and new opening mechanics 2022-03-02 17:19:19 +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
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
d7f16aa96d Web: Table: fixed table styles 2022-02-24 11:20:32 +03:00
deeff80f26 Web: TabLe: refactoring table view 2022-02-22 16:00:26 +03:00
2a7616585e Web: Components: fixed table view 2022-02-22 12:10:27 +03:00
88a2934409 Web: Components: fix display table after merge 2022-02-22 11:34:13 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
e6731ec23d Web: Components: TableHeader: Added property for hiding sort icon and disable sort actions 2022-02-16 13:57:59 +03:00
mushka
46fd2f0f75 added isVisible toogle to GroupMenu 2022-02-11 17:30:07 +03:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
Timofey
bc9dd07400 Merge branch 'develop' into branch feature/new-context-menu 2022-02-01 15:07:01 +08:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
45313ba07f Web: Files: Fixed the length of the row separators according to the layout. 2022-01-27 13:54:33 +03:00