Commit Graph

2694 Commits

Author SHA1 Message Date
2655f0c62d Web: fixed Trans 2021-04-05 15:35:50 +03:00
Viktor Fomin
acd3e3db12 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:22:00 +03:00
Viktor Fomin
6f4a6a972a Web: Files: fixed import 2021-04-05 15:21:52 +03:00
Vladislav Makhov
dbd6c08772 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:08:25 +03:00
Vladislav Makhov
b400a93407 web: files: remove api query, if cancelled or same title 2021-04-05 15:07:58 +03:00
Viktor Fomin
ded5ce44f2 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 14:54:10 +03:00
Viktor Fomin
10f9d2ad2c Web: Files: fixed getting userId 2021-04-05 14:53:37 +03:00
TatianaLopaeva
f095e9c71b Web: Files: FloatingButton remains visible on error until the UploadPanel is opened. 2021-04-05 14:43:03 +03:00
TatianaLopaeva
ed97700dcb Web:Files: UploadPanel: Fixed styles of row content. 2021-04-05 10:26:46 +03:00
a11804b60d temp fix. BinaryFormatter deprecated in .net 5 2021-04-02 21:48:40 +03:00
b89e232e59 Web: Files: fixed drag 2021-04-02 19:29:06 +03:00
Vladislav Makhov
b45e243fe6 web: files: fix stores init 2021-04-02 18:12:50 +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
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
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
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
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
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
TatianaLopaeva
968e0009ee Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path. 2021-04-01 13:03:28 +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
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
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
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
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
TatianaLopaeva
b52997a7f8 Merge branch 'develop' into feature/EditorIntegration 2021-03-30 18:39:09 +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
TatianaLopaeva
dea731dfa7 Web: Files/Editor: Deleted useless code. 2021-03-30 15:44:45 +03:00
TatianaLopaeva
3960ca1490 Web: Files: SharingPanel: Added loader when list of users does not load yet. 2021-03-30 15:24:44 +03:00