Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7bbd48a2bd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js 
						
					 
					
						2017-06-13 11:02:38 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							d2394d3ac3 
							
						 
					 
					
						
						
							
							Updating paths to repos. ( #5330 )  
						
						... 
						
						
						
						* Updating paths to repos.
* Updating rotor and libusb
* Fixing other occurrences 
						
					 
					
						2017-03-29 15:17:27 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3f85bd5b 
							
						 
					 
					
						
						
							
							v1.7 ( #4730 )  
						
						
						
					 
					
						2017-03-07 17:29:27 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							148ea37687 
							
						 
					 
					
						
						
							
							v1.6 in master ( #4113 )  
						
						
						
					 
					
						2017-01-10 15:41:59 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							bb5da2379b 
							
						 
					 
					
						
						
							
							Windows app and installer fixes ( #3338 )  
						
						... 
						
						
						
						* Windows app and installer fixes
* Sorted out comments 
						
					 
					
						2016-11-10 14:49:16 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							b453ae1db2 
							
						 
					 
					
						
						
							
							Autostart checkbox ( #3269 )  
						
						
						
					 
					
						2016-11-08 18:52:09 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							318a3d29e1 
							
						 
					 
					
						
						
							
							Build tray app for x64 ( #3255 )  
						
						... 
						
						
						
						* Build tray app for x64
* Fixed command 
						
					 
					
						2016-11-08 10:23:23 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							77136b8f84 
							
						 
					 
					
						
						
							
							Set passive mode for first run only ( #3214 )  
						
						
						
					 
					
						2016-11-05 14:38:04 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							d37f4cc82f 
							
						 
					 
					
						
						
							
							v1.5 ( #3195 )  
						
						
						
					 
					
						2016-11-04 17:27:11 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b9aa7d73 
							
						 
					 
					
						
						
							
							Better shortcut ( #3147 )  
						
						
						
					 
					
						2016-11-03 20:01:03 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							d101cb5247 
							
						 
					 
					
						
						
							
							Windows tray app ( #3103 )  
						
						... 
						
						
						
						* Check if already running in ui command
* Windows tray app
* Upadted CI scripts 
						
					 
					
						2016-11-03 12:00:39 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							69d1c1f237 
							
						 
					 
					
						
						
							
							v1.4.0  
						
						
						
					 
					
						2016-08-09 11:40:57 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							a72d8ee0e7 
							
						 
					 
					
						
						
							
							v1.3.0 ( #1421 )  
						
						
						
					 
					
						2016-06-25 10:32:05 +02:00 
						 
				 
			
				
					
						
							
							
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							76b413b5f7 
							
						 
					 
					
						
						
							
							Appveyor config for windows build+installer ( #1302 )  
						
						... 
						
						
						
						* appveyor
* proper dist name
* quote
* win-build config
* proper build section
* tests in release
* plugin dir
* cache binaries
* quotes
* escaped quotes
* forces user dir
* fixes
* syntax
* proper cahce dir
* quotes?
* root nsis instead of bin
* submodules init
* artifact path fix
* no submodule
* raw link here
* another way to force cargo cache
* include vc++ 2015 redist
* fix name of the dist
* ETHCORE -> Ethcore 
						
					 
					
						2016-06-18 10:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							232274546b 
							
						 
					 
					
						
						
							
							firewall rules  
						
						
						
					 
					
						2016-06-18 10:52:50 +02:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							55fec2dcc3 
							
						 
					 
					
						
						
							
							x64 path  
						
						
						
					 
					
						2016-06-18 10:52:50 +02:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							8ced25b36c 
							
						 
					 
					
						
						
							
							remove some comments from sample  
						
						
						
					 
					
						2016-06-14 18:12:41 +03:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							39e2f6c891 
							
						 
					 
					
						
						
							
							cfg attrs  
						
						
						
					 
					
						2016-06-14 17:37:01 +03:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							5920a7068f 
							
						 
					 
					
						
						
							
							installer initial, ui option for executable  
						
						
						
					 
					
						2016-06-14 17:12:46 +03:00