Artem Tarasov
|
98f30631b2
|
Web: Files: store: refactoring contextOptionsStore
|
2021-04-05 12:39:31 +03:00 |
|
Artem Tarasov
|
43491f42a9
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/InitFilesStore.js
|
2021-04-05 10:54:27 +03:00 |
|
Artem Tarasov
|
2bb0f69e4b
|
Merge branch 'feature/thumbnails' of github.com:ONLYOFFICE/AppServer into feature/thumbnails
|
2021-04-02 23:56:49 +03:00 |
|
Artem Tarasov
|
1156f31d63
|
Web: Files: refactoring FIlesContent
|
2021-04-02 23:56:28 +03:00 |
|
|
|
ae6fd12605
|
Merge pull request #211 from ONLYOFFICE/feature/contextmenu-refactoring
Feature/contextmenu refactoring
|
2021-04-02 19:45:50 +03:00 |
|
Ilya Oleshko
|
3c4cd300a3
|
Web: Components: ContextMenuButton: Added to boolean for isMobile
|
2021-04-02 19:33:17 +03:00 |
|
|
|
b89e232e59
|
Web: Files: fixed drag
|
2021-04-02 19:29:06 +03:00 |
|
Ilya Oleshko
|
22cd73ddd2
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-04-02 18:21:20 +03:00 |
|
|
|
75dc14a4be
|
Merge pull request #210 from ONLYOFFICE/bugfix/files-store
Bugfix/files store
|
2021-04-02 18:19:36 +03:00 |
|
Vladislav Makhov
|
b45e243fe6
|
web: files: fix stores init
|
2021-04-02 18:12:50 +03:00 |
|
Ilya Oleshko
|
3ae0a4703f
|
Web: Components: Row: Removed unused test
|
2021-04-02 18:05:26 +03:00 |
|
Ilya Oleshko
|
5733a4d9ab
|
Web: Components: ContextMenu: Added hiding disabled items inside ContextMenu component
|
2021-04-02 17:54:52 +03:00 |
|
Ilya Oleshko
|
6c0918409f
|
Web: Components: Row: Fixed multi-open context menu on row
|
2021-04-02 17:31:36 +03:00 |
|
Vladislav Makhov
|
3180831e19
|
web: files: fix stores init
|
2021-04-02 17:03:52 +03:00 |
|
Vladislav Makhov
|
0f6b08b2f3
|
web: files: transfer InitFilesStore to FilesStore
|
2021-04-02 16:33:18 +03:00 |
|
Vladislav Makhov
|
601c9441cb
|
web: files: remove unnecessary code
|
2021-04-02 15:45:49 +03:00 |
|
Vladislav Makhov
|
555bb28e47
|
web: common: remove unused imports
|
2021-04-02 15:36:40 +03:00 |
|
Vladislav Makhov
|
179fec232e
|
Merge branch 'develop' into bugfix/files-store
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-04-02 15:34:34 +03:00 |
|
Vladislav Makhov
|
3e3c442f7c
|
web: files: destructured variables
|
2021-04-02 15:02:03 +03:00 |
|
Ilya Oleshko
|
d9c9767f5c
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-04-02 15:01:47 +03:00 |
|
Vladislav Makhov
|
ff04684f53
|
web: remove unused code
|
2021-04-02 13:49:42 +03:00 |
|
Vladislav Makhov
|
d63132d9e7
|
web: files: remove console log
|
2021-04-02 13:06:12 +03:00 |
|
Vladislav Makhov
|
c99fc660c9
|
web: files: remove unused code and imports
|
2021-04-02 13:03:28 +03:00 |
|
Artem Tarasov
|
7fa13538f5
|
Web: File: moved okIcon and cancelIcon to EditingWrapperComponent
|
2021-04-02 12:45:40 +03:00 |
|
Vladislav Makhov
|
1bc8ad8600
|
web: files: fix FilesStore accesses
|
2021-04-02 12:41:13 +03:00 |
|
Vladislav Makhov
|
f532c06c55
|
web: files: fix UploadDataStore accesses
|
2021-04-02 12:40:59 +03:00 |
|
|
|
300c064556
|
Web: Files: fixed drag
|
2021-04-02 12:26:31 +03:00 |
|
|
|
32d1d13856
|
Merge pull request #207 from ONLYOFFICE/feature/EditorIntegration
Feature/editor integration
|
2021-04-02 12:16:15 +03:00 |
|
Vladislav Makhov
|
2bafdbc0d2
|
web: files: fix TreeFoldersStore accesses
|
2021-04-02 11:20:19 +03:00 |
|
Vladislav Makhov
|
df3f8ca9e5
|
web: files: fix MediaViewerDataStore accesses
|
2021-04-02 11:16:01 +03:00 |
|
Vladislav Makhov
|
0eeee5842a
|
web: files: fix FormatsStore accesses
|
2021-04-02 11:13:33 +03:00 |
|
Ilya Oleshko
|
2b8bf618fb
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-04-02 11:09:57 +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 |
|
Vladislav Makhov
|
f70bcc52ca
|
web: files: fix FilesActionStore accesses
|
2021-04-01 17:34:22 +03:00 |
|
TatianaLopaeva
|
f79f75f6db
|
Merge branch 'develop' into feature/EditorIntegration
|
2021-04-01 16:42:33 +03:00 |
|
|
|
a71bbc9886
|
Files: fix finding template when saving file, hat doesn't have template
|
2021-04-01 16:32:10 +03:00 |
|
TatianaLopaeva
|
0ea46425c6
|
Web:Files: Fix SharedPanel when uploadPanel is visible.
|
2021-04-01 15:32:21 +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 |
|
TatianaLopaeva
|
26fe94ae5f
|
Web: Files: Added translation for EmbeddingPanel.
|
2021-04-01 13:50:57 +03:00 |
|
Artem Tarasov
|
ddcdb41734
|
Web: Files: added FilesContainer, removed FilesTileContainer and FilesRowContainer
|
2021-04-01 13:37:44 +03:00 |
|
Vladislav Makhov
|
61fcaf8315
|
web: files: fix SettingsStore accesses
|
2021-04-01 13:28:59 +03:00 |
|
Ilya Oleshko
|
3812af35ea
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-04-01 13:24:05 +03:00 |
|
Ilya Oleshko
|
04b8500a78
|
Web: Components: Apply ContextMenu at Row
|
2021-04-01 13:22:37 +03:00 |
|
TatianaLopaeva
|
968e0009ee
|
Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path.
|
2021-04-01 13:03:28 +03:00 |
|
Vladislav Makhov
|
cb10e850cd
|
web: common: switch to makeAutoObservable, add action setIsEncryptionSupport
|
2021-04-01 12:42:23 +03:00 |
|
Vladislav Makhov
|
3915d28737
|
web: files: fix InitFilesStore accesses
|
2021-04-01 12:27:19 +03:00 |
|
Artem Tarasov
|
4bfcf39410
|
Web: Files: fix context menu action
|
2021-04-01 12:22:07 +03:00 |
|
Vladislav Makhov
|
07c457882a
|
web: files: fix FilesStore accesses
|
2021-04-01 11:58:22 +03:00 |
|
