Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							269cfbb8ac 
							
						 
					 
					
						
						
							
							Merge branch origin/develop into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/blocktest/main.go
	cmd/mist/debugger.go
	cmd/utils/cmd.go 
						
					 
					
						2015-03-10 17:14:31 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							56524d13b5 
							
						 
					 
					
						
						
							
							removed debugger  
						
						
						
					 
					
						2015-03-10 12:06:16 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							9bf513e993 
							
						 
					 
					
						
						
							
							Merge ethereum/poc-9 into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go 
						
					 
					
						2015-03-09 23:25:46 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							697f6748b8 
							
						 
					 
					
						
						
							
							cmd/mist: use cli library and package accounts  
						
						
						
					 
					
						2015-03-09 23:08:47 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							69920c735a 
							
						 
					 
					
						
						
							
							Bump v  
						
						
						
					 
					
						2015-03-08 00:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Gustav Simonsson 
							
						 
					 
					
						
						
						
						
							
						
						
							bc45e5c6de 
							
						 
					 
					
						
						
							
							Integrate eth_accounts and eth_transact to use new account manager  
						
						... 
						
						
						
						* Add from to eth_transact / xeth.Transact and add static pass in lieu
  of integrating with native Mist window for user passphrase entry
* Make eth_accounts return AccountManager.Accounts()
* Add a Generate Key menu item in Mist 
						
					 
					
						2015-03-06 13:10:42 +00:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							178798ef87 
							
						 
					 
					
						
						
							
							network back to local files  
						
						
						
					 
					
						2015-03-04 16:31:48 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							671e38fb65 
							
						 
					 
					
						
						
							
							Fixed Average Return calculation  
						
						
						
					 
					
						2015-03-04 15:13:57 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							e1bae3771e 
							
						 
					 
					
						
						
							
							updated network app to latest build  
						
						
						
					 
					
						2015-03-04 12:59:17 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							5f25c117eb 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into ui  
						
						
						
					 
					
						2015-03-04 10:04:07 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							cf880f78d5 
							
						 
					 
					
						
						
							
							network dashboard is now a local file  
						
						
						
					 
					
						2015-03-04 10:02:11 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							8c2940a98b 
							
						 
					 
					
						
						
							
							updating to new network health page  
						
						
						
					 
					
						2015-03-03 15:00:34 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							21c373b55d 
							
						 
					 
					
						
						
							
							Network Health Panel with mining  
						
						
						
					 
					
						2015-03-02 18:39:07 -03:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							3ab05ddd25 
							
						 
					 
					
						
						
							
							Bump  
						
						
						
					 
					
						2015-02-26 20:26:37 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							dea6584018 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into ui  
						
						
						
					 
					
						2015-02-23 09:05:15 -03:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							bb3338df63 
							
						 
					 
					
						
						
							
							changes to sidebar sizes  
						
						
						
					 
					
						2015-02-23 08:52:50 -03:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							321dce1f47 
							
						 
					 
					
						
						
							
							Bump  
						
						
						
					 
					
						2015-02-22 13:26:10 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							92337baa5a 
							
						 
					 
					
						
						
							
							reverted back to proper version number  
						
						
						
					 
					
						2015-02-21 00:42:57 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							cc43ab9a81 
							
						 
					 
					
						
						
							
							Minor updates for release  
						
						
						
					 
					
						2015-02-20 18:05:46 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							0006585391 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop  
						
						
						
					 
					
						2015-02-19 22:46:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							639ac5c3da 
							
						 
					 
					
						
						
							
							Merge pull request  #352  from fjl/no-enc-handshake  
						
						... 
						
						
						
						p2p: disable encryption handshake, enable log events 
						
					 
					
						2015-02-19 22:46:07 +01:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							07c34751da 
							
						 
					 
					
						
						
							
							Merge pull request  #335  from alexvandesande/ui  
						
						... 
						
						
						
						Cut, Copy, Undo and Redo working in webview 
						
					 
					
						2015-02-19 22:36:35 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							1ec6190e86 
							
						 
					 
					
						
						
							
							cmd/mist: show peer names in peers window  
						
						
						
					 
					
						2015-02-19 16:54:53 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							0057bb4ef6 
							
						 
					 
					
						
						
							
							WIP QT Clipboard  
						
						
						
					 
					
						2015-02-19 11:51:38 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							acd93c2971 
							
						 
					 
					
						
						
							
							Removed console logs from mist.js  
						
						... 
						
						
						
						also fixed an issue where it would force reloads unnecessarily 
						
					 
					
						2015-02-18 10:25:40 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							60318c96d0 
							
						 
					 
					
						
						
							
							removed old wallet  
						
						
						
					 
					
						2015-02-17 23:22:42 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							c1474e1877 
							
						 
					 
					
						
						
							
							Removed mined transactions from pending view.  Closes   #321  
						
						
						
					 
					
						2015-02-17 23:10:37 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							0e2f6691bf 
							
						 
					 
					
						
						
							
							Cut, Copy, Undo and Redo working in webview  
						
						
						
					 
					
						2015-02-17 17:37:26 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							9a2be227a6 
							
						 
					 
					
						
						
							
							commented peer count out  
						
						
						
					 
					
						2015-02-17 16:18:29 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							fbd5e4d5af 
							
						 
					 
					
						
						
							
							Updated icons  
						
						
						
					 
					
						2015-02-17 11:52:22 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							0de1d1dd58 
							
						 
					 
					
						
						
							
							removed status bar code  
						
						
						
					 
					
						2015-02-17 11:23:28 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							a22711a7b5 
							
						 
					 
					
						
						
							
							badge support  
						
						
						
					 
					
						2015-02-17 11:22:52 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							c4b8c11529 
							
						 
					 
					
						
						
							
							side icons  
						
						
						
					 
					
						2015-02-17 00:52:40 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							666ef48239 
							
						 
					 
					
						
						
							
							SideIcons work. Copy paste still doesn't.  
						
						
						
					 
					
						2015-02-16 20:55:14 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							3068e2688d 
							
						 
					 
					
						
						
							
							merge conflicts  
						
						
						
					 
					
						2015-02-16 14:43:30 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							1878630b59 
							
						 
					 
					
						
						
							
							Solved Issue  #318  and added states to back button  
						
						
						
					 
					
						2015-02-16 14:34:47 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							164de5e22b 
							
						 
					 
					
						
						
							
							Changed default denominators  
						
						
						
					 
					
						2015-02-16 13:20:16 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							05f2808849 
							
						 
					 
					
						
						
							
							Add http when not present on browser  
						
						
						
					 
					
						2015-02-16 11:17:31 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							2c3a014f03 
							
						 
					 
					
						
						
							
							Resolved some bugs in the miner  
						
						... 
						
						
						
						* TODO nonce error sometimes persists
