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 
							
						 
					 
					
						
						
						
						
							
						
						
							665998e797 
							
						 
					 
					
						
						
							
							Ui 2 mui to sui conversion ( #5633 )  
						
						... 
						
						
						
						* Split chip rendering from input
* Slider component
* Render Chip without MUI
* Adjust InputChip styling
* Remove mui chip input
* Remove mui-chip-input from build
* Convert input to sui 
						
					 
					
						2017-05-16 12:25:47 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							0f1a857576 
							
						 
					 
					
						
						
							
							Add peer management to the Status tab ( #5566 )  
						
						... 
						
						
						
						* Add peer management to the Status tab
* Fix propTypes issue 
						
					 
					
						2017-05-16 11:01:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							879195397e 
							
						 
					 
					
						
						
							
							Decrypting for external accounts. ( #5581 )  
						
						
						
					 
					
						2017-05-15 18:59:41 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							9bc82543ee 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-05-12 17:19:50 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7cdddd344b 
							
						 
					 
					
						
						
							
							Ui 2 remove mui from views & shell ( #5613 )  
						
						... 
						
						
						
						* Stepper from semantic-ui
* Tabs component
* ui/Tabs in loadContract
* Adapt Dropdown events
* Remove direct use of semantic-ui
* Remove IconButton & Subheader
* Remove IconMenu
* ui/List & List.Item
* Be explicit in context props 
						
					 
					
						2017-05-12 17:06:53 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							83a13ee0e6 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170512-102851  
						
						
						
					 
					
						2017-05-12 10:32:43 +00:00 
						 
				 
			
				
					
						
							
							
								Craig O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							662a8317a5 
							
						 
					 
					
						
						
							
							run-clean ( #5607 )  
						
						
						
					 
					
						2017-05-12 12:10:24 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							78b6de55b3 
							
						 
					 
					
						
						
							
							Ui 2 Select component conversion ( #5598 )  
						
						... 
						
						
						
						* Remove mui/Paper from PasswordManager
* Aliasses for @parity packages
* Remove mui/Card from contract queries
* Toggle component replacement (mui-only)
* Semantic-ui toggle component
* LabelComponent warpper for Toggle
* Convert Selectors
* Test fixes
* Fix case 
						
					 
					
						2017-05-11 14:02:27 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							b1a390983b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-05-11 09:57:39 +02:00 
						 
				 
			
				
					
						
							
							
								Craig O'Connor 
							
						 
					 
					
						
						
						
						
							
						
						
							85cf93e65d 
							
						 
					 
					
						
						
							
							Merge pull request  #5559  from paritytech/menu  
						
						... 
						
						
						
						dropdowns 
						
					 
					
						2017-05-10 23:48:40 -04:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							2b30e0b5e0 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170510-155435  
						
						
						
					 
					
						2017-05-10 15:58:15 +00:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7c78dff386 
							
						 
					 
					
						
						
							
							Updates after merge (last remaining middleware nigglies)  
						
						
						
					 
					
						2017-05-10 17:50:23 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							8146cbdae7 
							
						 
					 
					
						
						
							
							Check pending request on Node local transactions ( #5564 )  
						
						... 
						
						
						
						* Check pending request on Node
* Linting
* Liting
* Fix tests 
						
					 
					
						2017-05-10 17:33:53 +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 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							710339d0a8 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170510-143939  
						
						
						
					 
					
						2017-05-10 14:43:30 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							eff4cde738 
							
						 
					 
					
						
						
							
							Add tooltips capabilities to buttons ( #5562 )  
						
						... 
						
						
						
						Add tooltips for buttons on ActionBar if text not visible 
						
					 
					
						2017-05-10 16:19:01 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							3e86b2e666 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170510-134918  
						
						
						
					 
					
						2017-05-10 13:52:55 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							0a16c350d1 
							
						 
					 
					
						
						
							
							Can't deploy without compiling Contract ( #5593 )  
						
						
						
					 
					
						2017-05-10 15:24:24 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							c58c253cbf 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170510-131400  
						
						
						
					 
					
						2017-05-10 13:17:46 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							5baccafb23 
							
						 
					 
					
						
						
							
							Add a warning when node is syncing ( #5565 )  
						
						... 
						
						
						
						* Add a warning when node is syncing
* Linting
* Linting
* PR Grumbles 
						
					 
					
						2017-05-10 15:02:47 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							076b602343 
							
						 
					 
					
						
						
							
							Update registry middleware ( #5585 )  
						
						
						
					 
					
						2017-05-10 14:42:26 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							860d6c01ed 
							
						 
					 
					
						
						
							
							Set block condition to BigNumber in MethodDecoding ( #5592 )  
						
						... 
						
						
						
						* Set block condition to BigNumber in MethodDecoding
* Add gt(0) 
						
					 
					
						2017-05-10 14:41:52 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							35a5c4787b 
							
						 
					 
					
						
						
							
							Revert to original label (everything lowercase atm UI-wide)  
						
						
						
					 
					
						2017-05-10 14:38:28 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7799883adc 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
					 
					
						2017-05-10 14:31:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							c3ee7f04e5 
							
						 
					 
					
						
						
							
							Simplify Dropdown, pass label correctly  
						
						
						
					 
					
						2017-05-10 14:27:04 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1c262b2172 
							
						 
					 
					
						
						
							
							Merge branch 'ui-2' into menu  
						
						
						
					 
					
						2017-05-10 13:47:36 +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 
						 
				 
			
				
					
						
							
							
								oconnorct1 
							
						 
					 
					
						
						
						
						
							
						
						
							4944f59118 
							
						 
					 
					
						
						
							
							style fix  
						
						
						
					 
					
						2017-05-09 21:13:04 -04:00 
						 
				 
			
				
					
						
							
							
								oconnorct1 
							
						 
					 
					
						
						
						
						
							
						
						
							a0929c4c90 
							
						 
					 
					
						
						
							
							style fix  
						
						
						
					 
					
						2017-05-09 21:12:41 -04:00 
						 
				 
			
				
					
						
							
							
								oconnorct1 
							
						 
					 
					
						
						
						
						
							
						
						
							66843a349d 
							
						 
					 
					
						
						
							
							SemanticButton  
						
						
						
					 
					
						2017-05-09 21:08:05 -04:00 
						 
				 
			
				
					
						
							
							
								oconnorct1 
							
						 
					 
					
						
						
						
						
							
						
						
							f014891288 
							
						 
					 
					
						
						
							
							Merge branch 'menu' of github.com:paritytech/parity into menu  
						
						
						
					 
					
						2017-05-09 21:07:10 -04:00 
						 
				 
			
				
					
						
							
							
								oconnorct1 
							
						 
					 
					
						
						
						
						
							
						
						
							19d97136a5 
							
						 
					 
					
						
						
							
							grumbles  
						
						
						
					 
					
						2017-05-09 21:06:11 -04:00 
						 
				 
			
				
					
						
							
							
								oconnorct1 
							
						 
					 
					
						
						
						
						
							
						
						
							68cbd87bc2 
							
						 
					 
					
						
						
							
							grumbles  
						
						
						
					 
					
						2017-05-09 21:04:56 -04:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							861cbb874b 
							
						 
					 
					
						
						
							
							Ui 2 ui ( #5582 )  
						
						... 
						
						
						
						Ui 2 small UI fixes 
						
					 
					
						2017-05-09 17:31:48 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7623455cb6 
							
						 
					 
					
						
						
							
							Snackbar update  
						
						
						
					 
					
						2017-05-09 14:20:36 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							9f91c0490c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-05-09 14:10:24 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7785fa3938 
							
						 
					 
					
						
						
							
							Fix JS header (// comments for JS)  
						
						
						
					 
					
						2017-05-09 14:06:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							36b437270b 
							
						 
					 
					
						
						
							
							Remove Card completely  
						
						
						
					 
					
						2017-05-09 14:04:58 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							518b6e647b 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170509-115458  
						
						
						
					 
					
						2017-05-09 11:58:48 +00:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							c37c579585 
							
						 
					 
					
						
						
							
							Merge branch 'ui-2' into menu  
						
						
						
					 
					
						2017-05-09 13:50:47 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							40744d1bd2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-05-09 13:47:29 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							9947493977 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20170509-112134  
						
						
						
					 
					
						2017-05-09 11:25:44 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							e5ff36f1f1 
							
						 
					 
					
						
						
							
							Load the sources immediatly in Contract Dev ( #5575 )  
						
						
						
					 
					
						2017-05-09 12:56:35 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							d83d938ee3 
							
						 
					 
					
						
						
							
							Remove formal verification messages ( #5574 )  
						
						
						
					 
					
						2017-05-09 12:56:20 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							c5116e5049 
							
						 
					 
					
						
						
							
							Fix event params decoding when no names for parameters  #5409  ( #5567 )  
						
						
						
					 
					
						2017-05-09 12:56:08 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							1288b4b28f 
							
						 
					 
					
						
						
							
							Do not convert to Dates twice ( #5563 )  
						
						... 
						
						
						
						* Don't convert Dates twice
* Take string dates into account 
						
					 
					
						2017-05-09 12:55:52 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							df9096df80 
							
						 
					 
					
						
						
							
							Fix Multisig wallet settings ( #5560 )  
						
						... 
						
						
						
						* Improve add/remove owner in Wallet (use changeOwner)
* fix linting 
						
					 
					
						2017-05-09 12:55:35 +02:00