Commit Graph

7667 Commits

Author SHA1 Message Date
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
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
Jaco Greeff
88a26ec53f Support lint:cached 2016-12-15 10:08:57 +01:00
Jaco Greeff
9fc3c47bcb inject exports both partiy & web3 2016-12-15 10:05:52 +01:00
Denis S. Soldatov aka General-Beck
03db4d0373 Update gitlab-ci
add `cargo clean` in darwin build
2016-12-15 14:15:27 +07:00
Nicolas Gotchac
15050da1cd Let Webpack talk again 2016-12-15 00:07:49 +01:00
Gav Wood
bf7fb84937
Don't put sha3s. 2016-12-14 21:59:00 +01:00
Robert Habermeier
2966b88a7a Merge pull request #3835 from ethcore/bump-dev
Bump dev chain
2016-12-14 21:37:14 +01:00
Denis S. Soldatov aka General-Beck
245c8581bb Update .gitlab-ci.yml 2016-12-15 02:17:59 +07:00
Denis S. Soldatov aka General-Beck
244761782e Update gitlab-ci
Remove armv6 from `nightly`
remove `-j 8` key from windows builds
Remove `test-windows` from `nightly`
2016-12-15 02:14:15 +07:00
Tomasz Drwięga
d2b9bc5bd8 Traces to AutoArgs 2016-12-14 20:09:14 +01:00
Tomasz Drwięga
6e51b23e30 Adding traces tests 2016-12-14 20:07:33 +01:00
Jaco Greeff
3df092f29d Add lint:css 2016-12-14 16:42:26 +01:00
Jaco Greeff
7330612bfb Toggle upgrade modal via upgrade link 2016-12-14 15:56:01 +01:00
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
Jaco Greeff
2588aea6b2 Merge branch 'master' into check-updates 2016-12-14 14:37:38 +01:00
Jaco Greeff
a8f428ccca Display capability status on statusbar 2016-12-14 14:37:25 +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
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