Commit Graph

1619 Commits

Author SHA1 Message Date
a2b933994e Web: Files: fixed conflictResolveType for files operations 2020-05-27 15:10:33 +03:00
NikolayRechkin
686151c65a Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-26 14:46:53 +03:00
NikolayRechkin
c54af7f933 web: files: do not render the closed media viewer 2020-05-26 14:46:10 +03:00
dc1597825e Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-26 14:31:24 +03:00
ead15da793 Web: Files: fixed update tree folders after remove 2020-05-26 14:31:11 +03:00
Ilya Oleshko
4b107b45dd Web: Files: DocEditor: Added mobile view for mobile devices 2020-05-26 12:53:58 +03:00
49de9ec7b9 Web: Files: added progress-bar for empty recycle bin operation 2020-05-21 17:10:58 +03:00
NikolayRechkin
784e78736f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-21 15:38:31 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
150e229ee8 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-21 15:18:44 +03:00
86a0f456a5 Web: Files: fixed error in files operations, added restore action 2020-05-21 15:18:35 +03:00
Nikolay Rechkin
cbc0332919
Merge pull request #38 from ONLYOFFICE/feature/media-viewer
Feature/media viewer
2020-05-21 14:20:24 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +03:00
88f19ced05 Files: fix 2020-05-21 11:24:40 +03:00
NikolayRechkin
e8a0bbcd73 Merge branch 'feature/files' into feature/media-viewer 2020-05-21 10:10:08 +03:00
8f5913929f Web: Files: fixed opening the operation panel 2020-05-20 15:43:27 +03:00
dbc222849d Web: Files: fixed create folder action 2020-05-20 15:24:07 +03:00
08c8caf5de Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 13:47:08 +03:00
3576dcb7be Web: Files: fixed files and folders deletion actions in contextMenu 2020-05-20 13:46:56 +03:00
a61103e0f8 Merge branch 'master' into feature/files 2020-05-20 12:59:32 +03:00
a064da49f4 Files: fix OpenEdit 2020-05-20 12:58:40 +03:00
1ef138701b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 12:00:09 +03:00
761b3cd4f7 Web: Files: added progress to delete dialog 2020-05-20 12:00:02 +03:00
ea9bb3df38 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-05-20 11:28:24 +03:00
68dfa9dcd7 Merge branch 'master' into feature/files 2020-05-20 11:27:52 +03:00
cee180669b Files: added FileEntryWrapperConverter 2020-05-20 11:27:20 +03:00
5207769230 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-20 10:55:34 +03:00
bdee7bf455 Web: Files: added MoveTo and Copy actions, code refactoring 2020-05-20 10:54:08 +03:00
0705756719 Merge branch 'master' into feature/files 2020-05-19 23:13:51 +03:00
NikolayRechkin
b63b8edc21 web: files: fix 2020-05-19 09:27:46 +03:00
NikolayRechkin
ea02ee9313 Merge branch 'feature/files' into feature/media-viewer 2020-05-19 00:30:31 +03:00
NikolayRechkin
20cf39f908 web: common: MediaViewer. Refactoring 2020-05-19 00:12:48 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
609290dcd9 Merge branch 'master' into feature/files 2020-05-18 12:03:38 +03:00
18a7198e8c Web: Files: added error handlers 2020-05-18 12:00:37 +03:00
7e387cf51a Files: fix 2020-05-18 11:59:37 +03:00
4b89f35538 Web: Files: fixed sharing panel selected options 2020-05-18 11:34:07 +03:00
bcd8e1915e Web: Files: fixed download actions 2020-05-18 11:16:45 +03:00
1842076658 Merge branch 'master' into feature/files 2020-05-18 10:51:37 +03:00
f0adf6d38e FileOperation: ProgressStep fixed 2020-05-18 10:43:53 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
2424924eed Files: optimization 2020-05-17 21:11:56 +03:00
NikolayRechkin
52f687bd65 Merge branch 'feature/files' into feature/media-viewer 2020-05-17 19:16:38 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
cc64abed6f Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-15 21:25:40 +03:00
6e31e618ef Web: Files: fixed download as 2020-05-15 21:25:31 +03:00
8c11f5364c Web: Files: added download files upload with progress 2020-05-15 21:02:56 +03:00
f97e690773 Web: Files: added sharing api 2020-05-15 18:47:35 +03:00
b5e31b63c9 Files: fix RemoveSecurityInfo 2020-05-15 18:12:04 +03:00
787ddf831c Merge branch 'master' into feature/files 2020-05-15 14:03:33 +03:00