Commit Graph

2999 Commits

Author SHA1 Message Date
obscuren
558c67d392 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-02-11 20:22:19 +01:00
Jeffrey Wilcke
d73dff4d5b Merge pull request #303 from fjl/rlp-flat
rlp: add Flat
2015-02-11 20:22:04 +01:00
Felix Lange
b94f85de22 rlp: add Flat 2015-02-11 19:28:56 +01:00
obscuren
1fc3524e40 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-02-11 19:22:38 +01:00
Jeffrey Wilcke
ebc506dae8 Merge pull request #302 from alexvandesande/UI
Catalog Page Behaviour
2015-02-11 19:22:23 +01:00
Alexandre Van de Sande
6221b282d4 Catalog Page Behaviour 2015-02-11 19:16:35 +01:00
Taylor Gerring
d311b1b9b7 Merge pull request #301 from ethereum/travis
Updates to Travis config
2015-02-11 14:25:44 +01:00
Taylor Gerring
3c40eb9e5a Temporarily skip broken TestVerifyPoW 2015-02-11 13:47:03 +01:00
obscuren
df49c609a0 updated coin 2015-02-11 13:26:44 +01:00
Taylor Gerring
ef6c7bd726 Merge pull request #300 from tgerring/jsonrpc
Allow RPC ID to be string or null
2015-02-11 11:59:51 +01:00
Taylor Gerring
d613bf69bf #295 Allow RPC ID to be string 2015-02-11 11:56:29 +01:00
Taylor Gerring
cfddb7f3cd Merge branch 'develop' into jsonrpc
Conflicts:
	rpc/ws/server.go
2015-02-11 11:40:12 +01:00
Taylor Gerring
c6af5f0a27 No longer switch branches for go-qml dep 2015-02-11 11:30:36 +01:00
Taylor Gerring
e433525f51 Merge branch 'sveneh-origin_develop' into develop 2015-02-11 11:28:39 +01:00
Taylor Gerring
ab66a3d0d3 Merge branch 'origin_develop' of https://github.com/sveneh/go-ethereum into sveneh-origin_develop 2015-02-11 11:03:40 +01:00
Jeffrey Wilcke
5fe2916ee1 Merge pull request #298 from alexvandesande/UI
UI changes to Mist
2015-02-10 17:21:29 +01:00
Felix Lange
acc667fbef Merge pull request #296 from frewsxcv/patch-1
Fix broken link in README
2015-02-10 16:41:32 +01:00
Alexandre Van de Sande
80890cd9dd removed icomoon 2015-02-10 16:16:17 +01:00
Alexandre Van de Sande
6b5f4ed244 Recreated the changes on a new branch 2015-02-10 16:14:07 +01:00
obscuren
ddccea75e8 Fixed "to" field 2015-02-10 13:20:06 +01:00
sveneh
70e2df3904 Dockerfile creation speed-up by not running go tests, added a workaround
so that docker's cache is invalidated whenever th git repo is updated.
2015-02-09 16:27:49 +01:00
obscuren
58ba290a9f moved manager 2015-02-09 00:08:28 +01:00
obscuren
16a04e64f2 Updated coin 2015-02-07 17:04:19 +01:00
obscuren
c8147fb7b9 Compare regardless of length 2015-02-07 17:04:04 +01:00
obscuren
0fa6927171 Moved log message to detail output 2015-02-07 17:03:33 +01:00
obscuren
99ebb869bf Fixed iterator 2015-02-07 17:03:22 +01:00
obscuren
44eafb15e0 Renamed filter 2015-02-07 17:03:12 +01:00
Corey Farwell
792cd0aa10 Fix broken link in README 2015-02-06 22:36:22 -05:00
Taylor Gerring
e4bb419707 Add go check to prefetched test dependencies 2015-02-05 18:11:31 -06:00
Taylor Gerring
5e0b2b260c Updated go list command 2015-02-05 17:49:44 -06:00
Taylor Gerring
b58b6b9bac Use after_success build step 2015-02-05 17:23:22 -06:00
Taylor Gerring
f3ac378ca4 No long use v1 branch of qml repo 2015-02-05 17:13:51 -06:00
obscuren
e40c1c62ce API changed to use Pubkey only. Reflected that change in the rest of the api 2015-02-05 15:00:59 -08:00
obscuren
6b5f25802e Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-02-05 14:42:22 -08:00
obscuren
f8c1eb157d Undone fix. Will re-enable once chain resets 2015-02-05 14:42:12 -08:00
Taylor Gerring
59665ade85 Pin Travis go version to 1.4.1 2015-02-05 16:27:54 -06:00
Taylor Gerring
c1f6e259a9 Only submit on coverage report success 2015-02-05 16:04:42 -06:00
Taylor Gerring
03b89ab712 Only download missing deps, not build 2015-02-05 16:03:29 -06:00
Taylor Gerring
ae3e9d4881 Don't reference by $GOROOT 2015-02-05 16:02:15 -06:00
obscuren
cad53fa191 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
	README.md
2015-02-05 12:36:30 -08:00
obscuren
0e682d936d Updated readme 2015-02-05 12:35:46 -08:00
obscuren
cec30e23b2 Updated readme 2015-02-05 12:34:47 -08:00
Jeffrey Wilcke
47129428fe Merge pull request #290 from Gustav-Simonsson/correct_block_parent_timestamp_check
Correct block parent timestamp check and typos
2015-02-05 12:23:56 -08:00
obscuren
2f30a27b2b Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2015-02-05 12:22:44 -08:00
obscuren
8be1d134aa updated home 2015-02-05 12:22:35 -08:00
obscuren
7e0799ff21 Merge commit '9d84609b3faf797f4a611587abdda3d6b3b07917' into develop 2015-02-05 12:07:36 -08:00
Marek Kotewicz
9d84609b3f Merge branch 'master' of https://github.com/ethereum/ethereum.js 2015-02-05 21:06:50 +01:00
obscuren
c64852dbcc pending / chain event 2015-02-05 11:55:03 -08:00
obscuren
bcacaaa4f4 Merge branch 'tgerring-develop' into develop 2015-02-05 11:44:45 -08:00
obscuren
d00e2731e5 Merge branch 'develop' of https://github.com/tgerring/go-ethereum into tgerring-develop
Conflicts:
	rpc/http/server.go
2015-02-05 11:44:30 -08:00