Commit Graph

5159 Commits

Author SHA1 Message Date
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
2f8e09f915 fix 2020-06-10 17:22:48 +03:00
5aef887fe1 test: fix 2020-06-10 11:49:50 +03:00
344916b395 TenantManager: fix 2020-06-09 10:54:05 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
b569245076 rever logger 2020-06-04 16:47:27 +03:00
fed4d206f7 Revert logger 2020-06-04 16:46:58 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
1c25d16fc2 Products: added absolute path support 2020-06-04 14:01:25 +03:00
a14049e88f Settings: fixed GetSupportedCultures 2020-06-03 18:51:01 +03:00
81e0917847 Files: simplified getHeaders method 2020-06-03 18:04:14 +03:00
dbfb84786e Files: simplified getHeaders method 2020-06-01 15:16:24 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
4544469dca TenantManager: add TenantHolder 2020-06-01 13:55:26 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +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
b6817d18b5 UrlShortenerService: fix 2020-05-22 14:51:03 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +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
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
85cec8fff2 ApiSystem: fix autofac 2020-05-20 16:06:35 +03:00
a064da49f4 Files: fix OpenEdit 2020-05-20 12:58:40 +03:00
cee180669b Files: added FileEntryWrapperConverter 2020-05-20 11:27:20 +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
7e387cf51a Files: fix 2020-05-18 11:59: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
47c79d57f0 Optimization 2020-05-17 16:08:20 +03:00
78442cd9eb Files: Service fix 2020-05-15 14:02:05 +03:00
19a43e461a Files: createindex fixed 2020-05-15 12:57:40 +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
8aaf528f2a Elastic: CreateIfNotExist 2020-05-14 17:03:24 +03:00
28c09d37f2 Files: fixed DbFilesSecurity keys 2020-05-14 15:43:56 +03:00
17a88df5ac Files: fix download 2020-05-14 13:47:53 +03:00
75388f19d2
Merge pull request #36 from ONLYOFFICE/feature/files-index
Feature/files index
2020-05-14 12:44:32 +03:00