Commit Graph

7625 Commits

Author SHA1 Message Date
Tomasz Drwięga
7eb9112613 Merge branch 'master' into rotating-key
Conflicts:
	rpc/src/v1/traits/signer.rs
2016-12-14 14:10:44 +01:00
Jaco Greeff
d28ec2ff97 Make enode available on Status page 2016-12-14 13:41:29 +01:00
keorn
f686fa3d6f update specs and generic conversion 2016-12-14 12:50:32 +01:00
Jannis R
bbcae3d27b
merge master into jr-first-run 2016-12-14 12:28:55 +01:00
Jannis R
240bab230c
merge master into jr-use-badge-reg 2016-12-14 12:26:18 +01:00
keorn
8509a183ed deserialize new seal 2016-12-14 12:14:04 +01:00
keorn
ae98a56e8b revert submodule 2016-12-14 11:42:47 +01:00
keorn
e1d83d15b7 bump dev chain 2016-12-14 11:34:19 +01:00
arkpar
3280f071b1 Fixed moving dirs on windows 2016-12-14 01:33:57 +01:00
arkpar
be5fefe772 Merge branch 'master' of github.com:ethcore/parity into new-dirs 2016-12-14 00:04:11 +01:00
arkpar
6e3e1ea88b XDG paths 2016-12-13 23:38:29 +01:00
Gav Wood
d1653567d9
Add contract ABI auto-generatr.
o
2016-12-13 22:32:34 +01:00
Gav Wood
597c3a4770
Ensure chain state is at threshold security level before looking for updates. 2016-12-13 21:21:07 +01:00
Gav Wood
805b8cab2c
Add missing file. 2016-12-13 20:50:33 +01:00
Gav Wood
4424155d39
Similar checks on file changes to other tests. 2016-12-13 20:49:26 +01:00
Gav Wood
aaf6d59bda
Disable windows tests until it works. 2016-12-13 20:22:04 +01:00
Gav Wood
6a48e9d9e5
Print output for commands, don't info! 2016-12-13 20:20:10 +01:00
keorn
c96826beaa expect instead of index 2016-12-13 18:22:56 +01:00
GitLab Build Bot
1a9a142a69 [ci skip] js-precompiled 20161213-171715 2016-12-13 17:19:48 +00:00
Gav Wood
72b8ee84c7 Merge pull request #3766 from ethcore/jr-email-verification
email verification
2016-12-13 18:09:41 +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
Gav Wood
c6281fc1c7
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-13 17:26:09 +01:00
Gav Wood
575afd8bac
Merge branch 'check-updates' of github.com:ethcore/parity into check-updates 2016-12-13 17:25:16 +01:00
Gav Wood
e099e0d93c
Add auth code. 2016-12-13 17:23:48 +01:00
Robert Habermeier
0b69e41bd1 Merge pull request #3831 from ethcore/rpc-macros
Using jsonrpc-macros
2016-12-13 17:16:29 +01:00
Gav Wood
119f253be9
Fix windows test. 2016-12-13 17:14:18 +01:00
Gav Wood
362b201532
Don't run git unnecessarily. 2016-12-13 16:32:03 +01:00
Gav Wood
7e269fe3d3
GLitlab-CI script pushes build info. 2016-12-13 16:21:26 +01:00
Tomasz Drwięga
65d62ccf04 Altering the order [ci:skip] 2016-12-13 14:59:19 +01:00
Tomasz Drwięga
f47be50843 Using jsonrpc-macros 2016-12-13 14:40:35 +01:00
arkpar
49ae375605 Don't coneect peers on each sync 2016-12-13 13:23:10 +01:00
Tomasz Drwięga
5affefc763 Fixing CLI signer 2016-12-13 12:17:01 +01:00
GitLab Build Bot
1114ad3ca7 [ci skip] js-precompiled 20161213-051314 2016-12-13 05:15:44 +00:00
Jaco Greeff
51b544c2db Simplify icon exports 2016-12-12 23:53:29 +01:00
arkpar
5fd2e15313 Style and docs 2016-12-12 23:21:44 +01:00
Jaco Greeff
dbc6b42267 Lint fixes 2016-12-12 23:14:44 +01:00
Jaco Greeff
9931d7657a Merge remote-tracking branch 'origin/check-updates' into check-updates 2016-12-12 23:07:41 +01:00
Jaco Greeff
e170134d97 Merge branch 'master' into check-updates 2016-12-12 22:45:12 +01:00
Jaco Greeff
f15671c74b UI interface completed, to be tested 2016-12-12 22:45:09 +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
keorn
19adb84527 TestNet flushing and cleanup 2016-12-12 19:44:24 +01:00
Jaco Greeff
a8ae9b02f9 Typo 2016-12-12 18:58:31 +01:00
Jaco Greeff
a2a89f7e59 Basic UI structure in-place 2016-12-12 18:30:41 +01:00
Jaco Greeff
7a0fccf417 Add shared icons 2016-12-12 18:30:05 +01:00
Jaco Greeff
9a26caf548 Build settings 2016-12-12 18:29:45 +01:00
arkpar
85fd62917a Updated tests 2016-12-12 17:53:17 +01:00
keorn
722cd4d086 AuthorityRound fork test 2016-12-12 17:24:48 +01:00
keorn
f8ed5cf022 finalize unit tests 2016-12-12 17:20:20 +01:00
arkpar
edb853ca35 KillDB command 2016-12-12 17:19:41 +01:00