Commit Graph

5533 Commits

Author SHA1 Message Date
ac2d679e71
Merge pull request #517 from ONLYOFFICE/feature/login-redesign
Feature/login redesign
2022-03-17 16:29:22 +03:00
ea502301de Web: Files: Deleted horizontal scroll from Sharing panel. 2022-03-17 16:03:23 +03:00
679d0d51aa Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-17 12:42:26 +03:00
e407031ec0 Web: Files: Tile: fix background 2022-03-16 16:07:55 +03:00
c001de8f74 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-16 13:03:29 +03:00
bada6b7dd0 Web: Files: Hotkeys: added new translations 2022-03-16 11:32:19 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
d2855e47a4 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-15 19:17:44 +03:00
e0df6dfa12 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-15 15:23:59 +03:00
5c820fdcd5 Index: create index only in service 2022-03-14 21:47:34 +03:00
mushka
338c66720b resolved missed merge conflicts 2022-03-14 19:10:10 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
1e89c8dd57 Web: Files: Hotkeys: fixed HotkeysPanel scroll 2022-03-14 13:19:51 +03:00
5ec18f6e86 Web: Files: fixed open media files 2022-03-14 12:19:48 +03:00
4b62ba5560 Web: Files: fixed HotkeysPanel translations 2022-03-14 11:43:40 +03:00
58eb82acff
Merge pull request #515 from ONLYOFFICE/feature/hotkeys
Feature/hotkeys
2022-03-11 19:09:21 +03:00
bbd659f142 Web: Files: Hotkeys: removed ZoomIn/ZoomOut 2022-03-11 18:45:02 +03:00
63a0522ce5 Web: Files: Hotkeys: fixed onKeyDown, fixed clearActiveOperations 2022-03-11 18:24:13 +03:00
36f32478af Web: Files: removed hotkey "Go to the top of the list" 2022-03-11 18:14:39 +03:00
31dac3853f Web: Files: fixed clearActiveOperations 2022-03-11 18:13:58 +03:00
8d74491b6a Merge branch 'feature/hotkeys' of github.com:ONLYOFFICE/AppServer into feature/hotkeys 2022-03-11 16:57:47 +03:00
07e32b405f Web: Files: fixed scrolling of hotkeys, fixed hotkeys when some dialog is open 2022-03-11 16:57:35 +03:00
86288df521 Web: Files: Added command+Backspace for delete on Macbook Air 2020 2022-03-11 15:04:07 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
ac052a979d Web: Files: fixed hotkey border 2022-03-11 13:23:33 +03:00
c9871f4b1b Web: Files: removed actions hotkeys 2022-03-11 11:22:52 +03:00
b6c810daa2 Web: Files: fixed hotkeys selection 2022-03-11 10:49:15 +03:00
3dfe77a96e Web: Files: fixed setHotkeyPanelVisible 2022-03-10 18:42:12 +03:00
80e7064dcf Web: Files: fixed AltKey for macOS 2022-03-10 18:31:14 +03:00
8a8451bf7b Web: Files: fixed hotkeys scroll 2022-03-10 18:07:28 +03:00
31e5c4bb36 Web: Files: fixed backToParentFolder for root folder 2022-03-10 17:21:27 +03:00
8dff5425b7 Web: Files: removed HotkeysCreateForm, HotkeysCreateFormFromFile translation keys 2022-03-10 17:03:28 +03:00
mushka
c3c59ceaff changed size names in app buttons 2022-03-10 15:59:04 +03:00
Timofey Boyko
c45baeb3c9 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-10 14:01:29 +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
f401926098 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-09 11:56:03 +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
b572b84410 Web:Files: change import context menu for tile view 2022-03-09 10:29:01 +03:00
Timofey Boyko
c3b901c64a Web:Files:Components: fixed catalog drag and drop 2022-03-09 10:17:38 +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
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