|
|
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 |
|
|
|
1062e3bcdf
|
Web: People: fix translates
|
2022-03-09 11:04:28 +03:00 |
|
|
|
ee446c8e67
|
Web: moved translates to Common
|
2022-03-09 11:04:12 +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
|
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
|
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 |
|
|
|
1a9ced4901
|
Web: Files: fixed context menu opening
|
2022-03-05 17:36:04 +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 |
|
|
|
9b035a6519
|
Web: Files: updated HotkeysPanel, fixed styles
|
2022-03-05 16:19:24 +03:00 |
|
|
|
5fb51923b0
|
Web: People: fix translates
|
2022-03-05 14:32:35 +03:00 |
|
|
|
7ffaee6efc
|
Web: moved translates to Common
|
2022-03-05 14:27:59 +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 |
|
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 |
|
|
|
cb22e644cc
|
Merge branch 'develop' into feature/hotkeys
|
2022-03-03 10:02:16 +03:00 |
|
|
|
2978adcdf3
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-03-02 18:18:05 +03:00 |
|
|
|
1abe5f4122
|
Merge branch 'develop' into feature/login-redesign
|
2022-03-02 18:15:03 +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 |
|
|
|
9aff975cd4
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-28 16:17:48 +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 |
|
|
|
4659e25661
|
Merge branch 'develop' into feature/hotkeys
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/FilesPanels/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2022-02-28 10:46:26 +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 |
|
|
|
dc78ff3a33
|
Web: Client: People: Added fixedDirection property for DateField
|
2022-02-25 16:48:12 +03:00 |
|
|
|
7e50d1b097
|
Web: People: Profile: fixed help-icon styles
|
2022-02-25 13:41:47 +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 |
|
|
|
64473bb70e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 11:15:20 +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 |
|
|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +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 |
|
|
|
34f6570027
|
Web: Files: fixed files loader
|
2022-02-24 11:42:33 +03:00 |
|
|
|
902b2b54eb
|
Web: People: fixed table style
|
2022-02-24 11:33:58 +03:00 |
|
|
|
d7f16aa96d
|
Web: Table: fixed table styles
|
2022-02-24 11:20:32 +03:00 |
|
|
|
d65d30ec24
|
Test: disable socketio
|
2022-02-23 17:10:04 +03:00 |
|
|
|
81b33e673a
|
Files: fix warnings
|
2022-02-23 17:09:32 +03:00 |
|
|
|
3d4e000778
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-02-23 16:01:55 +03:00 |
|
