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 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4c42dedcad 
							
						 
					 
					
						
						
							
							sort props  💄  
						
						
						
					 
					
						2016-12-15 13:51:44 +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 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							e170134d97 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						
						
					 
					
						2016-12-12 22:45:12 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1135674eaa 
							
						 
					 
					
						
						
							
							WIP UI (dialog available)  
						
						
						
					 
					
						2016-12-12 15:51:36 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							085adbaffd 
							
						 
					 
					
						
						
							
							make showFirstRun in localStorage a bool  
						
						
						
					 
					
						2016-12-12 14:15:26 +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 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							0cb16ae589 
							
						 
					 
					
						
						
							
							Add store for MethodDecoding ( #3821 )  
						
						... 
						
						
						
						* Add Loader to Transactions
* Add Method Decoding Store (better fetching of methods)
* Load locally stored ABI in MethodDecodingStore
* Fixes UI glitches along the way
* Linting
* Add method decoding from User Contracts 
						
					 
					
						2016-12-12 00:38:47 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							4dbfcf231d 
							
						 
					 
					
						
						
							
							Cache fetched Dapps ( #3804 )  
						
						... 
						
						
						
						* Have a singleton DappsFetcher so we don't realod them at each page load
* Better dapps Fetcher : event based listener
  Update on meta change
* Remove dapps fetcher => all in singleton dapps store + utils
* Modify header to Parity 
						
					 
					
						2016-12-11 21:03:40 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							58b72c521d 
							
						 
					 
					
						
						
							
							Rename ethcore -> parity in licenses.  
						
						
						
					 
					
						2016-12-11 19:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17cc2be4b5 
							
						 
					 
					
						
						
							
							Rename ethcore -> parity in license.  
						
						
						
					 
					
						2016-12-11 19:30:54 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							929b6ee0f7 
							
						 
					 
					
						
						
							
							Allow editing of gasPrice & gas in Signer ( #3777 )  
						
						... 
						
						
						
						* Rework gas display (maintainable)
* Move GasPriceSelector to ui
* Allow opening of gas component (WIP)
* Merge
* Consistency
* Adjust for Signer display
* Set maximum height based on screen size
* Gas editor displays in-place
* Cleanups
* Merge
* Style fixes
* Fixup stash mishap (again)
* Add store test
* Allow edited values to refrect on the display
* Fix properties
* Adjust styling to show different rows
* git mv
* git mv
* Style fixes
* Style updates
* Pass gas & gasPrice with confirmation
* Fix build (case)
* Style fixes
* Basic GasPriceEditor smoketest
* manual move 1
* manual move 2
* manual move 1
* manual move 2
* NODE_ENV=test ace fix
* UI smoketests
* Style
* Format options via formatter
* Initial version
* Re-add even/odd class
* re-add gasLimit to embedded passing
* style
* Updated for passing gas & price to store
* Allow gas/price overrides when none available
* Fix slider value, pass as number 
						
					 
					
						2016-12-11 17:43:51 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							885d6eaa4d 
							
						 
					 
					
						
						
							
							i18n string dictionaries ( #3532 )  
						
						... 
						
						
						
						* TabBar & Settings -> Views i18n enabled
* Proxy i18n
* Settings i18n
* defaultLocale
* Introduce thin Translate wrapper
* PropTypes util caters for multiples
* Translate & LanguageSelector under ui
* Update location & proptypes
* Add UI Language selector
* German settings pages
* Add German language selection
* Corrected umlaut encoding
* Lint
* Re-apply pre-merge conflict changes
* better German i18n
* Language names in locale language
* i8n -> index
* Allow for development/production operation
* Use Yahoo react-intl (as opposed to react-i18nify)
* Use default messages wih expansions
* Remove non-reused variable definitions
* Use FormattedMessage directly, opens up WebPack & Babel opportunities
* Add flat to flatten
* Extract default messages via babel
* Webpack to aggegrate i18n defaultMessage
* Re-add react-intl after merge
* Update proptype references (merge)
* Strip down external dictionary
* i18n for dapps
* Restore tests submodule
* Allow language changes to reflect
* Style updates 
						
					 
					
						2016-12-11 17:42:35 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							13509a9e83 
							
						 
					 
					
						
						
							
							Fix padding in App, again... ( #3813 )  
						
						
						
					 
					
						2016-12-11 16:49:38 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							ba3bfcc54d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ng-ui-fixes  
						
						
						
					 
					
						2016-12-11 01:26:55 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							b44e7bb292 
							
						 
					 
					
						
						
							
							Extract CSS to file in production builds ( #3783 )  
						
						... 
						
						
						
						* Extract CSS to file if production build
* Use DAPPS_URL for testing purposes + better assets in Webpack
* Delete comments 
						
					 
					
						2016-12-10 23:55:57 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							e5c73b29d8 
							
						 
					 
					
						
						
							
							'contract/write' to 'contract/develop'  
						
						
						
					 
					
						2016-12-10 22:42:49 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							9dbccfda2f 
							
						 
					 
					
						
						
							
							Fix padding bottom // Status bar fixed  
						
						
						
					 
					
						2016-12-10 22:22:14 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							173a88804a 
							
						 
					 
					
						
						
							
							Status page updates ( #3774 )  
						
						... 
						
						
						
						* Allow Page to create optional Actionbar
* Typo
* Display last block.timestamp
* Remove unnneeded console.log
* Re-do git mv
* git mv
* Force build changes
* Resolving case sensitivity issues
* Swapped to margin at bottom 
						
					 
					
						2016-12-10 22:21:32 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							7401358543 
							
						 
					 
					
						
						
							
							PR grumbles  
						
						
						
					 
					
						2016-12-10 22:15:56 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							70eab0da03 
							
						 
					 
					
						
						
							
							PR grumbles  
						
						
						
					 
					
						2016-12-10 20:29:22 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							ef93262311 
							
						 
					 
					
						
						
							
							See addresses outside address book + Save them  
						
						
						
					 
					
						2016-12-10 15:19:05 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							65f586ed14 
							
						 
					 
					
						
						
							
							Fix tab bar active style  
						
						
						
					 
					
						2016-12-10 14:32:54 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							81c5085b35 
							
						 
					 
					
						
						
							
							Don't create new Contracts instance if already exists  
						
						
						
					 
					
						2016-12-10 14:31:20 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							13607d48be 
							
						 
					 
					
						
						
							
							Better use of Tab Bar  
						
						
						
					 
					
						2016-12-10 14:26:35 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							591d086f42 
							
						 
					 
					
						
						
							
							Better use of React-Router (maintaining old routes)  
						
						
						
					 
					
						2016-12-10 14:19:15 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							51b9034a5e 
							
						 
					 
					
						
						
							
							Don't show addresses while loading balances (fix flash of unsorted)  
						
						
						
					 
					
						2016-12-10 12:44:48 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							0d9b1882a3 
							
						 
					 
					
						
						
							
							Treat tabs as real link (enable Ctrl+Click for new Tab)  
						
						
						
					 
					
						2016-12-10 01:56:38 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							f6564dcc2f 
							
						 
					 
					
						
						
							
							Fix dapps separation  
						
						
						
					 
					
						2016-12-10 01:32:39 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c04fcd00 
							
						 
					 
					
						
						
							
							Fixes to the Wallet UI ( #3787 )  
						
						... 
						
						
						
						* Correct number of transactions for contracts
* Remove daily limit info if set to 0
* Hide tx count for contracts 
						
					 
					
						2016-12-10 01:26:47 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							6655e7e3c0 
							
						 
					 
					
						
						
							
							Add support for wallets without getOwner() interface ( #3779 )  
						
						... 
						
						
						
						* Make Wallet Mist compatible #3282 
* Owners icons on load
* Fix oversized logo on load
* Don't fetch registry twice (even when pending)
* Better logging...
* Better contract view : show if no events // show loading events
* Better decimal typed input
* PR grumble 
						
					 
					
						2016-12-10 01:26:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a73e0a987e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-test-ui  
						
						
						
					 
					
						2016-12-09 18:34:58 +01: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							befcc9cc1a 
							
						 
					 
					
						
						
							
							Cleanups ( #3742 )  
						
						... 
						
						
						
						* Remove unused file
* Combine tx checks into single file
* Move UI components into UI
* DRY links
* Unused rollup config
* Cleanup util paths
* Revert "Move UI components into UI"
This reverts commit 3379e61246cde635c296d31322b71e63395a5cd4.
* Re-apply ~/util/tx move
* Cleanup unused styles 
						
					 
					
						2016-12-09 13:44:10 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3dc943e854 
							
						 
					 
					
						
						
							
							merge master into jr-use-badge-reg  
						
						
						
					 
					
						2016-12-09 13:14:35 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a133e41e16 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-test-ui  
						
						
						
					 
					
						2016-12-09 09:53:55 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f9a24f3c8e 
							
						 
					 
					
						
						
							
							Update babel, fix CI build due to breaking changes ( #3754 )  
						
						... 
						
						
						
						* Update babel to latest version
* Re-add circular deps plugin
* Bump for build
* Fixes for babel build 
						
					 
					
						2016-12-09 02:33:12 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							09334ca3bd 
							
						 
					 
					
						
						
							
							Small fixes to contract ( #3751 )  
						
						... 
						
						
						
						* Fix contracts execution will fallback function
* Fix contract execute modal
* Working execute from Contract
* Don't dupliacet events
* Gas * 1.2 in wallet confirmations 
						
					 
					
						2016-12-09 01:21:51 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1ac3421f33 
							
						 
					 
					
						
						
							
							step to select verification method  
						
						
						
					 
					
						2016-12-09 00:39:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1672cbad7b 
							
						 
					 
					
						
						
							
							factor out SMS-specific logic  
						
						
						
					 
					
						2016-12-09 00:39:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b5b529f8c2 
							
						 
					 
					
						
						
							
							modals/SMSVerification -> modals/Verification  
						
						
						
					 
					
						2016-12-09 00:39:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e536290892 
							
						 
					 
					
						
						
							
							fix linting issues  
						
						
						
					 
					
						2016-12-09 00:38:44 +01:00