Commit Graph

5690 Commits

Author SHA1 Message Date
NikolayRechkin
4819c535b6 Merge branch 'master' into feature/files 2020-05-29 00:18:02 +03:00
NikolayRechkin
9cf8585a11 web: common: bump version 2020-05-29 00:07:09 +03:00
NikolayRechkin
a633e0f6aa Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-29 00:05:56 +03:00
NikolayRechkin
ec914dfc04 web: common: MediaViewer. fixed a image-viewer for safari 2020-05-29 00:05:37 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +03:00
4ac1fd815a web: common: bump version 2020-05-28 10:01:50 +03:00
fa634b7e53 Web: Common: fixed FolderType enum 2020-05-28 10:00:35 +03:00
5edf43ebb2 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-05-28 09:36:11 +03:00
0a48d2b179 Merge branch 'master' into feature/files 2020-05-28 09:20:58 +03:00
NikolayRechkin
8e6df7371f web: common: bump version 2020-05-28 09:07:12 +03:00
NikolayRechkin
6c59ca8c7d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-28 09:06:40 +03:00
NikolayRechkin
3226154cb3 web: common: fixed styles 2020-05-28 09:06:18 +03:00
80dcee7ed4 Files: fix long operations 2020-05-27 18:23:50 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
a2b933994e Web: Files: fixed conflictResolveType for files operations 2020-05-27 15:10:33 +03:00
NikolayRechkin
a1f55209a9 web: common: bump version 2020-05-26 15:07:26 +03:00
NikolayRechkin
b4499b54a5 web: common: MediaViewer. Fixed a playlist position 2020-05-26 15:06:59 +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
5cba165a0e web: common: bump version 2020-05-26 12:54:29 +03:00
Ilya Oleshko
fc12479c03 web: components: bump version 2020-05-26 12:54:19 +03:00
Ilya Oleshko
4b107b45dd Web: Files: DocEditor: Added mobile view for mobile devices 2020-05-26 12:53:58 +03:00
Ilya Oleshko
fb8cccc6ea Web: Common: Removed fake api 2020-05-26 12:53:34 +03:00
Ilya Oleshko
0b24a1d671 Web: Components: Removed faker 2020-05-26 12:52:31 +03:00
NikolayRechkin
9e3997eaf2 web: common: bump version 2020-05-25 17:59:23 +03:00
NikolayRechkin
f64fedfb88 web: common: MediaViewer. deleted unused code 2020-05-25 17:58:39 +03:00
NikolayRechkin
d401368e52 web: common: bump version 2020-05-25 16:23:27 +03:00
NikolayRechkin
0cbb5e55ea Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files 2020-05-25 16:23:00 +03:00
NikolayRechkin
22ce7c7381 web: common: fixed playlist change 2020-05-25 16:21:14 +03:00
b0ae0b5270 Merge branch 'master' into feature/files 2020-05-22 15:26:05 +03:00
b6817d18b5 UrlShortenerService: fix 2020-05-22 14:51:03 +03:00
48411e4c9d Merge branch 'master' into feature/files 2020-05-22 14:01:04 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
4299f91ab5 Merge branch 'master' into feature/files 2020-05-22 12:54:19 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +03:00
49de9ec7b9 Web: Files: added progress-bar for empty recycle bin operation 2020-05-21 17:10:58 +03:00
NikolayRechkin
055e7a61bd Files: update appsettings.test.json 2020-05-21 15:59:00 +03:00
NikolayRechkin
47a45fe34f Files: fix 2020-05-21 15:39:37 +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
bbe6a16746 Files: update appsettings.test.json 2020-05-21 15:38:16 +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
NikolayRechkin
22c4af072e Files: small fix 2020-05-21 14:19:36 +03:00
NikolayRechkin
57f48fbfc7 Files: updated a config 2020-05-21 14:18:05 +03:00
5d5c67ea3c Merge branch 'master' into feature/files 2020-05-21 11:51:09 +03:00
4dd3d6fde5
Merge pull request #31 from ONLYOFFICE/feature/urlshortener
Feature/urlshortener
2020-05-21 11:50:00 +03:00