Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8125b5690c 
							
						 
					 
					
						
						
							
							Port try macro to new ? operator. ( #3962 )  
						
						... 
						
						
						
						* initial untry sweep
* restore try in ipc codegen, fix inference
* change a few missed try instances 
						
					 
					
						2016-12-27 12:53:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c309d152 
							
						 
					 
					
						
						
							
							Web Based Dapps ( #3956 )  
						
						... 
						
						
						
						* Dapps web
Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs
* Rewriting fetch
* Parity-wide fetch service
* Obey the limits and support cancellation.
* Removing temporary files.
* Actually use Fetch for dapps
* Re-implementing file fetching to avoid temporary files.
* Serde to 0.8.19
* Fixing content & dapps fetch
* Serving web content and injecting scripts
* Don't wait for old content, start a new download
* Supporting timeouts and query
* Simple GUI for the browser
* Proxy tokens validation
* Recovering from invalid web-based requests
* Remember last visisted URL
* Removing unused variables
* Addressing review comments
* Setting default account in web3
* Adding WebBrowser dapp to the list
* Actually prune old entries when generating new token 
						
					 
					
						2016-12-27 10:15:02 +00:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							612f14188f 
							
						 
					 
					
						
						
							
							remove unused fields in informant ( #3963 )  
						
						
						
					 
					
						2016-12-23 18:45:51 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							5a3c3bcb45 
							
						 
					 
					
						
						
							
							Sync reorg up to history size ( #3874 )  
						
						... 
						
						
						
						* Allow sync reorg up to pruning history size
* Peer difficulty tracking
* Abort downloading block if received with NewBlock
* Set pruning history to 1200
* Renamed history size field 
						
					 
					
						2016-12-23 18:43:40 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							f0387c33c6 
							
						 
					 
					
						
						
							
							Global Fetch Service ( #3915 )  
						
						... 
						
						
						
						* Dapps web
Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs
* Rewriting fetch
* Parity-wide fetch service
* Obey the limits and support cancellation.
* Removing temporary files.
* Actually use Fetch for dapps
* Re-implementing file fetching to avoid temporary files.
* Serde to 0.8.19
* Fixing content & dapps fetch 
						
					 
					
						2016-12-22 18:26:39 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							b44cd7b1db 
							
						 
					 
					
						
						
							
							Merge pull request  #3940  from gguoss/auth-bft  
						
						... 
						
						
						
						Fixed compile error. 
						
					 
					
						2016-12-22 12:54:14 +01:00 
						 
				 
			
				
					
						
							
							
								gavinGuo 
							
						 
					 
					
						
						
						
						
							
						
						
							70c9f7c80d 
							
						 
					 
					
						
						
							
							Fixed compile error.  
						
						
						
					 
					
						2016-12-22 14:51:25 +08:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							cd8af0a497 
							
						 
					 
					
						
						
							
							Merge pull request  #3904  from ethcore/new-dirs  
						
						... 
						
						
						
						Fixed upgrading keys on the first run 
						
					 
					
						2016-12-19 22:24:37 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							ddb242c969 
							
						 
					 
					
						
						
							
							Fixed upgrading keys on the first run  
						
						
						
					 
					
						2016-12-19 17:41:55 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							002cec9e6f 
							
						 
					 
					
						
						
							
							Merge pull request  #3872  from ethcore/disable-light-server  
						
						... 
						
						
						
						remove light server capability temporarily 
						
					 
					
						2016-12-19 15:22:44 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							adb0f6fb26 
							
						 
					 
					
						
						
							
							Merge pull request  #3880  from ethcore/fix-updater-permissions  
						
						... 
						
						
						
						Fix updater permissions 
						
					 
					
						2016-12-17 12:15:05 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							fa721f5cdf 
							
						 
					 
					
						
						
							
							Merge pull request  #3875  from ethcore/config-fix  
						
						... 
						
						
						
						Loading default config from default path 
						
					 
					
						2016-12-16 20:24:12 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14e4fefbcf 
							
						 
					 
					
						
						
							
							Fix updater permissions and refactor existing code.  
						
						
						
					 
					
						2016-12-16 18:17:15 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							b9cd68e7e6 
							
						 
					 
					
						
						
							
							Minor paths change  
						
						
						
					 
					
						2016-12-16 17:38:02 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							6966fd6c63 
							
						 
					 
					
						
						
							
							New paths  
						
						
						
					 
					
						2016-12-16 15:25:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							f345458b65 
							
						 
					 
					
						
						
							
							Loading config from default path  
						
						
						
					 
					
						2016-12-16 15:03:31 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							72f278efed 
							
						 
					 
					
						
						
							
							Merge pull request  #3868  from ethcore/new-dirs  
						
						... 
						
						
						
						Base directory option 
						
					 
					
						2016-12-16 13:04:31 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							90d3d330f5 
							
						 
					 
					
						
						
							
							Use info! for blockchain status rather than stdout.  
						
						
						
					 
					
						2016-12-16 11:00:17 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							396ab5b361 
							
						 
					 
					
						
						
							
							Refactor and make is_syncing.  
						
						
						
					 
					
						2016-12-16 10:31:10 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8f65a7bcc8 
							
						 
					 
					
						
						
							
							remove light server capability temporarily  
						
						
						
					 
					
						2016-12-15 23:50:16 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ca0d87da10 
							
						 
					 
					
						
						
							
							125 -> 69.  
						
						
						
					 
					
						2016-12-15 22:05:54 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							e2371632c5 
							
						 
					 
					
						
						
							
							Base dir option  
						
						
						
					 
					
						2016-12-15 21:56:45 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4410fb635a 
							
						 
					 
					
						
						
							
							Respect system paths.  
						
						
						
					 
					
						2016-12-15 19:53:13 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							801596395e 
							
						 
					 
					
						
						
							
							--release-track.  
						
						
						
					 
					
						2016-12-15 19:23:25 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							995fafebee 
							
						 
					 
					
						
						
							
							Fix last remaining test.  
						
						
						
					 
					
						2016-12-15 19:19:50 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d737de0fc0 
							
						 
					 
					
						
						
							
							Fix tests.  
						
						
						
					 
					
						2016-12-15 19:17:44 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4a2b418fc2 
							
						 
					 
					
						
						
							
							Configurable update tracks to help testing.  
						
						
						
					 
					
						2016-12-15 18:51:59 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c12702fc51 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 18:23:02 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							590428e7f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 15:12:09 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							0da564a4c2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into cli-rpc  
						
						
						
					 
					
						2016-12-15 14:45:15 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							20b2f84d48 
							
						 
					 
					
						
						
							
							Merge pull request  #3828  from ethcore/new-dirs  
						
						... 
						
						
						
						New directory structure 
						
					 
					
						2016-12-15 14:34:01 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							a74bce2c06 
							
						 
					 
					
						
						
							
							Merge pull request  #3759  from ethcore/auth-bft  
						
						... 
						
						
						
						Tendermint Engine 
						
					 
					
						2016-12-15 13:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Vincent Serpoul 
							
						 
					 
					
						
						
						
						
							
						
						
							339b889ac4 
							
						 
					 
					
						
						
							
							spelling ( #3839 )  
						
						
						
					 
					
						2016-12-14 15:15:19 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2588aea6b2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						
						
					 
					
						2016-12-14 14:37:38 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							1d80725f66 
							
						 
					 
					
						
						
							
							Merge branch 'master' into cli-rpc  
						
						
						
					 
					
						2016-12-14 14:12:27 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							3280f071b1 
							
						 
					 
					
						
						
							
							Fixed moving dirs on windows  
						
						
						
					 
					
						2016-12-14 01:33:57 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							be5fefe772 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into new-dirs  
						
						
						
					 
					
						2016-12-14 00:04:11 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							6e3e1ea88b 
							
						 
					 
					
						
						
							
							XDG paths  
						
						
						
					 
					
						2016-12-13 23:38:29 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6a48e9d9e5 
							
						 
					 
					
						
						
							
							Print output for commands, don't info!  
						
						
						
					 
					
						2016-12-13 20:20:10 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							80d6e49070 
							
						 
					 
					
						
						
							
							Merge pull request  #3812  from ethereumproject/splix/classic-replay-protection  
						
						... 
						
						
						
						Network configuration for Ethereum Classic 
						
					 
					
						2016-12-13 17:39:33 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd2e15313 
							
						 
					 
					
						
						
							
							Style and docs  
						
						
						
					 
					
						2016-12-12 23:21:44 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							fa504e510f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-12 21:28:46 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Artamonov 
							
						 
					 
					
						
						
						
						
							
						
						
							e61d14d7f7 
							
						 
					 
					
						
						
							
							reuse Morden for Classic Testnet  
						
						
						
					 
					
						2016-12-12 19:50:32 +00:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							85fd62917a 
							
						 
					 
					
						
						
							
							Updated tests  
						
						
						
					 
					
						2016-12-12 17:53:17 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							edb853ca35 
							
						 
					 
					
						
						
							
							KillDB command  
						
						
						
					 
					
						2016-12-12 17:19:41 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							6601fde328 
							
						 
					 
					
						
						
							
							New data paths with upgrade  
						
						
						
					 
					
						2016-12-12 16:51:07 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							758744449f 
							
						 
					 
					
						
						
							
							Expose all other RPCs.  
						
						
						
					 
					
						2016-12-12 02:57:19 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d81d9d77b2 
							
						 
					 
					
						
						
							
							Wire-in Updater to parity RPC  
						
						
						
					 
					
						2016-12-11 23:15:52 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							58b72c521d 
							
						 
					 
					
						
						
							
							Rename ethcore -> parity in licenses.  
						
						
						
					 
					
						2016-12-11 19:31:31 +01:00