| 
							
							
								 Gav Wood | a6a8e431f5 | Fix lint | 2016-12-15 22:46:36 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 7cac50601f | Add JS tests for parity_netPeers | 2016-12-15 22:45:35 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 869fbf5108 | Fix linting. | 2016-12-15 22:07:25 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ca0d87da10 | 125 -> 69. | 2016-12-15 22:05:54 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5bab14e0c0 | Merge remote-tracking branch 'origin/master' into check-updates | 2016-12-15 21:15:25 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | d2962fe47b | store certifier index in constant | 2016-12-15 20:47:41 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | c12702fc51 | Merge remote-tracking branch 'origin/master' into check-updates | 2016-12-15 18:23:02 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | 7fdcc70825 | Merge jg-contract-subid into jr-fix-verification | 2016-12-15 18:12:45 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 1f1dc8b89d | Store subscriptionId, use it to send changes | 2016-12-15 18:09:59 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | 0e963da27b | fix verification stores 🐛 | 2016-12-15 18:09:52 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 17781a5ac4 | Fix typo in method call | 2016-12-15 17:52:28 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 9dd1268b69 | Add keys for steps (future-proof) | 2016-12-15 15:56:58 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 590428e7f2 | Merge remote-tracking branch 'origin/master' into check-updates | 2016-12-15 15:12:09 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d76239ed48 | Merge pull request #3768 from ethcore/jr-use-badge-reg get certifications from BadgeReg, show them in accounts overview | 2016-12-15 14:43:05 +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 | be0d5ca516 | Merge pull request #3827 from ethcore/jr-first-run first run: skip account creation if they already have accounts | 2016-12-15 13:52:01 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | 4c42dedcad | sort props 💄 | 2016-12-15 13:51:44 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | f59f7c5773 | address style grumbles 💄 | 2016-12-15 13:48:40 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 9fc3c47bcb | inject exports both partiy & web3 | 2016-12-15 10:05:52 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 7330612bfb | Toggle upgrade modal via upgrade link | 2016-12-14 15:56:01 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 2588aea6b2 | Merge branch 'master' into check-updates | 2016-12-14 14:37:38 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | a8f428ccca | Display capability status on statusbar | 2016-12-14 14:37:25 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | d28ec2ff97 | Make enode available on Status page | 2016-12-14 13:41:29 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | bbcae3d27b | merge master into jr-first-run | 2016-12-14 12:28:55 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | 240bab230c | merge master into jr-use-badge-reg | 2016-12-14 12:26:18 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 72b8ee84c7 | Merge pull request #3766 from ethcore/jr-email-verification email verification | 2016-12-13 18:09:41 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 51b544c2db | Simplify icon exports | 2016-12-12 23:53:29 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | dbc6b42267 | Lint fixes | 2016-12-12 23:14:44 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 9931d7657a | Merge remote-tracking branch 'origin/check-updates' into check-updates | 2016-12-12 23:07:41 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | e170134d97 | Merge branch 'master' into check-updates | 2016-12-12 22:45:12 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | f15671c74b | UI interface completed, to be tested | 2016-12-12 22:45:09 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | a8ae9b02f9 | Typo | 2016-12-12 18:58:31 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | a2a89f7e59 | Basic UI structure in-place | 2016-12-12 18:30:41 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 7a0fccf417 | Add shared icons | 2016-12-12 18:30:05 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | ab4d666681 | Merge remote-tracking branch 'origin/master' into check-updates | 2016-12-12 16:35:11 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 1135674eaa | WIP UI (dialog available) | 2016-12-12 15:51:36 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | c784ab55d2 | Extend jsapi interfaces with documentation | 2016-12-12 15:43:59 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | b980e7a329 | add skip button to first run modal | 2016-12-12 14:32:55 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | 085adbaffd | make showFirstRun in localStorage a bool | 2016-12-12 14:15:26 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 3a7e30ec5c | Fix issue with bool type dropdown | 2016-12-12 12:49:40 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 563c8c75f9 | Tests for DetailsStep (only bool dropdown) | 2016-12-12 12:49:04 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | c5c4e5e901 | Updated | 2016-12-12 12:48:43 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 29674a0e65 | Small testability fixes | 2016-12-12 12:48:32 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 23234fb1aa | Allow operation in test mode | 2016-12-12 12:48:16 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | c43944584d | fix import | 2016-12-12 12:33:58 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | 723e9e55db | merge master into jr-email-verification | 2016-12-12 12:21:06 +01:00 |  | 
			
				
					| 
							
							
								 Jannis R | d67a9388ff | merge master into jr-use-badge-reg | 2016-12-12 12:13:49 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 28be8d6f6c | Test for bool TypedInput | 2016-12-12 10:55:20 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | f9b5a056cf | Merge branch 'master' into jg-typedinput-tests | 2016-12-12 10:14:29 +01:00 |  | 
			
				
					| 
							
							
								 Jaco Greeff | 2c4c6ba4e4 | Basic smoketest | 2016-12-12 10:12:12 +01:00 |  |