Commit Graph

5332 Commits

Author SHA1 Message Date
2f8e09f915 fix 2020-06-10 17:22:48 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
5aef887fe1 test: fix 2020-06-10 11:49:50 +03:00
31fc052531 Merge branch 'master' into feature/backup 2020-06-09 10:54:35 +03:00
344916b395 TenantManager: fix 2020-06-09 10:54:05 +03:00
3c66bbb607 Merge branch 'master' into feature/backup 2020-06-09 10:48:07 +03:00
eb7a026025 Backup: added autofac 2020-06-08 14:57:45 +03:00
SuhorukovAnton
af2295f98a Backup: fix 2020-06-08 13:40:26 +03:00
725955e851 ProgressQueue: fix 2020-06-08 12:44:01 +03:00
5fb753b528 Backup: fix start 2020-06-08 11:17:54 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
06a7e81a49 Files: feed. FoldersModule 2020-06-04 19:36:43 +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
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
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
1c25d16fc2 Products: added absolute path support 2020-06-04 14:01:25 +03:00
87af491e89 Feed: FilesModule 2020-06-04 13:54:13 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
84a3c67e1e Merge branch 'master' into feature/feed 2020-06-04 11:53:00 +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
d6274ea3e0 Added Feed.Aggregator 2020-06-03 17:53:58 +03:00
d3ebdb2766 Feed: rename 2020-06-03 13:07:46 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +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
SuhorukovAnton
1796c682a4 Backup: add backup.json and BackupSettings.cs, fix BackupWorker 2020-06-01 13:33:39 +03:00
a81b21bcde Backup: DocumentsBackupStorage 2020-06-01 11:52:01 +03:00
0ff1f8249d Backup: refactoring 2020-05-29 17:50:39 +03:00
a4146fcce7 Backup: refactoring 2020-05-29 17:48:27 +03:00
3d9fd53369 Files: fix FFmpegService, fix download by chunks 2020-05-28 17:05:07 +03:00
SuhorukovAnton
65739dac46 Backup: fix Startup 2020-05-28 16:37:36 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +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
SuhorukovAnton
e4881214a4 Backup: fix SQL 2020-05-26 11:52:47 +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
SuhorukovAnton
6acb0d4208 creating 2020-05-20 18:14:44 +03:00
85cec8fff2 ApiSystem: fix autofac 2020-05-20 16:06:35 +03:00