Commits · 804af9658a89555d6b4069433676acdb6deb9742 · 张蕾 / Geth-Modification

24 Dec, 2014 5 commits
- merge · 804af965
  obscuren authored Dec 24, 2014
  
  804af965
- Merge branch 'hotfix/0.7.11' into develop · 9d429180
  obscuren authored Dec 24, 2014
  
  9d429180
- Bump · c9f963a7
  obscuren authored Dec 24, 2014
  
  c9f963a7
- Reset peer during download on disc · 7ba9fe4d
  obscuren authored Dec 24, 2014
  
  7ba9fe4d
- Removed the deferred reset · fb1edd05
  obscuren authored Dec 24, 2014
  
  fb1edd05
23 Dec, 2014 9 commits
- Switched to new trie · 780abaec
  obscuren authored Dec 23, 2014
  
  780abaec
- Enable websockets for mist. Closes #218 · f468a9a0
  obscuren authored Dec 23, 2014
  
  f468a9a0
- Moved import to utils · 1054c155
  obscuren authored Dec 23, 2014
  
  1054c155
- Close the file · 7d2353f2
  obscuren authored Dec 23, 2014
  
  7d2353f2
- Decode from stream directly · 34f72ddb
  obscuren authored Dec 23, 2014
  
  34f72ddb
- Delete current chain for reset · 1382e8d8
  obscuren authored Dec 23, 2014
  
  1382e8d8
- Updated Mist to use new blocks · e2e3fa3d
  obscuren authored Dec 23, 2014
  
  e2e3fa3d
- Chain importer · 9e5257b8
  obscuren authored Dec 23, 2014
  
  9e5257b8
- Refactored block & Transaction · 4cd79d8d
  obscuren authored Dec 23, 2014
```
* Includes new rlp decoder
```
  4cd79d8d
22 Dec, 2014 9 commits
- Removal of "debug" url :) · 4b52cd51
  obscuren authored Dec 22, 2014
  
  4b52cd51
- Concat and pad data · e32f7baa
  obscuren authored Dec 22, 2014
  
  e32f7baa
- Merge branch 'develop' into poc8 · 60b1f962
  obscuren authored Dec 22, 2014
  
  60b1f962
- Added whisper js api · 4051c033
  obscuren authored Dec 22, 2014
  
  4051c033
- updated ethereum.js · e4251775
  obscuren authored Dec 22, 2014
  
  e4251775
- moved · a153b47c
  obscuren authored Dec 22, 2014
  
  a153b47c
- Merge pull request #217 from ethereum/tests · e531c6fc
  Jeffrey Wilcke authored Dec 22, 2014
```
Updated code coverage support & cleanup
```
  e531c6fc
- Merge branch 'develop' into poc8 · ed7e05fb
  obscuren authored Dec 22, 2014
  
  ed7e05fb
- updated whisper ui · 8130df63
  obscuren authored Dec 22, 2014
  
  8130df63
21 Dec, 2014 15 commits
- Remove old file · 4fd4facf
  Taylor Gerring authored Dec 21, 2014
  
  4fd4facf
- Move goveralls call to script · 43bf3b4a
  Taylor Gerring authored Dec 21, 2014
  
  43bf3b4a
- Add coveralls coverage badge · 05da381c
  Taylor Gerring authored Dec 21, 2014
  
  05da381c
- Use repo default branches · 26bf9573
  Taylor Gerring authored Dec 21, 2014
  
  26bf9573
- Update travis go version to tip · 03dc6ec0
  Taylor Gerring authored Dec 21, 2014
  
  03dc6ec0
- inline dependency installation script · f7ec759e
  Taylor Gerring authored Dec 21, 2014
  
  f7ec759e
- Exclude VM tests · 7ddebd7a
  Taylor Gerring authored Dec 21, 2014
  
  7ddebd7a
- Merge branch 'tests' of github.com:ethereum/go-ethereum into tests · bab78bbe
  Taylor Gerring authored Dec 21, 2014
  
  bab78bbe
- Update cover command installation · 7a794282
  Taylor Gerring authored Dec 21, 2014
  
  7a794282
- Merge pull request #216 from ethereum/develop · 1360f027
  Taylor Gerring authored Dec 21, 2014
```
Update tests branch from develop
```
  1360f027
- remove temp coverage file · b3629c6f
  Taylor Gerring authored Dec 21, 2014
  
  b3629c6f
- Updated tool import paths · 176c98eb
  Taylor Gerring authored Dec 21, 2014
  
  176c98eb
- Merge branch 'develop' · 25d16f35
  obscuren authored Dec 21, 2014
  
  25d16f35
- Fixed EVM environment. Closes #215 · 795b1433
  obscuren authored Dec 21, 2014
  
  795b1433
- Updated QWhisper · 0e5aed63
  obscuren authored Dec 21, 2014
```
* changed api
* general whisper debug interface
```
  0e5aed63
20 Dec, 2014 2 commits
- Merge branch 'develop' into poc8 · 125bdc32
  obscuren authored Dec 20, 2014
```
Conflicts:
	cmd/ethereum/flags.go
```
  125bdc32
- Merge branch 'release/v0.7.10' into develop · 6cff6dd8
  obscuren authored Dec 20, 2014
  
  6cff6dd8