Commit Graph

17194 Commits

Author SHA1 Message Date
8dff5425b7 Web: Files: removed HotkeysCreateForm, HotkeysCreateFormFromFile translation keys 2022-03-10 17:03:28 +03:00
5a6eba1b5e Web: Files: fixed renderContext 2022-03-10 16:39:03 +03:00
7abd6c9812 Web: Files: fixed showHotkeyBorder prop 2022-03-10 10:24:08 +03:00
a00ed16990 Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
2022-03-10 10:16:01 +03:00
2a045fc1ef Web: Files: removed contextMenuData, moved getContextModel to withFileActions HOC 2022-03-10 10:09:10 +03:00
7cb193ef07 Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
2022-03-09 16:03:08 +03:00
a1c2380007 Web: Files: moved contextMenuData to withFileActions HOC 2022-03-09 15:51:20 +03:00
884b141c35 Web: Files: Table: fixed hotkey styles 2022-03-09 14:50:52 +03:00
3447a59628 Web: Files: Row: fixed hotkey styles 2022-03-09 13:53:25 +03:00
639a68edfd Merge branch 'feature/virtual-rooms-1.2' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2022-03-09 13:26:11 +03:00
28423d6eb3 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/store/index.js
2022-03-09 10:32:00 +03:00
Timofey Boyko
c3b901c64a Web:Files:Components: fixed catalog drag and drop 2022-03-09 10:17:38 +03:00
Timofey Boyko
2fcc7806ea Web:People:Catalog: add translate 'OtherOperations' for main button mobile 2022-03-05 19:44:33 +03:00
Timofey Boyko
13f0b2dd5a Web:People: add new key 'OtherOperations' for ru and en locales 2022-03-05 19:43:35 +03:00
Timofey Boyko
f144c3ab64 Web:Files:Catalog: add translate 'Upload' for main button mobile 2022-03-05 19:27:46 +03:00
Timofey Boyko
1e82028465 Web:Files: add new key 'Upload' for ru and en locales 2022-03-05 19:25:16 +03:00
Timofey Boyko
cdda6f3d73 Web:Common:NewFilterInput: add support i18next for 'AddFilter' button 2022-03-05 19:12:48 +03:00
Timofey Boyko
32a7a41f87 Web:Files: add support i18next for 'view' 2022-03-05 19:04:53 +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
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
4b27512ef8
Merge pull request #575 from ONLYOFFICE/refactoring/refactoring-context-menu
Refactoring/refactoring context menu
2022-03-05 17:42:50 +03:00
1a9ced4901 Web: Files: fixed context menu opening 2022-03-05 17:36:04 +03:00
Timofey Boyko
7d747b9a7b Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 16:59:14 +03:00
Timofey Boyko
60110e4e9e Web:People:Filter: add search placeholder 2022-03-05 16:59:05 +03:00
Timofey Boyko
02a0bcd610 Web:People:Components: update actions model for mobile main button 2022-03-05 16:58:42 +03:00
Timofey Boyko
c31d1f171e Web:People:Components: fix click item for catalog body for mobile devices 2022-03-05 16:58:01 +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
ab51a985cd Web:Components:MainButtonMobile: fix dropdown render 2022-03-05 16:56:50 +03:00
Timofey Boyko
8c95b9bd92 Web:Common:PageLayout: fix catalog position on mobile devices 2022-03-05 16:56:24 +03:00
9b035a6519 Web: Files: updated HotkeysPanel, fixed styles 2022-03-05 16:19:24 +03:00
3b9a099996
Merge branch 'develop' into refactoring/refactoring-context-menu 2022-03-05 15:47:14 +03:00
1b5d5882a7
Merge pull request #578 from ONLYOFFICE/feature/slider-redesign
Feature/slider redesign
2022-03-05 15:45:57 +03:00
fd5ca3efbe Web: Files: added hotkey for upload folders 2022-03-05 14:23:35 +03:00
22517301d5 Web: Files: added new hotkeys 2022-03-05 12:20:26 +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
fe1c01e4c1 Web:Studio:Styling the Customization Component. 2022-03-05 10:18:06 +03:00
264637510d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 09:15:15 +03:00
cde35d334f Web:Studio:Styling the Customization Component. 2022-03-05 09:14:55 +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
9be309da10 Web:Studio:Added encoding of uploaded logo to base64. 2022-03-04 18:30:42 +03:00
9c9534038f Merge branch 'develop' into feature/slider-redesign 2022-03-04 18:57:51 +05:00
47358b007e Web: Components: added style prop 2022-03-04 18:56:57 +05:00
7bfcc8b249 Web: Components: create slider component 2022-03-04 18:54:57 +05:00
250eeaaa60 Web: Components: fixed slider margin 2022-03-04 18:54:14 +05:00
ba29c3aee0 Web: Components: moved slider to components 2022-03-04 18:53:41 +05:00
Timofey Boyko
8f5ba33849 Web:Files: add theme as props in sharing panel 2022-03-04 11:12:53 +03:00
Timofey Boyko
65ccfb896f Web:Files: add new key 'sorting' 2022-03-04 10:20:10 +03:00