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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a2d5c8f5 
							
						 
					 
					
						
						
							
							Merge pull request  #3796  from ethcore/tx-broadcast  
						
						... 
						
						
						
						Avoid broadcasting transactions to peers that send them 
						
					 
					
						2016-12-12 04:13:56 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							32746df706 
							
						 
					 
					
						
						
							
							Add missing ;s  
						
						
						
					 
					
						2016-12-12 02:58:35 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							758744449f 
							
						 
					 
					
						
						
							
							Expose all other RPCs.  
						
						
						
					 
					
						2016-12-12 02:57:19 +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 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							22ac80d98f 
							
						 
					 
					
						
						
							
							Add store for AddAddress ( #3819 )  
						
						... 
						
						
						
						* WIP
* Updated tests
* Final round of fixes
* Header update 
						
					 
					
						2016-12-12 00:38:38 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							4c3dea2a0b 
							
						 
					 
					
						
						
							
							Fix React-Router in i18n locale change ( #3815 )  
						
						... 
						
						
						
						* Routes in routes config => no more react router error message
* Add LocalStorage for Locale Selection
* Ethcore to Parity LTD 
						
					 
					
						2016-12-11 21:03:48 +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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							b56f12adc6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into tx-broadcast  
						
						... 
						
						
						
						Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs 
						
					 
					
						2016-12-11 17:31:56 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							13509a9e83 
							
						 
					 
					
						
						
							
							Fix padding in App, again... ( #3813 )  
						
						
						
					 
					
						2016-12-11 16:49:38 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							36b8e4b6a8 
							
						 
					 
					
						
						
							
							Extended publishing of libraries to npm ( #3786 )  
						
						... 
						
						
						
						* Extended publishing of libraries to npm
* Update source links
* Add some tests before publishing NPM library
* Fix Shapeshift tests 
						
					 
					
						2016-12-11 10:13:34 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b0f1665f11 
							
						 
					 
					
						
						
							
							Notify user on transaction received ( #3782 )  
						
						... 
						
						
						
						* Notify user on new transaction #2556 
* Add routing to account on notification click
* Timeout of notif set to 20s 
						
					 
					
						2016-12-10 23:55:36 +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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							19ca9ad460 
							
						 
					 
					
						
						
							
							Prevent broadcasting transactions to peer that send them.  
						
						
						
					 
					
						2016-12-10 21:22:19 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							70eab0da03 
							
						 
					 
					
						
						
							
							PR grumbles  
						
						
						
					 
					
						2016-12-10 20:29:22 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							89ed76497e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ng-ui-fixes  
						
						
						
					 
					
						2016-12-10 20:23:09 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							0f6681d3e8 
							
						 
					 
					
						
						
							
							Linting issue  
						
						
						
					 
					
						2016-12-10 19:15:45 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							69c0086ada 
							
						 
					 
					
						
						
							
							Better Autocomplete Divider  
						
						
						
					 
					
						2016-12-10 19:14:29 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							2346f29731 
							
						 
					 
					
						
						
							
							Add dividers to AutoComplete  
						
						
						
					 
					
						2016-12-10 18:35:54 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							cd6ab07217 
							
						 
					 
					
						
						
							
							Use the new onClose autocomplete prop  
						
						
						
					 
					
						2016-12-10 17:06:44 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							84116130f6 
							
						 
					 
					
						
						
							
							Add sender balances to contract (exec/deploy)  
						
						
						
					 
					
						2016-12-10 16:58:03 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							d9da8a48ff 
							
						 
					 
					
						
						
							
							Add sender balance in transfer modal  
						
						
						
					 
					
						2016-12-10 16:46:00 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							054b4810d5 
							
						 
					 
					
						
						
							
							Fix wallet data's prop types  
						
						
						
					 
					
						2016-12-10 15:30:39 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							704054ef40 
							
						 
					 
					
						
						
							
							Merge branch 'master' into tx-broadcast  
						
						... 
						
						
						
						Conflicts:
	ethcore/src/client/traits.rs 
						
					 
					
						2016-12-10 15:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							ef93262311 
							
						 
					 
					
						
						
							
							See addresses outside address book + Save them  
						
						
						
					 
					
						2016-12-10 15:19:05 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							e1ade5b375 
							
						 
					 
					
						
						
							
							Maintaining a list of transactions propagated from other peers  
						
						
						
					 
					
						2016-12-10 15:18:44 +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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							82efa2675e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into consistent-id  
						
						
						
					 
					
						2016-12-10 13:36:30 +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 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							5c555aa18f 
							
						 
					 
					
						
						
							
							Fixes error in Transfer modal (mix between props and own property) ( #3788 )  
						
						
						
					 
					
						2016-12-10 01:25:23 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							341777dbb6 
							
						 
					 
					
						
						
							
							Merge pull request  #3743  from ethcore/jg-test-ui  
						
						... 
						
						
						
						Basic UI rendering tests 
						
					 
					
						2016-12-09 23:16:11 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5f1fcf95e0 
							
						 
					 
					
						
						
							
							Make *ID names consistent with std Rust (Id)  
						
						
						
					 
					
						2016-12-09 23:01:43 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							598fd42856 
							
						 
					 
					
						
						
							
							Merge pull request  #3770  from ethcore/jg-execute-gas  
						
						... 
						
						
						
						GasPrice selection for contract execution 
						
					 
					
						2016-12-09 20:24:10 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							45ec84e627 
							
						 
					 
					
						
						
							
							Merge pull request  #3752  from ethcore/jg-subscription-check  
						
						... 
						
						
						
						Allow autoRemove from api.subscribe based on callback return values 
						
					 
					
						2016-12-09 20:16:34 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							b99403740a 
							
						 
					 
					
						
						
							
							Merge pull request  #3773  from ethcore/ng-enhanced-multisig  
						
						... 
						
						
						
						Lower gas usage for creating a Multisig Wallet 
						
					 
					
						2016-12-09 19:15:46 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a73e0a987e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-test-ui  
						
						
						
					 
					
						2016-12-09 18:34:58 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							290a4a40ff 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-subscription-check  
						
						
						
					 
					
						2016-12-09 18:17:36 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							0cbef30508 
							
						 
					 
					
						
						
							
							Unsubscribe on true  
						
						
						
					 
					
						2016-12-09 18:17:31 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							99846e2ad2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-subscription-check  
						
						
						
					 
					
						2016-12-09 18:14:09 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1b0945940b 
							
						 
					 
					
						
						
							
							Test for boolean result before unsubscribe  
						
						
						
					 
					
						2016-12-09 18:14:05 +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 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							ff11634e1d 
							
						 
					 
					
						
						
							
							PR Grumble  
						
						
						
					 
					
						2016-12-09 16:55:43 +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 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c249c51dd3 
							
						 
					 
					
						
						
							
							certification: use BadgeReg to load the contract  
						
						
						
					 
					
						2016-12-09 16:40:45 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							bace05b154 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ng-enhanced-multisig  
						
						
						
					 
					
						2016-12-09 16:40:07 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							caf3a96c19 
							
						 
					 
					
						
						
							
							Add fallback Full Fleshed Wallet if no library  
						
						
						
					 
					
						2016-12-09 16:29:57 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							efee55ae84 
							
						 
					 
					
						
						
							
							Updated Wallet Version ! Now only 500k gas for Wallet creation  
						
						
						
					 
					
						2016-12-09 16:24:11 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							452b8c9c74 
							
						 
					 
					
						
						
							
							split sms & email verification 3rdparty code  
						
						... 
						
						
						
						We might want to bundle the code in `3rdparty`.
React & presentational components don't belong in there. At the
same time, the terms of service are strictly related to the use
of these external services. We decided to not bundle them, but
still keep them in a file called `terms-of-service.js`.
The commit also moves the "how it works" section into the
presentational part in `modals/Verification`. 
						
					 
					
						2016-12-09 16:23:13 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d992c642ff 
							
						 
					 
					
						
						
							
							Adjust to final step on rejected/completed  
						
						
						
					 
					
						2016-12-09 15:55:50 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							63137b1548 
							
						 
					 
					
						
						
							
							Add enhanced Wallet solidity code  
						
						
						
					 
					
						2016-12-09 15:52:28 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d2494d1425 
							
						 
					 
					
						
						
							
							GasPrice selection for contract execution  
						
						
						
					 
					
						2016-12-09 15:43:24 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							6d20592f76 
							
						 
					 
					
						
						
							
							remove certification on Revoke  
						
						
						
					 
					
						2016-12-09 14:06:02 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2582514b58 
							
						 
					 
					
						
						
							
							GasEditor component ( #3750 )  
						
						... 
						
						
						
						* Initial split of component (WIP)
* GasPriceEditor externalised
* Fix lint 
						
					 
					
						2016-12-09 13:44:35 +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 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							bb209424ac 
							
						 
					 
					
						
						
							
							IdentityName flags testing  
						
						
						
					 
					
						2016-12-09 13:36:46 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fd88421e88 
							
						 
					 
					
						
						
							
							store id with certifiers  
						
						
						
					 
					
						2016-12-09 13:35:10 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3dc943e854 
							
						 
					 
					
						
						
							
							merge master into jr-use-badge-reg  
						
						
						
					 
					
						2016-12-09 13:14:35 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4c84cbf1 
							
						 
					 
					
						
						
							
							Theme tests  
						
						
						
					 
					
						2016-12-09 13:03:46 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a94bbea7a5 
							
						 
					 
					
						
						
							
							more user-friendly method selection  
						
						
						
					 
					
						2016-12-09 12:37:36 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							296301e284 
							
						 
					 
					
						
						
							
							Extend tests for TxList  
						
						
						
					 
					
						2016-12-09 10:55:46 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a133e41e16 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-test-ui  
						
						
						
					 
					
						2016-12-09 09:53:55 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9fdb350c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-subscription-check  
						
						
						
					 
					
						2016-12-09 02:34:07 +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 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							6b65a1f872 
							
						 
					 
					
						
						
							
							Merge branch 'master' into jg-subscription-check  
						
						
						
					 
					
						2016-12-09 01:41:44 +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 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							13f962ae01 
							
						 
					 
					
						
						
							
							Attempt to fix ci webpack  
						
						
						
					 
					
						2016-12-09 00:56:12 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							10c356de65 
							
						 
					 
					
						
						
							
							Simplify, consolidate uses between subscription managers  
						
						
						
					 
					
						2016-12-09 00:52:21 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5418c56b01 
							
						 
					 
					
						
						
							
							remove Prepare step  
						
						... 
						
						
						
						The modal got really crowded and the preparation step had
only been shown for fractions of a second anyways. The
"loading" message is now part of the next step. 
						
					 
					
						2016-12-09 00:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dfc445b6d6 
							
						 
					 
					
						
						
							
							fix bugs & linting issues  
						
						
						
					 
					
						2016-12-09 00:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							162420f4c2 
							
						 
					 
					
						
						
							
							send emailHash with request, update ABI  
						
						
						
					 
					
						2016-12-09 00:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0e0f602d5e 
							
						 
					 
					
						
						
							
							pass fields to query into QueryCode  
						
						
						
					 
					
						2016-12-09 00:39:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							052f9258a5 
							
						 
					 
					
						
						
							
							pass fields to query into GatherData  
						
						
						
					 
					
						2016-12-09 00:39:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d3fd71d953 
							
						 
					 
					
						
						
							
							add email-specific contract, helpers, store  
						
						
						
					 
					
						2016-12-09 00:39:15 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							600a7e5ccc 
							
						 
					 
					
						
						
							
							make SMS verification contract general purpose  
						
						
						
					 
					
						2016-12-09 00:39:15 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e536290892 
							
						 
					 
					
						
						
							
							fix linting issues  
						
						
						
					 
					
						2016-12-09 00:38:44 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a84cd9143f 
							
						 
					 
					
						
						
							
							show certifications in accounts list  
						
						
						
					 
					
						2016-12-09 00:36:27 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5862f2a9eb 
							
						 
					 
					
						
						
							
							Certifications: read dappsUrl from state  
						
						
						
					 
					
						2016-12-09 00:34:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e1c5796a5c 
							
						 
					 
					
						
						
							
							fetch certifications in account view  
						
						
						
					 
					
						2016-12-09 00:34:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jannis R 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							409c4adfbf 
							
						 
					 
					
						
						
							
							fetch certifiers from BadgeReg  
						
						
						
					 
					
						2016-12-09 00:34:58 +01:00