NikolayRechkin
|
22ce7c7381
|
web: common: fixed playlist change
|
2020-05-25 16:21:14 +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 |
|
|
|
88f19ced05
|
Files: fix
|
2020-05-21 11:24:40 +03:00 |
|
|
|
3fadf8db6c
|
fix log, added UrlShortenerService config
|
2020-05-21 11:03:35 +03:00 |
|
NikolayRechkin
|
d6792ba727
|
web: common: bump version
|
2020-05-21 10:10:39 +03:00 |
|
NikolayRechkin
|
e8a0bbcd73
|
Merge branch 'feature/files' into feature/media-viewer
|
2020-05-21 10:10:08 +03:00 |
|
NikolayRechkin
|
51b504827b
|
web: common: bump version
|
2020-05-21 10:05:16 +03:00 |
|
|
|
02dd1e9e31
|
Merge branch 'master' into feature/urlshortener
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
|
2020-05-20 18:18:31 +03:00 |
|
|
|
7cedd1c7c9
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-05-20 16:47:12 +03:00 |
|
|
|
1aa1abb768
|
Merge branch 'master' into feature/files
|
2020-05-20 16:07:41 +03:00 |
|
|
|
85cec8fff2
|
ApiSystem: fix autofac
|
2020-05-20 16:06:35 +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 |
|
NikolayRechkin
|
4e4b37fe13
|
web: common: MediaViewer. Fixes for pull request
|
2020-05-20 13:40:41 +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 |
|
|
|
6cd1cf9541
|
web: common: bump version
|
2020-05-20 10:56:04 +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 |
|
|
|
3b8805ab88
|
Web: Common: added copy and move API
|
2020-05-20 10:55:26 +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 |
|
|
|
497e959457
|
Merge pull request #29 from ONLYOFFICE/feature/apisystem
Feature/apisystem
|
2020-05-19 22:16:12 +03:00 |
|
|
|
d08a564946
|
ApiSystem: service, config, di
|
2020-05-19 20:41:37 +03:00 |
|
|
|
627dd8a97d
|
ApiSystem: fix
|
2020-05-19 16:22:47 +03:00 |
|
|
|
b29b11ad0f
|
Merge branch 'master' into feature/apisystem
# Conflicts:
# ASC.Web.sln
|
2020-05-19 14:45:24 +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
|
70456dc651
|
web: common: bump version
|
2020-05-19 00:15:18 +03:00 |
|
NikolayRechkin
|
20cf39f908
|
web: common: MediaViewer. Refactoring
|
2020-05-19 00:12:48 +03:00 |
|
|
|
6d9990abfd
|
Merge pull request #37 from ONLYOFFICE/feature/system-json
Feature/system json
|
2020-05-18 15:45:29 +03:00 |
|
|
|
bb6f32e36a
|
Api: fix
|
2020-05-18 15:08:03 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
