Commit Graph

160 Commits

Author SHA1 Message Date
72426588c5 Backup: configure 2020-08-06 22:53:50 +03:00
0b31269c8e Backup: removed BackupServiceNotifier 2020-08-06 22:20:37 +03:00
ffc756f32b Backup: DistributedTaskQueue 2020-08-06 21:07:27 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +03:00
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
4681fb0f78 fix 2020-07-16 16:02:21 +03:00
SuhorukovAnton
83a88d0240 Merge branch 'master' into feature/ASC.Files.Core 2020-07-15 17:38:40 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
SuhorukovAnton
5bf0bd22b6 ASC.Files.Core: first version 2020-07-14 13:03:53 +03:00
dfd8bbfdb8 Merge branch 'master' into feature/api-defaultvalue 2020-07-13 15:28:11 +03:00
cd3240a7f6 Removed LimitedConcurrencyLevelTaskScheduler 2020-07-13 14:11:36 +03:00
feba6bb1c0 ApiSystem: System.Text.Json 2020-07-09 11:08:42 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +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
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
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
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
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
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00