* Fixed mining on wrong blocks
* Fixed state error & receipt fail 
						
					 
					
						2015-02-15 16:16:27 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							12fc590b34 
							
						 
					 
					
						
						
							
							removed some old menu items  
						
						
						
					 
					
						2015-02-15 01:58:15 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							c29b01ce75 
							
						 
					 
					
						
						
							
							Reset URL bar  
						
						
						
					 
					
						2015-02-14 17:18:28 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							befb4bc1c1 
							
						 
					 
					
						
						
							
							Fixed a few errors in the browser special meta tags objects  
						
						
						
					 
					
						2015-02-14 17:13:21 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							65159d65c8 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop  
						
						
						
					 
					
						2015-02-14 00:27:46 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							84f7c966f7 
							
						 
					 
					
						
						
							
							Moved ECIES to repo & added secondary title for webview  
						
						... 
						
						
						
						* ECIES moved from obscuren to ethereum
* Added html META[name=badge] to reflect menuItem.secondaryTitle 
						
					 
					
						2015-02-14 00:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							8464e43eaf 
							
						 
					 
					
						
						
							
							cmd/mist: fix peer window  
						
						
						
					 
					
						2015-02-14 00:12:37 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							384305f4aa 
							
						 
					 
					
						
						
							
							Fixed QML errors  
						
						
						
					 
					
						2015-02-13 18:33:08 +01:00 
						 
				 
			
				
					
						
							
							
								Alexandre Van de Sande 
							
						 
					 
					
						
						
						
						
							
						
						
							7aef0fed29 
							
						 
					 
					
						
						
							
							changed url bar behaviour. Failed attempt at icon  
						
						
						
					 
					
						2015-02-13 18:32:15 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							ce239333d5 
							
						 
					 
					
						
						
							
							Update balance label when mining  
						
						
						
					 
					
						2015-02-13 18:15:23 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							790de35e7f 
							
						 
					 
					
						
						
							
							Fixed issue in peer window  
						
						... 
						
						
						
						* Fixed issues where new peer window could cause a crash when entering
  an empty string 
						
					 
					
						2015-02-13 17:57:46 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							218f437b0c 
							
						 
					 
					
						
						
							
							Updated window  
						
						
						
					 
					
						2015-02-13 17:30:37 +01:00