Commit Graph

11430 Commits

Author SHA1 Message Date
300c064556 Web: Files: fixed drag 2021-04-02 12:26:31 +03:00
Artem Tarasov
ffb4405a1a Web: Files: fix after merge 2021-04-02 00:11:15 +03:00
Artem Tarasov
43b9301e90 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
2021-04-01 18:19:09 +03:00
a71bbc9886 Files: fix finding template when saving file, hat doesn't have template 2021-04-01 16:32:10 +03:00
Artem Tarasov
83d3d82a65 Web: Files: created FilesItem component, refactoring SimpleFilesRow, deleted FileTile 2021-04-01 14:49:01 +03:00
c3f27278b4
Merge pull request #209 from ONLYOFFICE/feature/dotnet5
Feature/dotnet5
2021-04-01 14:44:26 +03:00
Artem Tarasov
ddcdb41734 Web: Files: added FilesContainer, removed FilesTileContainer and FilesRowContainer 2021-04-01 13:37:44 +03:00
Artem Tarasov
4bfcf39410 Web: Files: fix context menu action 2021-04-01 12:22:07 +03:00
Artem Tarasov
c6a462168c Web: Files: Tile: refactoring 2021-04-01 10:08:07 +03:00
18b4fba15a Merge branch 'develop' into feature/dotnet5 2021-03-31 20:38:05 +03:00
e9c62be0ce
Merge pull request #208 from ONLYOFFICE/bugfix/privacy-room
Bugfix/privacy room
2021-03-31 19:08:31 +03:00
8f2baed113 Jenkinsfile: fix 2021-03-31 18:24:32 +03:00
be316548fb
Merge branch 'develop' into bugfix/privacy-room 2021-03-31 18:23:27 +03:00
166aaa8239
Merge branch 'develop' into bugfix/privacy-room 2021-03-31 18:01:58 +03:00
Vladislav Makhov
b0b8849ae5 web: files: fix isDesktop refer 2021-03-31 17:59:03 +03:00
Artem Tarasov
d83a9a255c
Merge pull request #206 from ONLYOFFICE/feature/drag-and-drop
Feature/drag and drop
2021-03-31 15:10:09 +03:00
Vladislav Makhov
2c253bd471 web: files: rename isItemsSelected to selectionCount 2021-03-31 13:56:56 +03:00
Vladislav Makhov
56f49526ad web: files: fix link 2021-03-31 13:54:29 +03:00
Vladislav Makhov
a6f1ed972c web: fix progress-indicator style for desktop 2021-03-31 12:46:09 +03:00
Ilya Oleshko
d75e0e7e1d Web: Components: Fixed usage webkit-touch-callout at TextInput component only for desktop 2021-03-31 12:39:31 +03:00
c0e780a287 Web: Files: fixed showDragItems 2021-03-31 11:03:56 +03:00
Vladislav Makhov
1728da802d web: fix isAccessedSelected 2021-03-31 10:49:46 +03:00
Ilya Oleshko
b979b3324f Web: Components: Added stopping webkit-touch-callout at GroupButtonsMenu component 2021-03-31 10:44:04 +03:00
Ilya Oleshko
d12a3460db Web: Components: Added stopping webkit-touch-callout at TextInput component 2021-03-31 10:43:41 +03:00
Ilya Oleshko
ff79708e59 Web: Client: Layout: Fixed component render on old webkit devices, disable webkit-touch-callout at article 2021-03-31 10:42:59 +03:00
Vladislav Makhov
75386c10ea web: files: add missing whitespaces in description 2021-03-30 16:05:04 +03:00
Vladislav Makhov
627e84aeaa web: files: fix isAccessedSelected 2021-03-30 15:53:47 +03:00
Vladislav Makhov
1a66373c16 web: fix defaultPage 2021-03-30 15:01:25 +03:00
Artem Tarasov
e7d9c9b9d5 Web: Files: added transfer func t and history to contextOptionsStore 2021-03-30 13:21:44 +03:00
Vladislav Makhov
be3c97bce2 web: fix opening Files as default page, if desktop client uses 2021-03-30 13:05:52 +03:00
6c46dd759f Web: Files: fixed context options props 2021-03-30 12:14:25 +03:00
Vladislav Makhov
b4ea70ddaa web: files: regDesktop fix 2021-03-30 11:34:48 +03:00
06f34408ff Merge branch 'develop' into feature/drag-and-drop 2021-03-30 11:10:15 +03:00
9427d98318 Web: Files: refactoring 2021-03-30 11:08:38 +03:00
Artem Tarasov
ebca5f181e Web: Files: applied contextOptionsStore in tile 2021-03-30 01:13:26 +03:00
Artem Tarasov
7fa2a132b5 Web: Files: added necessary methods to contextOptionsStore 2021-03-30 01:12:35 +03:00
Artem Tarasov
a50af59dd1 Web: Files: applied contextOptionsStore in row 2021-03-30 01:11:04 +03:00
Artem Tarasov
72e1e7a08f Web: Files: added ContextOptionsStore 2021-03-29 22:23:49 +03:00
Artem Tarasov
6fdf49742d Web: Common: FilterInput: propTypes fix 2021-03-29 22:22:43 +03:00
3a756986a0 Files: added enableExternalExt when creating file 2021-03-29 17:53:12 +03:00
91aa5996b5 Web: Files: refactoring 2021-03-29 17:45:26 +03:00
Vladislav Makhov
701e5fc2d1 web: files: fix isOnlyFoldersSelected 2021-03-29 16:25:16 +03:00
Vladislav Makhov
ddba3d91bf web: files: fix isEncryptionSupport value 2021-03-29 16:13:21 +03:00
Vladislav Makhov
70b6e8fe51 web: files: fix share button for private room 2021-03-29 16:05:00 +03:00
Vladislav Makhov
760c3268df web: files: add missing prop 2021-03-29 16:03:34 +03:00
a8d475cb91 Merge branch 'develop' into feature/drag-and-drop 2021-03-29 15:26:22 +03:00
b574424224 Files: added enableExternalExt when creating file 2021-03-29 15:06:51 +03:00
f381eb2780 Web: Files: fixed move operations for third party folders 2021-03-29 14:56:39 +03:00
d10f47d984 Web: Files: fixed scroll 2021-03-29 12:06:01 +03:00
fa372f118b Web: Files: fixed scroll 2021-03-29 11:41:42 +03:00