Commit Graph

11493 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Vladislav Makhov
07c457882a web: files: fix FilesStore accesses 2021-04-01 11:58:22 +03:00
TatianaLopaeva
833bd357a0 Web: Files: Deleted useless condition for Editor. 2021-04-01 11:55:20 +03:00
TatianaLopaeva
fc1d8001b6 Web: Files: Deleted useless props. 2021-04-01 11:52:24 +03:00
TatianaLopaeva
8f8a0d2f44 Web: Editor: Deleted useless props. 2021-04-01 11:50:30 +03:00
TatianaLopaeva
386529c6fd Merge branch 'develop' into feature/EditorIntegration
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-04-01 10:17:14 +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
TatianaLopaeva
33b165fd40 Web: Files/Editor: Added SharingDialog. 2021-03-31 16:49:14 +03:00
Ilya Oleshko
4a66eda956 Merge branch 'develop' into feature/contextmenu-refactoring 2021-03-31 15:21:16 +03:00