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 |
|
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 |
|
Jaco Greeff
|
054a6a9daf
|
Merge branch 'master' into check-updates
# Conflicts:
# .gitlab-ci.yml
# js/webpack/dev.server.js
|
2016-12-15 13:52:28 +01:00 |
|
Gav Wood
|
be0d5ca516
|
Merge pull request #3827 from ethcore/jr-first-run
first run: skip account creation if they already have accounts
|
2016-12-15 13:52:01 +01:00 |
|
Jannis R
|
4c42dedcad
|
sort props 💄
|
2016-12-15 13:51:44 +01:00 |
|
Gav Wood
|
1ea521ea7d
|
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
|
2016-12-15 13:51:22 +01:00 |
|
Gav Wood
|
9440c2600f
|
Merge pull request #3857 from ethcore/tender-seal
Tendermint seal
|
2016-12-15 13:50:49 +01:00 |
|
Jannis R
|
f59f7c5773
|
address style grumbles 💄
|
2016-12-15 13:48:40 +01:00 |
|
keorn
|
0b9ab0797f
|
fix build
|
2016-12-15 13:45:22 +01:00 |
|
keorn
|
943efc21bb
|
add tendermint seal
|
2016-12-15 13:41:04 +01:00 |
|
Gav Wood
|
69eec105a7
|
Change default back to permissive for now.
|
2016-12-15 13:40:44 +01:00 |
|
Gav Wood
|
db73b0d66f
|
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
|
2016-12-15 13:28:37 +01:00 |
|
Jannis R
|
afba259506
|
merge master into jr-use-badge-reg
|
2016-12-15 13:25:35 +01:00 |
|
Gav Wood
|
a74bce2c06
|
Merge pull request #3759 from ethcore/auth-bft
Tendermint Engine
|
2016-12-15 13:18:15 +01:00 |
|
Gav Wood
|
1ebbb8ae3d
|
Merge pull request #3852 from ethcore/js-css-lint
Expand lint to catch css issues
|
2016-12-15 13:09:51 +01:00 |
|
Gav Wood
|
8fa00a20e6
|
Merge pull request #3851 from ethcore/js-inject-all
inject exports both partiy & web3
|
2016-12-15 13:09:29 +01:00 |
|
Gav Wood
|
0562d85a0e
|
Merge pull request #3848 from ethcore/ng-webpack-talkative
Let Webpack talk again
|
2016-12-15 13:09:06 +01:00 |
|
Gav Wood
|
a660024eac
|
Merge pull request #3843 from ethcore/auth-round-seal
AuthorityRound seal and simplify Generic seal Spec
|
2016-12-15 13:08:50 +01:00 |
|
Gav Wood
|
c4406c9198
|
Merge pull request #3691 from ethcore/rotating-key
Signing transactions with rotating token
|
2016-12-15 13:08:19 +01:00 |
|
Robert Habermeier
|
5d8bfd8758
|
handle responses for round scaffold and frames
|
2016-12-15 13:05:38 +01:00 |
|
arkpar
|
6d41168bbe
|
Change build order
|
2016-12-15 12:07:09 +01:00 |
|
Tomasz Drwięga
|
c6912c8e0a
|
Removing on_done
|
2016-12-15 11:43:36 +01:00 |
|
Jaco Greeff
|
701399fc77
|
Don't log auth token
|
2016-12-15 10:23:01 +01:00 |
|