Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							cbd5fe7c07 
							
						 
					 
					
						
						
							
							Update with -X only for merge ( #3745 )  
						
						
						
					 
					
						2016-12-08 14:48:09 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							3e8ee9d423 
							
						 
					 
					
						
						
							
							light IPC feature and mock state proofs  
						
						
						
					 
					
						2016-12-08 13:44:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a5b5277a88 
							
						 
					 
					
						
						
							
							Expanded basic tests for  #2289  
						
						
						
					 
					
						2016-12-08 13:00:29 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							543428fe5d 
							
						 
					 
					
						
						
							
							NODE_ENV=test for all tests  
						
						
						
					 
					
						2016-12-08 12:59:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							699a821775 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-test-ui  
						
						
						
					 
					
						2016-12-08 12:45:40 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							de4715bc67 
							
						 
					 
					
						
						
							
							Merge pull request  #3732  from ethcore/jg-duplicate-accounts  
						
						... 
						
						
						
						Give accounts precedence over address_book entries 
						
					 
					
						2016-12-08 12:27:26 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							b3f7c00780 
							
						 
					 
					
						
						
							
							ui/Container tests as per  #2289  
						
						
						
					 
					
						2016-12-08 12:22:40 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8d16f73795 
							
						 
					 
					
						
						
							
							first few LES tests, fix get_header logic bug  
						
						
						
					 
					
						2016-12-08 12:20:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							ad8a191e95 
							
						 
					 
					
						
						
							
							Adjust specs to show location  
						
						
						
					 
					
						2016-12-08 12:19:03 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							88e5ed9ea5 
							
						 
					 
					
						
						
							
							Allow mocha to use webpack aliasses via babel  
						
						
						
					 
					
						2016-12-08 12:18:43 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3ebfa1481d 
							
						 
					 
					
						
						
							
							better proposal block handling  
						
						
						
					 
					
						2016-12-08 12:03:34 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							15ec63750e 
							
						 
					 
					
						
						
							
							Enable Panic=abort ( #3423 )  
						
						... 
						
						
						
						* Enable panic=abort
* Update remaining crate versions to 1.5
* Run tests in release mode
* Enable panic=abort for release profile only
* Added travis_wait
* Travis timeout set to 40 
						
					 
					
						2016-12-08 11:31:57 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							5f1021822d 
							
						 
					 
					
						
						
							
							Cleanups on js-precompiled ( #3738 )  
						
						... 
						
						
						
						* Cleanups on js-precompiled
* Combined
* Adjust based on Pr comments 
						
					 
					
						2016-12-07 21:38:28 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8903384840 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						
						
					 
					
						2016-12-07 19:19:44 +01:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							9e8d90b5ba 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20161207-173717  
						
						
						
					 
					
						2016-12-07 17:39:18 +00:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							342357302b 
							
						 
					 
					
						
						
							
							Merge pull request  #3735  from ethcore/jg-addressbook-delete  
						
						... 
						
						
						
						Add parity_removeAddress RPC 
						
					 
					
						2016-12-07 18:31:22 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							dba8cf3a3b 
							
						 
					 
					
						
						
							
							Add test for RPC side  
						
						
						
					 
					
						2016-12-07 17:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							2d1a3ff091 
							
						 
					 
					
						
						
							
							les: generalize network and event contexts with traits  
						
						
						
					 
					
						2016-12-07 17:52:10 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7c054d2da0 
							
						 
					 
					
						
						
							
							Remove unneeded block scope  
						
						
						
					 
					
						2016-12-07 17:07:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							46840d36c9 
							
						 
					 
					
						
						
							
							Add parity_removeAddress RPC  
						
						
						
					 
					
						2016-12-07 16:53:46 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							347634ac6c 
							
						 
					 
					
						
						
							
							dont rebroadcast propose  
						
						
						
					 
					
						2016-12-07 16:42:58 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							aa9caac750 
							
						 
					 
					
						
						
							
							revert cli default  
						
						
						
					 
					
						2016-12-07 15:36:20 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							10d75b6de0 
							
						 
					 
					
						
						
							
							light: implement all response handlers  
						
						
						
					 
					
						2016-12-07 15:27:04 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b73689f041 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 15:17:49 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							727ace0561 
							
						 
					 
					
						
						
							
							add test  
						
						
						
					 
					
						2016-12-07 15:14:21 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							e9743a3a75 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-07 14:50:17 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							4361cb53e7 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 14:49:42 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							5faa4a85cb 
							
						 
					 
					
						
						
							
							remove dummy type  
						
						
						
					 
					
						2016-12-07 14:49:07 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							6440ca2f68 
							
						 
					 
					
						
						
							
							move stuff around  
						
						
						
					 
					
						2016-12-07 14:39:37 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							1f0a02b638 
							
						 
					 
					
						
						
							
							Merge pull request  #3633  from ethcore/fix-tx-rpc  
						
						... 
						
						
						
						Fix up the transaction JSON serialisation for RPC. 
						
					 
					
						2016-12-07 14:34:51 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc758368a 
							
						 
					 
					
						
						
							
							les: flesh out event handler  
						
						
						
					 
					
						2016-12-07 13:52:45 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							89726356a3 
							
						 
					 
					
						
						
							
							Merge pull request  #3709  from ethcore/opt-in-verifier-scaling  
						
						... 
						
						
						
						queue: CLI for auto-scaling and num verifiers 
						
					 
					
						2016-12-07 13:40:42 +01:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							3388eab76a 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20161207-123833  
						
						
						
					 
					
						2016-12-07 12:40:35 +00:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							2e40a00768 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20161207-122336  
						
						
						
					 
					
						2016-12-07 12:26:14 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							8dbd56888d 
							
						 
					 
					
						
						
							
							Add functionalities to multi-sig wallet ( #3729 )  
						
						... 
						
						
						
						* WIP Sending tokens in multi-sig wallet
* Working Token transfer for multi-sig wallet #3282 
* Add operation hash to transfer modal
* Add existing wallet from address #3282 
* Wallet delete redirect to Wallets/Accounts #3282 
* Rightly check balance in Transfer // Get all accounts balances #3282 
* Fix linting
* Better Header UI for Wallet
* Use the `~` webpack alias
* Use Webpack `~` alias 
						
					 
					
						2016-12-07 12:47:44 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							5bdb6e4f22 
							
						 
					 
					
						
						
							
							Ignore meta.deleted for account name display  
						
						
						
					 
					
						2016-12-07 11:51:48 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f7586109df 
							
						 
					 
					
						
						
							
							Ignore meta.deleted for accounts  
						
						
						
					 
					
						2016-12-07 11:48:08 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							21a3cf7b65 
							
						 
					 
					
						
						
							
							Swap order of addressbook & acocunts merge  
						
						
						
					 
					
						2016-12-07 11:44:45 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							c582540746 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 11:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3ae09de019 
							
						 
					 
					
						
						
							
							restore is_new_best  
						
						
						
					 
					
						2016-12-07 11:40:46 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a296c5e226 
							
						 
					 
					
						
						
							
							test client message handling  
						
						
						
					 
					
						2016-12-07 11:38:09 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							b38d95328d 
							
						 
					 
					
						
						
							
							light: conditional compilation  
						
						
						
					 
					
						2016-12-07 10:50:24 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							be90245ecb 
							
						 
					 
					
						
						
							
							PropTypes as function call ( #3731 )  
						
						
						
					 
					
						2016-12-07 10:46:46 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							da030fed51 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-07 10:41:07 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							5c333fce31 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 10:35:52 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							71a96588b0 
							
						 
					 
					
						
						
							
							add the methods to engines  
						
						
						
					 
					
						2016-12-07 10:34:06 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							e2bb8ef6d1 
							
						 
					 
					
						
						
							
							Unify proptypes in util/proptypes.js ( #3728 )  
						
						... 
						
						
						
						* Unify proptypes in util/proptypes.js
* Add missing use of nodeOrStringProptype 
						
					 
					
						2016-12-07 10:25:57 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							d9eb5e7f1d 
							
						 
					 
					
						
						
							
							remove uncles  
						
						
						
					 
					
						2016-12-07 09:32:36 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							60680e1913 
							
						 
					 
					
						
						
							
							Merge pull request  #3730  from ethcore/jsonrpc-ipc-bump  
						
						... 
						
						
						
						bump jsonrpc-ipc-server to fix windows build 
						
					 
					
						2016-12-07 09:32:10 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							085b8ad553 
							
						 
					 
					
						
						
							
							Merge pull request  #3527  from ethcore/client-provider  
						
						... 
						
						
						
						LES Part 2 
						
					 
					
						2016-12-07 09:31:50 +01:00