Commit Graph

7485 Commits

Author SHA1 Message Date
Vincent Serpoul 339b889ac4 spelling (#3839) 2016-12-14 15:15:19 +01:00
Tomasz Drwięga 366f9a8cd7 Fixing tests 2016-12-14 14:44:09 +01:00
Tomasz Drwięga 1d80725f66 Merge branch 'master' into cli-rpc 2016-12-14 14:12:27 +01:00
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
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
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
Robert Habermeier 0b69e41bd1 Merge pull request #3831 from ethcore/rpc-macros
Using jsonrpc-macros
2016-12-13 17:16:29 +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
arkpar 5fd2e15313 Style and docs 2016-12-12 23:21:44 +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
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
arkpar 6601fde328 New data paths with upgrade 2016-12-12 16:51:07 +01:00
GitLab Build Bot d2a34acdfd [ci skip] js-precompiled 20161212-143454 2016-12-12 14:37:25 +00:00
Gav Wood 3a16247655 Merge pull request #3823 from ethcore/jg-typedinput-tests
Fixed bool dropdown in contract execution
2016-12-12 15:28:58 +01:00
Jannis R b980e7a329
add skip button to first run modal 2016-12-12 14:32:55 +01:00
Jannis R 085adbaffd
make showFirstRun in localStorage a bool 2016-12-12 14:15:26 +01:00
keorn 8ed89bb74f propagate proposal to all peers 2016-12-12 13:00:51 +01:00
Jaco Greeff 3a7e30ec5c Fix issue with bool type dropdown 2016-12-12 12:49:40 +01:00
Jaco Greeff 563c8c75f9 Tests for DetailsStep (only bool dropdown) 2016-12-12 12:49:04 +01:00
Jaco Greeff c5c4e5e901 Updated 2016-12-12 12:48:43 +01:00
Jaco Greeff 29674a0e65 Small testability fixes 2016-12-12 12:48:32 +01:00
Jaco Greeff 23234fb1aa Allow operation in test mode 2016-12-12 12:48:16 +01:00
Jannis R c43944584d
fix import 2016-12-12 12:33:58 +01:00
Jannis R 723e9e55db
merge master into jr-email-verification 2016-12-12 12:21:06 +01:00
Jannis R d67a9388ff
merge master into jr-use-badge-reg 2016-12-12 12:13:49 +01:00
Jaco Greeff 28be8d6f6c Test for bool TypedInput 2016-12-12 10:55:20 +01:00
Jaco Greeff f9b5a056cf Merge branch 'master' into jg-typedinput-tests 2016-12-12 10:14:29 +01:00
Jaco Greeff 2c4c6ba4e4 Basic smoketest 2016-12-12 10:12:12 +01:00
GitLab Build Bot 1db4647327 [ci skip] js-precompiled 20161212-052342 2016-12-12 05:26:15 +00:00
GitLab Build Bot f1096619a5 [ci skip] js-precompiled 20161212-034026 2016-12-12 03:43:28 +00:00