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
|
a74bce2c06
|
Merge pull request #3759 from ethcore/auth-bft
Tendermint Engine
|
2016-12-15 13:18:15 +01:00 |
|
Vincent Serpoul
|
339b889ac4
|
spelling (#3839)
|
2016-12-14 15:15:19 +01:00 |
|
Jaco Greeff
|
2588aea6b2
|
Merge branch 'master' into check-updates
|
2016-12-14 14:37:38 +01:00 |
|
Gav Wood
|
6a48e9d9e5
|
Print output for commands, don't info!
|
2016-12-13 20:20:10 +01:00 |
|
Gav Wood
|
80d6e49070
|
Merge pull request #3812 from ethereumproject/splix/classic-replay-protection
Network configuration for Ethereum Classic
|
2016-12-13 17:39:33 +01:00 |
|
keorn
|
fa504e510f
|
Merge branch 'master' into auth-bft
|
2016-12-12 21:28:46 +01:00 |
|
Igor Artamonov
|
e61d14d7f7
|
reuse Morden for Classic Testnet
|
2016-12-12 19:50:32 +00:00 |
|
Gav Wood
|
758744449f
|
Expose all other RPCs.
|
2016-12-12 02:57:19 +01:00 |
|
Gav Wood
|
d81d9d77b2
|
Wire-in Updater to parity RPC
|
2016-12-11 23:15:52 +01:00 |
|
Gav Wood
|
58b72c521d
|
Rename ethcore -> parity in licenses.
|
2016-12-11 19:31:31 +01:00 |
|
Gav Wood
|
17cc2be4b5
|
Rename ethcore -> parity in license.
|
2016-12-11 19:30:54 +01:00 |
|
Gav Wood
|
10b0898bdf
|
Crate tidyups.
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
|
2016-12-11 19:14:42 +01:00 |
|
Gav Wood
|
22cb5753d0
|
Improve capability information and disable old clients.
|
2016-12-11 16:52:41 +01:00 |
|
Gav Wood
|
74a6203f72
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-11 15:43:28 +01:00 |
|
Gav Wood
|
0e17cf8d3a
|
Fix tests.
|
2016-12-11 15:41:49 +01:00 |
|
Igor Artamonov
|
aed633d7df
|
Testnet for Ethereum Classic
|
2016-12-11 19:25:02 +06:00 |
|
Gav Wood
|
8d7a63bbea
|
Join up the final dots.
|
2016-12-11 13:10:33 +01:00 |
|
arkpar
|
a56443aa6c
|
Tolerate error is user_defaults
|
2016-12-11 13:00:49 +01:00 |
|
arkpar
|
c777362d02
|
Sync channel for consensus test
|
2016-12-11 12:32:01 +01:00 |
|
Gav Wood
|
d9f6ea56ef
|
Don't restart if we're not in the cradle.
|
2016-12-11 04:05:02 +01:00 |
|
Gav Wood
|
2865cbaf70
|
Use file contents instead of symlink.
|
2016-12-11 03:33:10 +01:00 |
|
Gav Wood
|
7a1539cfb5
|
Fix deadlock.
|
2016-12-11 02:39:56 +01:00 |
|
Gav Wood
|
0302d582d2
|
Fix build.
|
2016-12-11 02:02:40 +01:00 |
|
Gav Wood
|
fa30dfd4b9
|
Refactor into system service, add exe redirect.
|
2016-12-10 23:58:39 +01:00 |
|
keorn
|
f3af0f46be
|
Merge branch 'master' into auth-bft
|
2016-12-10 18:14:35 +01:00 |
|
Gav Wood
|
316c25d9f8
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-10 14:08:41 +01:00 |
|
Gav Wood
|
82efa2675e
|
Merge remote-tracking branch 'origin/master' into consistent-id
|
2016-12-10 13:36:30 +01:00 |
|
keorn
|
e5f8044cad
|
Merge branch 'master' into auth-bft
|
2016-12-10 11:01:23 +01:00 |
|
Gav Wood
|
5f1fcf95e0
|
Make *ID names consistent with std Rust (Id)
|
2016-12-09 23:01:43 +01:00 |
|
Gav Wood
|
46af3d18da
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-09 20:45:15 +01:00 |
|
Gav Wood
|
c2b6be95c8
|
Fetch and place in updates path.
|
2016-12-09 19:02:42 +01:00 |
|
keorn
|
fb71caffbd
|
remove double registration
|
2016-12-09 11:05:44 +01:00 |
|
Robert Habermeier
|
eec1929658
|
Merge branch 'master' into lightserv
|
2016-12-09 01:29:46 +01:00 |
|
Robert Habermeier
|
6f5f1f5e26
|
light: integrate with sync + serve_light CLI
|
2016-12-08 23:21:47 +01:00 |
|
keorn
|
9ecb07434f
|
fix informant
|
2016-12-08 21:13:32 +01:00 |
|
Gav Wood
|
2d6656fc43
|
Merge pull request #3725 from ethcore/engine-password
Make engine hold AccountProvider
|
2016-12-08 20:52:12 +01:00 |
|
Gav Wood
|
8903384840
|
Merge branch 'master' into check-updates
|
2016-12-07 19:19:44 +01:00 |
|
keorn
|
aa9caac750
|
revert cli default
|
2016-12-07 15:36:20 +01:00 |
|
keorn
|
e9743a3a75
|
Merge branch 'master' into auth-bft
|
2016-12-07 14:50:17 +01:00 |
|
keorn
|
5c333fce31
|
Merge branch 'engine-password' into auth-bft
|
2016-12-07 10:35:52 +01:00 |
|
keorn
|
71a96588b0
|
add the methods to engines
|
2016-12-07 10:34:06 +01:00 |
|
Robert Habermeier
|
398b94e6e2
|
Merge branch 'master' into opt-in-verifier-scaling
|
2016-12-06 15:37:10 +01:00 |
|
keorn
|
8f641e67f3
|
Merge branch 'engine-password' into auth-bft
|
2016-12-06 13:13:02 +00:00 |
|
keorn
|
b089aa7a6b
|
fix password loading
|
2016-12-06 08:38:41 +00:00 |
|
keorn
|
0a2ec319ac
|
rename to engine_signer
|
2016-12-05 21:31:38 +00:00 |
|
keorn
|
5e7c21ad4a
|
add a cli flag
|
2016-12-05 19:23:03 +00:00 |
|
keorn
|
81a756394a
|
Merge branch 'master' into engine-password
|
2016-12-05 17:08:57 +00:00 |
|
keorn
|
529a7fc33c
|
add password and AccountProvider
|
2016-12-05 17:08:16 +00:00 |
|
keorn
|
6fc943ca6d
|
Merge branch 'master' into auth-bft
|
2016-12-05 16:37:35 +00:00 |
|