Commit Graph

787 Commits

Author SHA1 Message Date
Robert Habermeier
d0194f3ad3 Merge branch 'master' into lightsync 2016-12-23 13:39:06 +01:00
GitLab Build Bot
4623f45686 [ci skip] js-precompiled 20161223-041415 2016-12-23 04:17:11 +00:00
GitLab Build Bot
9a013c4f47 [ci skip] js-precompiled 20161222-173736 2016-12-22 17:40:57 +00:00
Tomasz Drwięga
f0387c33c6 Global Fetch Service (#3915)
* Dapps web

Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs

* Rewriting fetch

* Parity-wide fetch service

* Obey the limits and support cancellation.

* Removing temporary files.

* Actually use Fetch for dapps

* Re-implementing file fetching to avoid temporary files.

* Serde to 0.8.19

* Fixing content & dapps fetch
2016-12-22 18:26:39 +01:00
GitLab Build Bot
1645419bc8 [ci skip] js-precompiled 20161222-164848 2016-12-22 16:51:32 +00:00
GitLab Build Bot
7dd988860f [ci skip] js-precompiled 20161222-162822 2016-12-22 16:31:24 +00:00
GitLab Build Bot
25f1c1dcc9 [ci skip] js-precompiled 20161222-153857 2016-12-22 15:42:00 +00:00
GitLab Build Bot
a13135de30 [ci skip] js-precompiled 20161222-043246 2016-12-22 04:35:36 +00:00
GitLab Build Bot
8114d50b47 [ci skip] js-precompiled 20161221-183632 2016-12-21 18:39:21 +00:00
GitLab Build Bot
5ea70b1fd3 [ci skip] js-precompiled 20161221-141855 2016-12-21 14:22:59 +00:00
Robert Habermeier
01b494ca2c Merge branch 'master' into lightsync 2016-12-21 13:42:07 +01:00
GitLab Build Bot
5bccd13111 [ci skip] js-precompiled 20161220-164120 2016-12-20 16:44:23 +00:00
Tomasz Drwięga
9a5bb9470b Ignore dapps_policy.json (#3919)
* Ignore dapps_policy.json

* Produce warning for non-ignored files
2016-12-20 16:34:53 +01:00
GitLab Build Bot
269338d9bf [ci skip] js-precompiled 20161220-130157 2016-12-20 13:04:47 +00:00
GitLab Build Bot
ee050d4fd8 [ci skip] js-precompiled 20161220-111754 2016-12-20 11:20:41 +00:00
Robert Habermeier
70d53dcfd6 Merge branch 'master' into lightsync 2016-12-19 18:53:52 +01:00
GitLab Build Bot
776a45af87 [ci skip] js-precompiled 20161219-132051 2016-12-19 13:25:03 +00:00
GitLab Build Bot
65f2d2b050 [ci skip] js-precompiled 20161219-122700 2016-12-19 12:30:05 +00:00
Robert Habermeier
a48435ca60 Merge branch 'master' into lightsync 2016-12-19 13:15:37 +01:00
Gav Wood
b418cb8da3
Merge remote-tracking branch 'origin/master' into fix-win-ci 2016-12-17 15:10:17 +01:00
Gav Wood
b2b3a0eb34
Final fixups for updater
- Wire up platforms to match those of CI.
- Introduce "final" feature to tag version with "nightly".
2016-12-17 14:36:30 +01:00
Robert Habermeier
f85313fbff Merge branch 'master' into lightsync 2016-12-16 15:29:11 +01:00
arkpar
6c9de9e6f8 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-16 13:36:07 +01:00
GitLab Build Bot
3450538208 [ci skip] js-precompiled 20161216-121923 2016-12-16 12:22:56 +00:00
Gav Wood
6e5a583cb4 Merge pull request #3505 from ethcore/check-updates
Auto-updating
2016-12-16 13:01:49 +01:00
Gav Wood
35b18485d4
Don't check for updates while syncing. 2016-12-16 10:14:44 +01:00
Robert Habermeier
a1f32de2d9 Merge branch 'master' into lightsync 2016-12-15 23:55:04 +01:00
Gav Wood
ca0d87da10
125 -> 69. 2016-12-15 22:05:54 +01:00
GitLab Build Bot
3e83aeeb17 [ci skip] js-precompiled 20161215-201838 2016-12-15 20:21:20 +00:00
Gav Wood
5bab14e0c0
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 21:15:25 +01:00
arkpar
450a9d2867 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-15 19:41:19 +01:00
arkpar
3ac0794d28 Bump jsonrpc-core for rpc_cli 2016-12-15 19:31:26 +01:00
arkpar
f8961484c1 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-15 19:10:33 +01:00
Gav Wood
4a2b418fc2
Configurable update tracks to help testing. 2016-12-15 18:51:59 +01:00
Gav Wood
fa319ff64c
Remove duplicate line. 2016-12-15 18:24:18 +01:00
GitLab Build Bot
867fdb9eac [ci skip] js-precompiled 20161215-172100 2016-12-15 17:23:53 +00:00
Gav Wood
c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
Gav Wood
eb90d70be1 Merge pull request #3830 from ethcore/cli-rpc
Add Ws Json rpc client and command line utils (take 2)
2016-12-15 18:04:35 +01:00
GitLab Build Bot
87f1486907 [ci skip] js-precompiled 20161215-170041 2016-12-15 17:03:27 +00:00
Gav Wood
943f58487c
Merge remote-tracking branch 'origin/master' into cli-rpc 2016-12-15 17:13:51 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +01:00
Gav Wood
8f5e0cf7d9
Fix build 2016-12-15 14:54:02 +01:00
GitLab Build Bot
7e76d6494c [ci skip] js-precompiled 20161215-134858 2016-12-15 13:52:59 +00:00
Gav Wood
ca63bc2f44 Update parking_lot dep 2016-12-15 14:46:31 +01:00
Gav Wood
0da564a4c2 Merge branch 'master' into cli-rpc 2016-12-15 14:45:15 +01:00
Gav Wood
20b2f84d48 Merge pull request #3828 from ethcore/new-dirs
New directory structure
2016-12-15 14:34:01 +01:00
GitLab Build Bot
6dfcbd4156 [ci skip] js-precompiled 20161215-130206 2016-12-15 13:06:03 +00:00
Tomasz Drwięga
366f9a8cd7 Fixing tests 2016-12-14 14:44:09 +01:00
Jaco Greeff
2588aea6b2 Merge branch 'master' into check-updates 2016-12-14 14:37:38 +01:00
Tomasz Drwięga
1d80725f66 Merge branch 'master' into cli-rpc 2016-12-14 14:12:27 +01:00