Commit Graph

499 Commits

Author SHA1 Message Date
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +03:00
dc93975a51 fixed check confirm method 2020-07-02 19:14:03 +03:00
c9a64ca377 Added NullIfDefault 2020-07-02 18:15:52 +03:00
314206639f Notify: fix 2020-06-29 19:15:18 +03:00
7950db51ff Notify: fix 2020-06-29 18:10:31 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
d7cb638a1e Backup: notify fix 2020-06-29 15:58:56 +03:00
3f97755c92 Backup: fix notify 2020-06-29 15:45:38 +03:00
4a848ea535 Backup: notify fix 2020-06-29 15:15:09 +03:00
SuhorukovAnton
e1f7b7365a api-defaultvalue: fix backup 2020-06-29 14:40:42 +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
b617257887 Notify: back rename 2020-06-28 14:08:12 +03:00
7cafc968eb Thumb: fix 2020-06-26 12:40:46 +03:00
237709f8f3 Thumb: fix 2020-06-26 10:53:52 +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
197f468bf7 Removed unused proto, added backup rewrite 2020-06-25 19:05:14 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +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
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
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
f4592ed73d Thumb: fix 2020-06-17 14:36:09 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
78593b8c1f UserManager: fix 2020-06-17 12:53:12 +03:00
ca9af1080c Backup: refactoring 2020-06-17 10:49:17 +03:00
b36dac0cb4 Backup: fix 2020-06-16 19:04:40 +03:00
b94e4fbeac Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-16 18:00:38 +03:00
b35a60cac0 Backup: added DeleteBackupRequest 2020-06-16 17:46:10 +03:00
dedd754875
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
2020-06-16 17:44:56 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
fc0826b60d Backup: service, progress 2020-06-16 14:34:44 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
09e7a81e9b UserManager: fix 2020-06-15 18:39:52 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
68575e5048 Backup: ajaxpro removed 2020-06-15 11:19:40 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +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
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
1a5a7dfab5 Merge branch 'master' into feature/feed 2020-06-05 11:46:12 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +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