Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							503b126c93 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightserv  
						
						
						
					 
					
						2016-12-09 21:37:55 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							b772901d77 
							
						 
					 
					
						
						
							
							network: process packets only after connection handler finishes  
						
						
						
					 
					
						2016-12-09 21:17:05 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							2226324495 
							
						 
					 
					
						
						
							
							Merge pull request  #3778  from ethcore/auth-round-test  
						
						... 
						
						
						
						AuthorityRound network simulation test 
						
					 
					
						2016-12-09 20:58:05 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b15edd095e 
							
						 
					 
					
						
						
							
							Merge branch 'auth-bft' of  https://github.com/ethcore/parity  into auth-bft  
						
						
						
					 
					
						2016-12-09 20:51:42 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c82754874c 
							
						 
					 
					
						
						
							
							Fix typo.  
						
						
						
					 
					
						2016-12-09 20:48:52 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							08e7e79bfd 
							
						 
					 
					
						
						
							
							more test  
						
						
						
					 
					
						2016-12-09 20:48:05 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							46af3d18da 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-09 20:45:15 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e5e6b77984 
							
						 
					 
					
						
						
							
							Cleanups and avoid redownloading.  
						
						
						
					 
					
						2016-12-09 20:40:24 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							97f358ced9 
							
						 
					 
					
						
						
							
							AuthorityRound network simulation test  
						
						
						
					 
					
						2016-12-09 20:38:06 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							fe27b0f313 
							
						 
					 
					
						
						
							
							Merge pull request  #3775  from ethcore/auth-bft-test  
						
						... 
						
						
						
						AuthorityRound network simulation test 
						
					 
					
						2016-12-09 20:25:51 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							c91a614c3d 
							
						 
					 
					
						
						
							
							Fixing tests  
						
						
						
					 
					
						2016-12-09 20:24:33 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							598fd42856 
							
						 
					 
					
						
						
							
							Merge pull request  #3770  from ethcore/jg-execute-gas  
						
						... 
						
						
						
						GasPrice selection for contract execution 
						
					 
					
						2016-12-09 20:24:10 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							0a4e63b462 
							
						 
					 
					
						
						
							
							Merge pull request  #3762  from ethcore/tx-check  
						
						... 
						
						
						
						Reject existing transactions 
						
					 
					
						2016-12-09 20:17:28 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							45ec84e627 
							
						 
					 
					
						
						
							
							Merge pull request  #3752  from ethcore/jg-subscription-check  
						
						... 
						
						
						
						Allow autoRemove from api.subscribe based on callback return values 
						
					 
					
						2016-12-09 20:16:34 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							2e1e167397 
							
						 
					 
					
						
						
							
							Merge pull request  #3753  from ethcore/jg-fix-gitlab.yml  
						
						... 
						
						
						
						Replace misplaced & with && in gitlab-ci.yml 
						
					 
					
						2016-12-09 20:16:10 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7406773f 
							
						 
					 
					
						
						
							
							AuthorityRound network simulation test  
						
						
						
					 
					
						2016-12-09 19:27:16 +01:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							647b62b4a2 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20161209-182130  
						
						
						
					 
					
						2016-12-09 18:23:46 +00:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							cf0b1bb9b2 
							
						 
					 
					
						
						
							
							use path prefix  
						
						
						
					 
					
						2016-12-09 19:21:39 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							b99403740a 
							
						 
					 
					
						
						
							
							Merge pull request  #3773  from ethcore/ng-enhanced-multisig  
						
						... 
						
						
						
						Lower gas usage for creating a Multisig Wallet 
						
					 
					
						2016-12-09 19:15:46 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							5758bb7cac 
							
						 
					 
					
						
						
							
							Rust files are all non-js files  
						
						
						
					 
					
						2016-12-09 19:11:00 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c2b6be95c8 
							
						 
					 
					
						
						
							
							Fetch and place in updates path.  
						
						
						
					 
					
						2016-12-09 19:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							9bfceeea21 
							
						 
					 
					
						
						
							
							Merge pull request  #3761  from ethcore/io-stop  
						
						... 
						
						
						
						Added IO service explicit stop 
						
					 
					
						2016-12-09 19:00:46 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							d5d9d78bd9 
							
						 
					 
					
						
						
							
							It's not either-or.  
						
						
						
					 
					
						2016-12-09 18:58:37 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a73e0a987e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-test-ui  
						
						
						
					 
					
						2016-12-09 18:34:58 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							290a4a40ff 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-subscription-check  
						
						
						
					 
					
						2016-12-09 18:17:36 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							0cbef30508 
							
						 
					 
					
						
						
							
							Unsubscribe on true  
						
						
						
					 
					
						2016-12-09 18:17:31 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							99846e2ad2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-subscription-check  
						
						
						
					 
					
						2016-12-09 18:14:09 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1b0945940b 
							
						 
					 
					
						
						
							
							Test for boolean result before unsubscribe  
						
						
						
					 
					
						2016-12-09 18:14:05 +01:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							fd23a2972c 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20161209-165845  
						
						
						
					 
					
						2016-12-09 17:00:59 +00:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							ffd8314a11 
							
						 
					 
					
						
						
							
							Be lenient around invalid owners map ( #3764 )  
						
						... 
						
						
						
						* Be lenient around invalid owners map
* Filter invalid owners before render 
						
					 
					
						2016-12-09 17:52:25 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							ff11634e1d 
							
						 
					 
					
						
						
							
							PR Grumble  
						
						
						
					 
					
						2016-12-09 16:55:43 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bc33231f7c 
							
						 
					 
					
						
						
							
							merge master into jr-use-badge-reg  
						
						
						
					 
					
						2016-12-09 16:53:14 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							eb1429237b 
							
						 
					 
					
						
						
							
							merge master into jr-email-verification  
						
						
						
					 
					
						2016-12-09 16:52:44 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c249c51dd3 
							
						 
					 
					
						
						
							
							certification: use BadgeReg to load the contract  
						
						
						
					 
					
						2016-12-09 16:40:45 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							bace05b154 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ng-enhanced-multisig  
						
						
						
					 
					
						2016-12-09 16:40:07 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							caf3a96c19 
							
						 
					 
					
						
						
							
							Add fallback Full Fleshed Wallet if no library  
						
						
						
					 
					
						2016-12-09 16:29:57 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							efee55ae84 
							
						 
					 
					
						
						
							
							Updated Wallet Version ! Now only 500k gas for Wallet creation  
						
						
						
					 
					
						2016-12-09 16:24:11 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							452b8c9c74 
							
						 
					 
					
						
						
							
							split sms & email verification 3rdparty code  
						
						... 
						
						
						
						We might want to bundle the code in `3rdparty`.
React & presentational components don't belong in there. At the
same time, the terms of service are strictly related to the use
of these external services. We decided to not bundle them, but
still keep them in a file called `terms-of-service.js`.
The commit also moves the "how it works" section into the
presentational part in `modals/Verification`. 
						
					 
					
						2016-12-09 16:23:13 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d992c642ff 
							
						 
					 
					
						
						
							
							Adjust to final step on rejected/completed  
						
						
						
					 
					
						2016-12-09 15:55:50 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							cee07fef74 
							
						 
					 
					
						
						
							
							Trigger remove_old on new block  
						
						
						
					 
					
						2016-12-09 15:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							63137b1548 
							
						 
					 
					
						
						
							
							Add enhanced Wallet solidity code  
						
						
						
					 
					
						2016-12-09 15:52:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d2494d1425 
							
						 
					 
					
						
						
							
							GasPrice selection for contract execution  
						
						
						
					 
					
						2016-12-09 15:43:24 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							415fccfffb 
							
						 
					 
					
						
						
							
							add ethcore-light cov target  
						
						
						
					 
					
						2016-12-09 15:20:45 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							9a4dfbd211 
							
						 
					 
					
						
						
							
							Merge branch 'lightserv' of github.com:ethcore/parity into lightserv  
						
						
						
					 
					
						2016-12-09 15:20:12 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							5d054f08c3 
							
						 
					 
					
						
						
							
							Clearing old transactions  
						
						
						
					 
					
						2016-12-09 15:05:03 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							5f37c93659 
							
						 
					 
					
						
						
							
							les: use negotiated protocol version  
						
						
						
					 
					
						2016-12-09 15:04:54 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							56e9dab9de 
							
						 
					 
					
						
						
							
							add Engine stop method  
						
						
						
					 
					
						2016-12-09 14:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							cc8c2ea58d 
							
						 
					 
					
						
						
							
							Reject existing tx  
						
						
						
					 
					
						2016-12-09 14:37:11 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							c7f1260775 
							
						 
					 
					
						
						
							
							Merge branch 'io-stop' of  https://github.com/ethcore/parity  into auth-bft  
						
						
						
					 
					
						2016-12-09 14:27:39 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6d20592f76 
							
						 
					 
					
						
						
							
							remove certification on Revoke  
						
						
						
					 
					
						2016-12-09 14:06:02 +01:00