Commit Graph

11511 Commits

Author SHA1 Message Date
Artem Tarasov
e304af064b Web: People: fixed group list query 2021-04-05 16:18:41 +03:00
Vladislav Makhov
bf6cb4b134 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 16:09:34 +03:00
Vladislav Makhov
cf85e950ff web: people: fix onGroupClick 2021-04-05 16:09:21 +03:00
2c7434710c Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:49:08 +03:00
b9fe2c338f Added New Proxy settings 2021-04-05 15:49:02 +03:00
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
TatianaLopaeva
de67d004e5 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-05 15:18:31 +03:00
TatianaLopaeva
24e80979f5 Web: createUser: Fixed margin-top for mobile devices. 2021-04-05 15:18:24 +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
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
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