Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7f4a7abf49 
							
						 
					 
					
						
						
							
							Ui 2 provider for dapps ( #5799 )  
						
						 
						
						... 
						
						
						
						* Import web3Provider
* Import api
* {Transport,Provider}/Ws -> WsSecure
* PostMessage provider with filters
* PromiseWrapper -> PromiseProvider 
						
					 
					
						2017-06-08 17:14:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							6a480ffb5b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						
						
					 
					
						2017-06-06 09:35:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							fd3c8bced7 
							
						 
					 
					
						
						
							
							UI2 fixes for Signer popup ( #5711 )  
						
						 
						
						... 
						
						
						
						* Fix new origin shape
* Pass input types through (<input /> tag)
* Update build 
						
					 
					
						2017-05-30 13:41:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d888190637 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	js/src/modals/FirstRun/Welcome/welcome.js 
						
					 
					
						2017-05-30 10:45:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							45c6cc6ac0 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						
						
					 
					
						2017-05-24 14:09:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							368e3d1f51 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						
						
					 
					
						2017-05-22 11:50:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							602115d81e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	js/src/shell/Connection/connection.js
#	js/src/ui/Icons/index.js
#	js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js 
						
					 
					
						2017-05-19 14:55:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							6978e38752 
							
						 
					 
					
						
						
							
							style-fix ( #5649 )  
						
						 
						
						
						
					 
					
						2017-05-18 12:33:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							673cde3c0b 
							
						 
					 
					
						
						
							
							Ui 2 cleanups (unused components, shared assets) ( #5636 )  
						
						 
						
						... 
						
						
						
						* Remove unused components
* Move to dapp/index.js
* Move assets to @parity/shared 
						
					 
					
						2017-05-16 16:01:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							95f6f70d8f 
							
						 
					 
					
						
						
							
							Ui 2 complete MUI removal ( #5635 )  
						
						 
						
						... 
						
						
						
						* Convert DateTime input component
* Remove muiTheme context 
						
					 
					
						2017-05-16 14:46:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							31be9d25f3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#
js/src/shell/Signer/components/TransactionPendingFormConfirm/transaction
PendingFormConfirm.js
#	js/src/ui/Container/Title/title.js
#	js/src/views/Application/Snackbar/snackbar.js
#	js/src/views/Status/Peers/peers.js 
						
					 
					
						2017-05-16 13:30:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							c27d96a4f1 
							
						 
					 
					
						
						
							
							Ui 2 additional MUI replacements ( #5623 )  
						
						 
						
						... 
						
						
						
						* Loader spinner
* Progressbar conversion
* Update Progress
* Transfer operational again
* Remove List/ListItem from features
* Remove extra animation
* Remove iconButton
* Remove underline(input to be replaced)
* Convert Sort to Popup
* Remove unused AutoComplete component
* Simplify ModalBox
* Allow empty Actionbar
* Adjust shapeshift icon
* Simplify MUI theme (before removal)
* Update tests 
						
					 
					
						2017-05-15 14:49:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							5da7c32bdf 
							
						 
					 
					
						
						
							
							Ui 2 radios & imports ( #5609 )  
						
						 
						
						... 
						
						
						
						* Remove mui IconButton
* Token type selection
* Convert RadioButtons
* RadioButtons consistency
* Import @parity/ui
* Import @parity/ui
* Explicit name for RadioButtons
* Convert to semantic Radio 
						
					 
					
						2017-05-12 12:06:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							b1a390983b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						
						
					 
					
						2017-05-11 09:57:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							566b6a1967 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	js/src/shared/redux/middleware.js
#	js/src/shared/redux/providers/registry/middleware.js
#	js/src/shell/Application/application.js
#	js/src/ui/Actionbar/actionbar.js
#	js/src/ui/Button/button.js
#	js/src/ui/Form/AddressSelect/addressSelect.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/MethodDecoding/methodDecoding.js 
						
					 
					
						2017-05-10 17:29:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c4e5b36c 
							
						 
					 
					
						
						
							
							Ui 2 depends & fixes ( #5590 )  
						
						 
						
						... 
						
						
						
						* File paths
* Align balance overlays & sizes
* Copy works as expected
* Re-arrange imports
* Icon props
* Move packages to their original dependencies
* Dependencies to packages
* Update test babel overrides 
						
					 
					
						2017-05-10 13:23:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							4c28ef40b7 
							
						 
					 
					
						
						
							
							Ui 2 shared package (redux, mobx, utils) ( #5579 )  
						
						 
						
						... 
						
						
						
						* Create @parity/shared
* Move ~/util to shared/util
* Move ~/contracts to shared/contracts
* Move ~/config to shared/config
* Move ~/environment to shared/environment
* Updated paths
* Move ~/mobx to shared/mobx
* Move ~/redux to shared/redux
* Add shared to test babel compile 
						
					 
					
						2017-05-09 12:01:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d91fae4e54 
							
						 
					 
					
						
						
							
							UI 2 tests & webpack dapp build updates/fixes ( #5561 )  
						
						 
						
						... 
						
						
						
						* Tests are executing again
* Fix tests
* Add missing contextTypes
* IdentityIcon without Connect()
* Update ~/ui tests
* Update spec locations
* Filename case
* Fix playground dapp build 
						
					 
					
						2017-05-05 15:14:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							9b025cf8c1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	js/src/views/ContractDevelop/store.js 
						
					 
					
						2017-05-05 10:08:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f07c3329 
							
						 
					 
					
						
						
							
							Mui-be-gone-3 ( #5546 )  
						
						 
						
						... 
						
						
						
						* mui-be-gone
* second
* mui-be-gone-3
* updates
* ups and ups
* oops
* Revert to changes in removed files from ui-2
* Revert to stateless component 
						
					 
					
						2017-05-04 11:03:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f34a0346bc 
							
						 
					 
					
						
						
							
							Cleanup ~/util ( #5553 )  
						
						 
						
						
						
					 
					
						2017-05-04 10:40:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2f9e05830b 
							
						 
					 
					
						
						
							
							Create ~/ui/Form/Checkbox component ( #5543 )  
						
						 
						
						
						
					 
					
						2017-05-03 13:37:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							c39952a727 
							
						 
					 
					
						
						
							
							Mui be gone 2 ( #5540 )  
						
						 
						
						... 
						
						
						
						* mui-be-gone
* second
* Revert ~/dapp mui removal
* Overlay text color 
						
					 
					
						2017-05-03 12:25:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1c2580b4a6 
							
						 
					 
					
						
						
							
							Ui 2 shell updates ( #5541 )  
						
						 
						
						... 
						
						
						
						* Stateless components
* Adjust borders
* Stateless for status
* Externalise link colors
* css lint
* stateless
* Create ui/IconCache, replacing redux
* Update Signer buttons
* Requests background
* Adjust request styling
* Stateless components
* ParityBar background alignment
* Shell updates
* Remove Tooltip 
						
					 
					
						2017-05-03 10:46:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							e7484d07aa 
							
						 
					 
					
						
						
							
							Ui 2 styling adjustments ( #5534 )  
						
						 
						
						... 
						
						
						
						* Stateless components
* Adjust borders
* Stateless for status
* Externalise link colors
* css lint
* stateless
* Create ui/IconCache, replacing redux
* Update Signer buttons
* Requests background
* Adjust request styling
* Stateless components
* ParityBar background alignment 
						
					 
					
						2017-05-02 17:50:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							b57e8f6f0d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						
						
					 
					
						2017-05-02 13:40:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							278dfcdcc5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/ui-2' into ui-2  
						
						 
						
						
						
					 
					
						2017-04-28 11:26:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							4c04b61f8a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						 
						
						
						
					 
					
						2017-04-28 11:26:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							37dd488579 
							
						 
					 
					
						
						
							
							UI 2 component & modal splits ( #5525 )  
						
						 
						
						... 
						
						
						
						* Remove mui from Actionbar
* Add semantic-ui to vendor.js
* Stateless components
* Multi-item spacing
* Stateless components
* Stateless components
* Default font
* Context passing
* Move Vault modals into Vault dapp
* Move modals to their respective views 
						
					 
					
						2017-04-28 11:21:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d16cfc736d 
							
						 
					 
					
						
						
							
							UI 2 styling ( #5518 )  
						
						 
						
						... 
						
						
						
						* [ci skip] js-precompiled 20170426-110849
* export topNavigate function
* Stateless components in shell
* Connection icon fill
* Parity overlay only in dapps
* Additional buttons
* Adjust toolbar styles
* Adjust ParityBar button styling
* Complete icon conversion 
						
					 
					
						2017-04-27 13:28:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							aabf08fd75 
							
						 
					 
					
						
						
							
							LinearProgress -> Progress  
						
						 
						
						
						
					 
					
						2017-04-26 16:23:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							bdcf2a9c61 
							
						 
					 
					
						
						
							
							Fix CSS overrides  
						
						 
						
						
						
					 
					
						2017-04-26 14:22:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							2badd9778b 
							
						 
					 
					
						
						
							
							Semantic ui ( #5507 )  
						
						 
						
						... 
						
						
						
						* semantic addition
* semantic addition
* semantic-ui into @parity/ui dependency
* Merge updates
* Update missing imports to use ~
* Clean @parity modules with clean
* Updated yarn.lock 
						
					 
					
						2017-04-26 13:12:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2f0ce06cc1 
							
						 
					 
					
						
						
							
							Ui 2 shell ( #5510 )  
						
						 
						
						... 
						
						
						
						* Split application into ~/shell
* reset.css back to index 
						
					 
					
						2017-04-26 10:56:31 +02:00