Commit Graph

3740 Commits

Author SHA1 Message Date
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
461fc55f22
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
2020-06-28 16:23:36 +03:00
155e0b2c9b Backup: fix 2020-06-28 14:46:16 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
29a0e752bb Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
23945aeb24 Api: backup removed 2020-06-25 16:25:03 +03:00
b01b3d85f8 Backup: fix 2020-06-25 16:10:28 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
1871959768 fix 2020-06-25 15:17:22 +03:00
2fe2c2167b Merge branch 'master' into feature/thumbnails
# Conflicts:
#	ASC.Web.sln
2020-06-25 15:01:38 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
SuhorukovAnton
e21d99e361 Thumbnails: fix 2020-06-23 14:19:12 +03:00
SuhorukovAnton
cce4d5fa7a Thumbnails: delete unnecessary 2020-06-23 14:14:13 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
Ilya Oleshko
e2cef60f0f web: components: bump version 2020-06-11 15:55:13 +03:00
Ilya Oleshko
9ab3b7557b web: common: bump version 2020-06-11 15:55:03 +03:00
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
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
3c66bbb607 Merge branch 'master' into feature/backup 2020-06-09 10:48:07 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
b569245076 rever logger 2020-06-04 16:47:27 +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
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
a14049e88f Settings: fixed GetSupportedCultures 2020-06-03 18:51:01 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00
550b0dd20e Sln: packages updated 2020-05-18 10:27:22 +03:00
47c79d57f0 Optimization 2020-05-17 16:08:20 +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
1d245236ef Merge branch 'master' into feature/files-index 2020-05-14 12:19:34 +03:00
7bf739fe09 Optimization 2020-05-07 14:02:29 +03:00