Commit Graph

4592 Commits

Author SHA1 Message Date
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
mushka
384a92c30f finished merging 2022-03-04 12:52:34 +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
mushka
a0aa53d57a fix Home config import duplication 2 2022-03-03 16:17:55 +03:00
Timofey Boyko
0743c5bf83 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:10:03 +03:00
mushka
55d9a76f4d fix Home config import duplication 2022-03-03 15:45:16 +03:00
mushka
a11a40e61b fix import mixins 2022-03-03 14:38:28 +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
mushka
807fe75b72 change code formatting 3 2022-03-03 14:25:10 +03:00
mushka
6b88a2dd43 change code formatting 2 2022-03-03 13:59:20 +03:00
mushka
424a7a7e3c change code formatting 2022-03-03 13:43:43 +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
b38c8f1103 Web: Files: fix unnecessary request 2022-03-03 11:08:25 +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
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
mushka
fd46496544 some tweaks 2022-03-02 13:06:02 +03:00
f57cff1dcc Merge branch 'develop' into feature/backup 2022-03-02 11:21:57 +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
mushka
c5e5ad0908 several items update 2022-03-01 12:24:56 +03:00
bbe35750f5 Merge branch 'develop' into hotfix/campaigns-banner 2022-02-28 19:08:13 +05:00
mushka
d4c4a6ba82 exclude buffer selection 2022-02-28 16:48:04 +03:00
6531d2448e Web: Files: changed maintenance checkout 2022-02-28 18:22:36 +05:00
mushka
518abb7a2f added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization 2022-02-28 15:53:46 +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
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +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
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
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
Timofey
dfde24aff5 Web:Files: refactroing filter 2022-02-22 17:11:21 +08:00
2a7616585e Web: Components: fixed table view 2022-02-22 12:10:27 +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
mushka
80603b2343 added panel close on background click in tablet- view 2022-02-21 15:45:47 +03:00
mushka
524ac82b9e added Show Info option to file context menu 2022-02-21 14:39:47 +03:00
Timofey
e796f7fcc6 Web:Files:Filter: add sort on tablet and mobile view 2022-02-18 22:10:20 +08:00
Timofey
8c73f93eed Web:Files:Catalog: fix section rerender when catalog opening on mobile 2022-02-18 20:46:49 +08:00
e848d5d979 Web: Files: Table/Filter: Restored sorting inside favorite folder 2022-02-17 12:45:55 +03:00
mushka
4039499a1f added loader and shared-to users 2022-02-17 11:46:20 +03:00
638390de68
Merge pull request #540 from ONLYOFFICE/feature/hide-filter-sort
Feature/hide filter sort
2022-02-16 15:14:10 +03:00
924d9bda34 Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder 2022-02-16 13:58:57 +03:00
ee40f9ba7f Web: Files: Filter: Added hiding sort items inside filter at recent and favorites folder 2022-02-16 13:55:42 +03:00
62b4b55dca Web: Files: moved isEdit, titleWithoutExt to inject 2022-02-16 13:18:14 +03:00
5322ed2cec Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming. 2022-02-16 12:03:22 +03:00
Timofey
2f7b4e1453 Web:Files:Panels: change group selector view in add groups panel 2022-02-16 16:53:22 +08:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
ead3820e66 Merge branch 'feature/refactoring-files-formats' of github.com:ONLYOFFICE/AppServer into feature/refactoring-files-formats 2022-02-15 16:33:00 +03:00
51a9e48a1b Web: Files: fixed encryptionUploadDialog 2022-02-15 16:32:21 +03:00
1aa99f3802 Web: Files: removed TODO 2022-02-15 16:31:57 +03:00
b04b6d897d Merge branch 'hotfix/v1.1.1' into feature/refactoring-files-formats 2022-02-15 16:13:52 +03:00
ccc0838269 Web: Files: removed FormatsStore, added getting file formats from SettingsStore 2022-02-15 15:58:31 +03:00
fb5edcf627 Fixed Bug 51725 - Client.Clouds.Changed title of third party folder. 2022-02-15 15:57:11 +03:00
mushka
125796a112 body content 2022-02-15 14:57:36 +03:00
Timofey
2bd0760168 Web:Files:Section: add new id for tile folder header 2022-02-15 19:04:31 +08:00
Timofey
d18fbd6950 Web:Files:Filter: change sort data 2022-02-15 19:02:01 +08:00
d64fe81e5e Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 13:29:36 +03:00
2ba6962e8c Fix Bug 55527 - Client.Files. Badge ‘New’ on Save as/Create a copy/Upload. 2022-02-15 13:01:37 +03:00
175e07b1d2 Web: Files: fix ads timeout 2022-02-15 11:34:40 +03:00
aae5f2c3b0 Web: Files: move new banner from hotfix/campaigns banner 2022-02-15 11:33:43 +03:00
Timofey
7ac52c29c3 Web:Files:Panels: change view and add new props for people selector for change owner and add user panel 2022-02-15 15:20:05 +08:00
0ef8f00fb3 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 10:14:19 +03:00
a1eb764f2b Web:Files:Fix display images in media viewer. 2022-02-15 10:13:54 +03:00
51d1fb09cf
Merge pull request #527 from ONLYOFFICE/bugfix/fixed-files-file-status
Web: Files: fixed files fileStatus
2022-02-14 22:17:58 +03:00
d973e0ee54 Web: Files: Added displaying New badge on socket s:modify-folder->create 2022-02-14 22:17:19 +03:00
Timofey
434e9cba40 Web:Files:Section: add new class name for folder tile header 2022-02-14 23:00:27 +08:00
bb06f8aeef Web: Client: fix ads timeout 2022-02-14 17:51:40 +03:00
6ba390ea62 Web: Files: AutoBackup: optimization, refactoring. 2022-02-14 17:06:26 +03:00
a62f0ca3e3 Web: Client: fix update banner 2022-02-14 16:05:10 +03:00
b7d6454dbe Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-14 14:39:31 +03:00
9ef0e03143 Fixed Bug 55330 - Client. Fixed header title. 2022-02-14 14:31:31 +03:00
Timofey
2059be9a95 Web:Files:Section: connect new filter input with backend API 2022-02-14 18:52:38 +08:00
mushka
9c815a76af added items-panel header divider 2022-02-11 18:19:15 +03:00
mushka
6c22190b28 rename to info-panel 2022-02-11 17:35:18 +03:00
mushka
46fd2f0f75 added isVisible toogle to GroupMenu 2022-02-11 17:30:07 +03:00
a497f3ff19 Web: Files: fixed files fileStatus 2022-02-11 13:42:17 +03:00
8a0aeda83c Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 19:50:30 +03:00
fecb7d5e37 Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited. 2022-02-10 19:49:44 +03:00
2736a945dc Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 18:57:21 +03:00
fc8afde327 Fixed Bug 55449 - Client.Files. Fixed copying of file opened in editor. 2022-02-10 18:57:11 +03:00
mushka
b2fb153042 fixed child rendering; styled header 2022-02-10 18:52:27 +03:00
d2f17efea5 Web: Files: removed unused code 2022-02-10 17:45:47 +03:00
a060c5954d WebL Files: Fix Bug 55397 - Client.Files. Open location menu on Folder 2022-02-10 17:19:21 +03:00
mushka
830d560077 added responsiveness 2022-02-10 16:18:16 +03:00
42ebb57828 Web: Files: Hotkeys: added macOs support 2022-02-10 15:48:26 +03:00
0e0ce0a9bb Web: Files: fixed hotkeys logic 2022-02-10 15:11:01 +03:00
655c0e9122 Web: Files: fixed hotkey symbol for macOS 2022-02-10 14:25:03 +03:00
0d302d5549 Web: Files: fixed files view after resize 2022-02-10 14:03:25 +03:00
b066587fdc Web: Files: fixed selectUpper 2022-02-10 12:44:25 +03:00
76a1c392c2 Web: Files: fixed hotkeys selection 2022-02-10 12:11:57 +03:00
019747995c Web: Files: fixed file selection hotkey 2022-02-10 12:00:12 +03:00
50137b8c12 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-10 11:25:12 +03:00
ef87651b3a Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm" 2022-02-10 11:25:00 +03:00
caa4db9790 add new lines (Files-Home) 2022-02-10 11:10:35 +03:00
mushka
82c1c47be6 working RoomInfoStore 2022-02-09 21:08:22 +03:00
f8a748aae3 Web: files: Code simplification. 2022-02-09 17:25:40 +03:00
b81b34fc99 Web: Files: FilesStore: Fixed folder check for selector 2022-02-09 16:47:57 +03:00
804c9c9547 Web: Locales: EN: Added translation for menu categories 2022-02-09 16:46:28 +03:00
5e47e0c184 Web: Files: HOC: Added model for context menu. Added multilevel menu for desktop view. 2022-02-09 16:45:09 +03:00
e66cb3d716 Fixed Bug 55412 - Client.Files. ‘Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'slice')’ when converting a file. 2022-02-09 16:25:26 +03:00
be6602b22a Fixed Bug 55242 - Mobile.Tablet.Client.Files. ‘Something went wrong’ when switching thumbnail view to normal view. Fixed table re-render 2022-02-09 15:46:38 +03:00
a7337f6580 Web: Files: ManualBackup: Optimization, refactoring. 2022-02-09 15:08:48 +03:00
Timofey
092d870f69 Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input 2022-02-09 19:54:45 +08:00
Timofey
f6e4cc4d71 Merge branch 'develop' into feature/new-filter-input 2022-02-09 19:54:11 +08:00
Timofey
af3a9f08eb Web: switch article component on catalog component 2022-02-09 19:48:11 +08:00
Timofey
0fd47c98b6 Web:Files:Components: change service items icons in third party dialog for dark-theme 2022-02-09 19:26:01 +08:00
52f8ab8695 Merge branch 'develop' into feature/hotkeys
# Conflicts:
#	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
2022-02-09 13:06:21 +03:00
bb1b31034f Web: Files: fixed hotkey selectionsUp 2022-02-09 12:44:23 +03:00
fca8a6ddec Web: Files: fixed hotkey bugs 2022-02-09 12:21:36 +03:00
mushka
ff3c55e892 add header 2022-02-09 12:13:16 +03:00
d2cd7dbeaf Web: Files: fixed selection in hotkeys 2022-02-09 10:48:31 +03:00
d54d3a938e Web: e2e-tests: Update tests screenshots 2022-02-08 19:41:50 +03:00
mushka
b5aba234d9 for review 2022-02-08 17:04:27 +03:00
5fe51b2cd7 Web: Files: hotkeys refactoring 2022-02-08 15:55:08 +03:00
mushka
be1277d8b4 addoed structure 2022-02-08 15:11:31 +03:00
Timofey
caaa88d537 Web:Files: update empty screen trash image for dark-theme 2022-02-08 18:37:17 +08:00
e4b74f9022 Web: Files: added check for firebase config 2022-02-08 15:06:44 +05:00
Timofey
11032cee42 Web:Files: fix hover and active fill color for shared and form button in dark theme 2022-02-08 18:03:40 +08:00
455f4c0aec Merge branch 'hotfix/campaigns-banner' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner 2022-02-08 14:57:55 +05:00
a8590d84ac Web: Files: fixed htmlUrl generate 2022-02-08 14:55:35 +05:00
26721629cf Web: Files: added closing HotkeysPanel after pressing "Esc" key 2022-02-08 12:14:36 +03:00
aac83608a2 Web: Files: SelectFolderDialog: Added missing prop. 2022-02-08 10:32:51 +03:00
33c0e49705 add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel 2022-02-07 16:44:59 +03:00
7b33fab99f Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-07 16:24:08 +03:00
8250b774cd add new lines (UploadPanel), add new file (Home) (de, es, fr, it, zh-CN, ro) 2022-02-07 16:23:43 +03:00
13f9f03d30 Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-07 16:17:50 +03:00
0103dd1a3e Web: Files: fixed socketHelper connection after marge 2022-02-07 16:41:24 +05:00
40d56075f1 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/public/locales/en/Settings.json
#	products/ASC.Files/Client/public/locales/ru/Settings.json
#	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +03:00
Timofey
cef8df0a6e Web:Files:Catalog: add drag
drop
2022-02-07 16:07:26 +08:00
689723b6f2 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-04 21:02:31 +05:00
3e1a620f80 Web: Files: section optimization 2022-02-04 20:57:21 +05:00
Timofey
d7dfa34dc6 Web:Files:Home: fix conflicts after merge 2022-02-04 23:25:24 +08:00
66f684eee2 Web: Files: added hotkey border 2022-02-04 15:04:21 +03:00
b30f488213 Web: Files: fixed preview hotkey description 2022-02-04 12:09:47 +03:00
34e11eb58a Web: Files: moved openFileAction to store, added hotkey for opening files/folders 2022-02-04 11:24:15 +03:00
3a16fdccfd Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-03 21:05:07 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
Timofey
267ac94226 Web:Files: change files menu svg 2022-02-04 00:08:30 +08:00
Timofey
bd8d8180f9 Web: fixed code format 2022-02-03 23:34:19 +08:00
4b6bd34222 Web: Files: added new hotkeys support 2022-02-03 17:49:17 +03:00
42f3f650b7 Web: Files: removed "Find/Next" hotkey 2022-02-03 16:58:11 +03:00
Timofey
c08b1460bc Web:Files:Home: fix context menu render on tile view 2022-02-03 21:22:31 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
98bd1efcf0 Web: Files: added HotkeysPanel 2022-02-03 14:52:55 +03:00
Timofey
918b138f92 Web:Common:Components: add clear trash button 2022-02-03 16:06:36 +08:00
43e4f142d0 Revert "Web: files: Fixed last page operations."
This reverts commit fe1b57fb2c.
2022-02-03 11:02:45 +03:00
9c37c3a171 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-03 10:44:11 +03:00
0d478e43d0 Web: Files: Rewrite socket.io upload files process to client side 2022-02-03 10:44:03 +03:00
Timofey
7086d0cc50 Web:Common:Navigation: change drop box width on tablet devices 2022-02-02 23:04:41 +08:00
3016c191d4 Web: Files: added hotkeys support for tile view 2022-02-02 17:41:29 +03:00
fe1b57fb2c Web: files: Fixed last page operations. 2022-02-02 15:17:03 +03:00
Artem Tarasov
6562e36a13
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
2022-02-02 14:55:38 +03:00
Timofey
512885373d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-02 19:35:42 +08:00
9e35b797ba Web:Files:Added removal of the isFirstUrl key from localStorage. 2022-02-02 14:20:29 +03:00
61b0b012ff Web: Files: removed min-width for Tile 2022-02-02 13:27:35 +03:00
Timofey
427b10142c Merge branch 'develop' into feature/navigation 2022-02-02 17:31:53 +08:00
94dc14c7a1 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 18:07:31 +03:00
98ca84b1dc Web: Socket: Removed support of "create/delete folders" operations (too many issues on client side) 2022-02-01 18:07:23 +03:00
353eb82d88 Merge branch 'feature/socket-io' of github.com:ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 17:57:33 +03:00
e05a95f06d Web: Files: fixed isEditing for dialogs 2022-02-01 17:57:16 +03:00
b4ac2c4e9f Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 16:48:43 +03:00
4bca2a87d2 Web: Files: Fixed page crash when copying. 2022-02-01 15:23:24 +03:00
b88f6a3659 Web: Files: fix header loader 2022-02-01 16:23:06 +05:00
Timofey
f6090b4f58 Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-01 18:44:49 +08:00
Timofey
2870da6271 Web:Common:Components: fixed top and left position for navigation drop-box 2022-02-01 18:37:44 +08:00
Timofey
46afa9b16c Merge branch 'develop' into feature/navigation 2022-02-01 16:45:30 +08:00
94b364efcb Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-01 13:33:27 +05:00
6a65f13c40 Web: Files: added consumer for Bar 2022-02-01 13:19:45 +05:00
Timofey
750becafb8 Merge branch 'feature/new-context-menu' into feature/virtual-room-1.2 2022-02-01 16:07:27 +08:00
7c7263c23a Web: Files: fixed header top 2022-02-01 12:58:19 +05:00
bc63d972d1 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io 2022-02-01 10:43:03 +03:00
Timofey
bc9dd07400 Merge branch 'develop' into branch feature/new-context-menu 2022-02-01 15:07:01 +08:00
29930f244d Web:Files:Added setToPreviewFile to MediaViewer. Changed setToPreviewFile in MediaViewerDataStore. 2022-01-31 18:58:26 +03:00
Timofey
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Timofey
140fc8fd1b Web:Files:Components: fixed floating number in secondary progress 2022-01-31 23:47:22 +08:00
f5653810eb add lo (ConvertPasswordDialog) 2022-01-31 16:52:38 +03:00
Timofey
369801ddb7 Web:Files:Components: add primary and secondary progress in main button mobile view 2022-01-31 21:42:59 +08:00
Timofey
092a89a196 Web:Files:Store: add files count to secondary progress data store 2022-01-31 21:41:54 +08:00
4aa2211af6 Web: Files: removed unused socketStore, fixed mobx warning 2022-01-31 16:37:39 +03:00
0874bd6157 Web: Files: Commented logs 2022-01-31 16:27:45 +03:00
a11d24db47 Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-01-31 13:09:11 +03:00
b91348695e Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function. 2022-01-30 21:46:39 +03:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
8add87820c Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url. 2022-01-28 16:34:15 +03:00
413b5373a2 Web: Files: Fix delete folder by socket 2022-01-28 16:28:40 +03:00
58aec95942 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-28 16:14:32 +03:00
22b4f9555b Fixed Bug 55056 - Client.Files. Added selection reset after drag and drop 2022-01-28 16:14:26 +03:00
155c5f20f2 Fixed Bug 55165 - Client.Files. The logic of saving changes in user actions has been changed. 2022-01-28 15:37:27 +03:00
Timofey
875c1e897a Web:Files:QuickButton: change color selected button 2022-01-28 20:01:36 +08:00
20474796c5 Web: Files: added hotkey support for up/down arrows for tile view, moved Consumer to Home component 2022-01-28 14:58:02 +03:00
57da2c739b Fixed Bug 55065 - Client.Files.Removed "Full access" rights for a file requiring conversion. 2022-01-28 13:45:22 +03:00
Timofey
f2ac0c721b Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 18:04:53 +08:00
Timofey
210ebd7ad1 Web:Files: add support dark-theme for select-file-dialog-aside_buttons class 2022-01-28 18:03:33 +08:00
92542a4a27 Merge branch 'feature/dark-theme' of github.com:ONLYOFFICE/AppServer into feature/dark-theme 2022-01-28 13:01:42 +03:00
5db134933b Web: Files: Fixed error when clicked on "change access rights" twice. 2022-01-28 13:01:08 +03:00
Timofey
3c53e73484 Web:Files:SimpleFileInput: add support dark-theme 2022-01-28 17:57:15 +08:00
d81b941c36 Fixed Bug 55097 - Client.Files. Remove element of filter "Folders/Not subfolders" in Trash folder. 2022-01-28 11:16:29 +03:00
Timofey
136fe4f41d Web:Files:Store: add files count to secondary progress store 2022-01-28 15:58:23 +08:00
d01ae8b347 Web:Files:Added onChangeUrl function to MediaViewer. Added onpopstate event to add id to store MediaViewerData. 2022-01-27 18:48:52 +03:00
Timofey
5af7f89261 Web:Files: fixed hover and selected color in dark theme for tree folders 2022-01-27 22:19:13 +08:00
Timofey
18ed20569d Web:Editor: wrap editor in theme provider and delete theme as props in components 2022-01-27 21:54:58 +08:00
395b1a2e0b Web: Files: Added hide unpin article when select settings module. 2022-01-27 15:59:06 +03:00
a15e651aea Web: Files: changed the banner existence check, added onLoad, onClose function for snackbar 2022-01-27 17:22:53 +05:00
c951d69e3f Web: Files: added checked maintenance params 2022-01-27 17:20:10 +05:00
29f83f9cb7
Merge pull request #497 from ONLYOFFICE/bugfix/remove-loader-after-switch-modules
Removed loader after switch modules
2022-01-27 15:19:42 +03:00
45313ba07f Web: Files: Fixed the length of the row separators according to the layout. 2022-01-27 13:54:33 +03:00
Timofey
fb1a86eecd Web:Files:QuickButton: fixed color and hover after merge branch 'develop' 2022-01-27 18:25:54 +08:00
3f1b9c7a7a Merge branch 'hotfix/v1.1.1' into bugfix/remove-loader-after-switch-modules
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-01-27 13:16:21 +03:00
Timofey
4b45eaa243 Merge branch 'develop' into feature/dark-theme 2022-01-27 18:10:13 +08:00
bbef3fd2d0 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-27 12:43:00 +03:00
482c2270f2 Fixed Bug 55133 - Client.Files. ‘Uncaught (in promise) ReferenceError: deselectActiveFiles is not defined’. 2022-01-27 12:42:53 +03:00
d7cdb39ef7
Merge pull request #499 from ONLYOFFICE/bugfix/table-view-header
Bugfix/table view header
2022-01-27 12:35:39 +03:00
67cfb9bd9a Web: Files: Deleted useless code. 2022-01-27 12:24:41 +03:00
133bd65938 Web: Files: Removed state of begin scrolling. 2022-01-27 12:18:59 +03:00
Timofey
293de829bd Web:Files:Catalog: add main button mobile on mobile and tablet devices 2022-01-27 17:13:49 +08:00
36b4b64f3a Web: Socket: Added new methods CreateFolder, DeleteFolder 2022-01-27 11:42:57 +03:00
49b4da0269 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-01-27 11:33:54 +03:00