Commit Graph

8978 Commits

Author SHA1 Message Date
arkpar
450a9d2867 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-15 19:41:19 +01:00
Nicolas Gotchac
1d04f25a0a Add error toString 2016-12-15 19:35:16 +01:00
arkpar
3ac0794d28 Bump jsonrpc-core for rpc_cli 2016-12-15 19:31:26 +01:00
keorn
b88d50dc9b fix naming collision 2016-12-15 19:27:06 +01:00
Robert Habermeier
72f7391551 add BasicContext trait for handler ticking 2016-12-15 19:25:52 +01:00
Gav Wood
801596395e
--release-track. 2016-12-15 19:23:25 +01:00
Gav Wood
995fafebee
Fix last remaining test. 2016-12-15 19:19:50 +01:00
Gav Wood
d737de0fc0
Fix tests. 2016-12-15 19:17:44 +01:00
arkpar
f8961484c1 Merge branch 'master' of github.com:ethcore/parity into tx-block 2016-12-15 19:10:33 +01:00
Nicolas Gotchac
5983a0c1a5 Linting fixes 2016-12-15 19:07:13 +01:00
Nicolas Gotchac
365ab60fed Use ServiceWorker for Contract compilation 2016-12-15 19:06:05 +01:00
Gav Wood
4a2b418fc2
Configurable update tracks to help testing. 2016-12-15 18:51:59 +01:00
Robert Habermeier
5346539ef8 minimal header import and client service 2016-12-15 18:47:26 +01:00
Tomasz Drwięga
99e42db2f5 Merge branch 'master' into fetcher-ref 2016-12-15 18:33:58 +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
arkpar
2952ea1b85 Delayed transactions 2016-12-15 18:19:19 +01:00
Jannis Redmann
5939575c87 Merge #3863 from ethcore/jg-contract-subid
Store subscriptionId, align with main subscription model
2016-12-15 18:14:33 +01:00
Jannis R
7fdcc70825
Merge jg-contract-subid into jr-fix-verification 2016-12-15 18:12:45 +01:00
Jaco Greeff
1f1dc8b89d Store subscriptionId, use it to send changes 2016-12-15 18:09:59 +01:00
Jannis R
0e963da27b
fix verification stores 🐛 2016-12-15 18:09:52 +01:00
Gav Wood
4d6b4d9d72 Merge pull request #3792 from ethcore/dapps-accounts-rpc
Additional RPCs for dapps accounts management
2016-12-15 18:09:40 +01:00
Jaco Greeff
2be5247567 Merge branch 'master' into jg-contract-subid 2016-12-15 18:06:45 +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
Jannis Redmann
29457c11ef Merge #3862 from ethcore/jg-fix-contracts-send
Fix typo in method call (broken contract interface)
2016-12-15 17:54:42 +01:00
Jaco Greeff
17781a5ac4 Fix typo in method call 2016-12-15 17:52:28 +01:00
Robert Habermeier
f776f48023 drain prepared headers from sync round 2016-12-15 17:33:25 +01:00
Gav Wood
943f58487c
Merge remote-tracking branch 'origin/master' into cli-rpc 2016-12-15 17:13:51 +01:00
Gav Wood
d455ac4a40
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 17:12:18 +01:00
Gav Wood
db2e1dd01a
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 17:11:22 +01:00
Gav Wood
2e02db2d3e Merge pull request #3860 from ethcore/fix-channel
Fix flaky test
2016-12-15 17:10:41 +01:00
keorn
ee653bc262 unused import 2016-12-15 16:53:28 +01:00
keorn
9bfa69c6bd fix channel 2016-12-15 16:52:39 +01:00
Robert Habermeier
71e96aca10 handle abandoned requests 2016-12-15 16:19:28 +01:00
Tomasz Drwięga
2be6223eb3 Updating submodules to latest 2016-12-15 15:57:21 +01:00
Jaco Greeff
9dd1268b69 Add keys for steps (future-proof) 2016-12-15 15:56:58 +01:00
Robert Habermeier
ec88a992e3 provide response context to response handler 2016-12-15 15:50:36 +01:00
Tomasz Drwięga
b85f7b7433 Merge branch 'master' into fetcher-ref 2016-12-15 15:44:14 +01:00
Gav Wood
5e59e0b9d3
Fix build. 2016-12-15 15:35:46 +01:00
Tomasz Drwięga
dedf9d6dce Getting rid of redirection 2016-12-15 15:32:53 +01:00
Gav Wood
817a58cf64 Merge pull request #3844 from ethcore/trace-macros
Converting traces API to AutoArgs
2016-12-15 15:21:35 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +01:00
Gav Wood
d1040e4127 Whitespace 2016-12-15 15:03:34 +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
d76239ed48 Merge pull request #3768 from ethcore/jr-use-badge-reg
get certifications from BadgeReg, show them in accounts overview
2016-12-15 14:43:05 +01:00