Commit Graph

5573 Commits

Author SHA1 Message Date
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
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
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
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
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
8a32228bc8 web: common: bump version 2020-05-18 09:25:17 +03:00
2424924eed Files: optimization 2020-05-17 21:11:56 +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
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
aeef09bbc1 Merge branch 'master' into feature/files 2020-05-15 12:58:43 +03:00
19a43e461a Files: createindex fixed 2020-05-15 12:57:40 +03:00
ea03b6428f fix 2020-05-14 20:39:40 +03:00
2c21d99ca2 Files: fix 2020-05-14 19:53:26 +03:00
93f6771f48 Files: serializer 2020-05-14 18:52:06 +03:00
c47bcebff3 Core: removed Custom Resolver 2020-05-14 18:51:22 +03:00
91d287a2d5 Merge branch 'master' into feature/system-json
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
2020-05-14 17:14:59 +03:00
de55454c84 Merge branch 'master' into feature/files 2020-05-14 17:08:59 +03:00
8aaf528f2a Elastic: CreateIfNotExist 2020-05-14 17:03:24 +03:00