Tomasz Drwięga 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							195305ce2e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into td-ui-2  
						
						
						
					 
					
						2017-10-18 16:45:37 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							b1df272f4c 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171018-123105  
						
						
						
					 
					
						2017-10-18 12:35:51 +00:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							51caf97705 
							
						 
					 
					
						
						
							
							Trigger UI build. ( #6817 )  
						
						
						
					 
					
						2017-10-18 14:19:45 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2472a2be0c 
							
						 
					 
					
						
						
							
							Merge branch 'ui-2' into td-ui-2  
						
						
						
					 
					
						2017-10-18 14:13:08 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							9e04be754c 
							
						 
					 
					
						
						
							
							Update dependencies (should fix account)  
						
						
						
					 
					
						2017-10-18 11:51:29 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							62fa1ed524 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171017-174801  
						
						
						
					 
					
						2017-10-17 17:53:06 +00:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							304b067417 
							
						 
					 
					
						
						
							
							Support both versions.  
						
						
						
					 
					
						2017-10-17 18:10:59 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2b58a4eb 
							
						 
					 
					
						
						
							
							Updated dependencies  
						
						
						
					 
					
						2017-10-17 18:02:17 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							a2fe7def1f 
							
						 
					 
					
						
						
							
							Bumped version ( #6809 )  
						
						
						
					 
					
						2017-10-17 16:48:38 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0f8fb62581 
							
						 
					 
					
						
						
							
							Integrate old UI.  
						
						
						
					 
					
						2017-10-17 16:09:43 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							9a62119a82 
							
						 
					 
					
						
						
							
							Updated dependencies  
						
						
						
					 
					
						2017-10-17 12:41:31 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							d852e6b063 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	js/src/views/Signer/components/SignRequest/signRequest.js 
						
					 
					
						2017-10-17 09:55:13 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							9c5b96ccbe 
							
						 
					 
					
						
						
							
							Updated dependencies  
						
						
						
					 
					
						2017-10-17 09:09:54 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a76f768077 
							
						 
					 
					
						
						
							
							Updated dependencies  
						
						
						
					 
					
						2017-10-16 18:06:40 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							9e4c1fe6af 
							
						 
					 
					
						
						
							
							Update warning layout  
						
						
						
					 
					
						2017-10-16 15:51:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							de6066d6b0 
							
						 
					 
					
						
						
							
							Add babel-polyfill entry  
						
						
						
					 
					
						2017-10-16 15:45:30 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							b49d7ee29c 
							
						 
					 
					
						
						
							
							Rebuild after master merge  
						
						
						
					 
					
						2017-10-16 15:20:30 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							8453dda7ef 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	js/package-lock.json
#	js/package.json
#	js/src/api/api.js
#	js/src/api/local/accounts/accounts.js
#	js/src/api/local/localAccountsMiddleware.js
#	js/src/api/local/transactions.js
#	js/src/api/pubsub/signer/signer.js
#	js/src/api/subscriptions/signer.js
#	js/src/api/transport/jsonRpcBase.js
#	js/src/api/transport/middleware.js
#	js/src/api/util/format.js
#	js/src/api/util/format.spec.js
#	js/src/contracts/abi/index.js
#	js/src/contracts/badgereg.js
#	js/src/dapps/tokenreg/Application/application.css
#	js/src/dapps/tokenreg/Application/application.js
#	js/src/modals/CreateWallet/WalletDetails/walletDetails.js
#	js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
#	js/src/modals/CreateWallet/createWalletStore.js
#	js/src/modals/DeployContract/ParametersStep/parametersStep.js
#	js/src/modals/DeployContract/deployContract.js
#	js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
#	js/src/modals/WalletSettings/walletSettings.js
#	js/src/redux/providers/certifications/actions.js
#	js/src/redux/providers/certifications/middleware.js
#	js/src/redux/providers/certifications/reducer.js
#	js/src/redux/providers/requestsActions.js
#	js/src/redux/providers/tokensActions.js
#	js/src/ui/AccountCard/accountCard.css
#	js/src/ui/Balance/balance.js
#	js/src/ui/Balance/balance.spec.js
#	js/src/ui/DappCard/dappCard.js
#	js/src/ui/Form/AddressSelect/addressSelect.js
#	js/src/ui/Form/AddressSelect/addressSelectStore.js
#	js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
#	js/src/ui/Form/TypedInput/typedInput.js
#	js/src/ui/IdentityIcon/identityIcon.js
#	js/src/ui/MethodDecoding/tokenValue.js
#	js/src/util/tx.js
#	js/src/util/wallets.js
#	js/src/util/wallets/consensys-wallet.js
#	js/src/util/wallets/foundation-wallet.js
#	js/src/views/Account/account.js
#	js/src/views/Accounts/List/list.js
#	js/src/views/Contract/Queries/inputQuery.js
#	js/src/views/Contract/Queries/queries.js
#	js/src/views/Contract/contract.js
#	js/src/views/Signer/components/SignRequest/signRequest.css
#	js/src/views/Signer/components/SignRequest/signRequest.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js 
						
					 
					
						2017-10-16 12:41:41 +02:00 
						 
				 
			
				
					
						
							
							
								Afri Schoedon 
							
						 
					 
					
						
						
						
						
							
						
						
							b63c3a66ca 
							
						 
					 
					
						
						
							
							Fix sign data typo, ref  #6737  ( #6750 )  
						
						
						
					 
					
						2017-10-16 10:08:36 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6594e30a 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171013-002644  
						
						
						
					 
					
						2017-10-13 00:31:48 +00:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							f3ea2f354e 
							
						 
					 
					
						
						
							
							v1.9.0 ( #6727 )  
						
						
						
					 
					
						2017-10-12 23:44:02 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							df39f5e7fc 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171012-210804  
						
						
						
					 
					
						2017-10-12 21:19:11 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							78146e903d 
							
						 
					 
					
						
						
							
							Fix badges not showing up ( #6730 )  
						
						... 
						
						
						
						* Fix badges not showing up
* Always fetch meta data first [badges] 
						
					 
					
						2017-10-12 22:17:59 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							7472bc3570 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171012-181858  
						
						
						
					 
					
						2017-10-12 18:24:04 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							3e7b775961 
							
						 
					 
					
						
						
							
							Fix tokens and badges ( #6725 )  
						
						... 
						
						
						
						* Update new token fetching
* Working Certifications Monitoring
* Update on Certification / Revoke
* Fix none-fetched tokens value display
* Fix tests 
						
					 
					
						2017-10-12 20:09:44 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							edbbd42d80 
							
						 
					 
					
						
						
							
							Check vouch status on appId in addition to contentHash ( #6719 )  
						
						... 
						
						
						
						* Check vouch status on appId in addition to contentHash
* Simplify var expansion 
						
					 
					
						2017-10-12 19:28:56 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2319207a 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171011-214450  
						
						
						
					 
					
						2017-10-11 21:49:51 +00:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							0b666f605f 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171011-192355  
						
						
						
					 
					
						2017-10-11 19:29:28 +00:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7feb82c242 
							
						 
					 
					
						
						
							
							Display vouched overlay on dapps ( #6710 )  
						
						... 
						
						
						
						* Remove .only
* Add vouch overlays to dapps
* Cleanup address
* Only run where we have a contentHash
* GitLab kickstart 
						
					 
					
						2017-10-11 21:05:50 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							34c65f60ef 
							
						 
					 
					
						
						
							
							Fix estimate gas if from is not provided. ( #6714 )  
						
						
						
					 
					
						2017-10-11 21:05:38 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							df19b8df69 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171011-183646  
						
						
						
					 
					
						2017-10-11 18:43:16 +00:00 
						 
				 
			
				
					
						
							
							
								maciejhirsz 
							
						 
					 
					
						
						
						
						
							
						
						
							0c86357187 
							
						 
					 
					
						
						
							
							Emulate signer pubsub on public node  
						
						
						
					 
					
						2017-10-11 16:21:44 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb845a05c 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171011-121439  
						
						
						
					 
					
						2017-10-11 12:19:40 +00:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f238c97c6f 
							
						 
					 
					
						
						
							
							Fix asciiToHex for characters < 0x10 ( #6702 )  
						
						
						
					 
					
						2017-10-11 13:58:40 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9b3b4729 
							
						 
					 
					
						
						
							
							Fix default values for address input ( #6701 )  
						
						
						
					 
					
						2017-10-11 13:57:06 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2bfb510554 
							
						 
					 
					
						
						
							
							Allow sign display of markdown ( #6707 )  
						
						
						
					 
					
						2017-10-11 13:56:13 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							afb9647f0d 
							
						 
					 
					
						
						
							
							Update lint  
						
						
						
					 
					
						2017-10-09 14:42:26 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							c116e064d8 
							
						 
					 
					
						
						
							
							Merge master  
						
						
						
					 
					
						2017-10-09 14:27:59 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							dbd1976fc1 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171009-121402  
						
						
						
					 
					
						2017-10-09 12:19:46 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							8d1964bc3b 
							
						 
					 
					
						
						
							
							Fix wallet view ( #6597 )  
						
						... 
						
						
						
						* Add safe fail for empty logs
* Filter transactions
* Add more logging
* Fix Wallet Creation and wallet tx list
* Remove logs
* Prevent selecting twice same wallet owner
* Fix tests
* Remove unused props
* Remove unused props 
						
					 
					
						2017-10-09 13:11:18 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							439eb294bb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-10-09 10:23:21 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							ca6d5660c1 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171008-172308  
						
						
						
					 
					
						2017-10-08 17:28:31 +00:00 
						 
				 
			
				
					
						
							
							
								Afri Schoedon 
							
						 
					 
					
						
						
						
						
							
						
						
							360ecd3728 
							
						 
					 
					
						
						
							
							Add Musicoin and MCIP-3 UBI hardfork.  ( #6621 )  
						
						... 
						
						
						
						* Add musicoin chain spec.
* Add musicoin to parity node
* Add musicoin to the wallet
* Add i18n for musicoin
* Align musicoin chain spec with 1.8, ref #6134 
* Update musicoin bootnodes
* Prepare MCIP-3 in musicoin chain spec.
* Update musicoin chain spec with contract addresses for MCIP-3
* Extend ethash params by MCIP-3
* Fix musicoin chain spec json
* Use U256 for block rewards.
* Update musicoin registrar
* Fix merge leftovers
* Update musicoin chain spec for latest master
* Bestow MCIP-3 block reward(s).
* Update musicoin registry once and for all
* Align MCIP-3 block reward with go implementation
* Remove mcip3 test chain spec from repository
* Update MCIP-3 block rewards
* Musicoin homestead transition is at 1_150_000
* Expect mcip3 transtion to be properly defined in chain spec.
* Panic handling for mcip to default to regular block rewards if not specified
* Giving mcip3 rewards a useful default value.
* Fix ethjson tests.
* Update musicoin chain spec
* Fix tests 0:)
* Add musicoin mcip3 era test spec.
* Update musicoin chain spec(s)
* Add tests for mcip3 era block rewards
* Fix tests
* Disable byzantium for musicoin
* Pass miner reward to the tracer.
* Allow modifying blockreward in MCIP-3 transition. 
						
					 
					
						2017-10-08 18:17:59 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							0be532640a 
							
						 
					 
					
						
						
							
							SyncWarning store  
						
						
						
					 
					
						2017-10-05 15:52:44 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							4f082da02b 
							
						 
					 
					
						
						
							
							Lint fixes  
						
						
						
					 
					
						2017-10-05 15:26:20 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							21c95bbec5 
							
						 
					 
					
						
						
							
							Update after merge  
						
						
						
					 
					
						2017-10-05 15:04:45 +02:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							3f520b864b 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171005-120001  
						
						
						
					 
					
						2017-10-05 12:04:49 +00:00 
						 
				 
			
				
					
						
							
							
								GitLab Build Bot 
							
						 
					 
					
						
						
						
						
							
						
						
							c7ea25227a 
							
						 
					 
					
						
						
							
							[ci skip] js-precompiled 20171005-114154  
						
						
						
					 
					
						2017-10-05 11:46:58 +00:00 
						 
				 
			
				
					
						
							
							
								Nicolas Gotchac 
							
						 
					 
					
						
						
						
						
							
						
						
							fb65732076 
							
						 
					 
					
						
						
							
							Fix Token Transfer in transaction list ( #6589 )  
						
						... 
						
						
						
						* Fix Token Transfer in TX LIST
* Add TokenReg logs logging 
						
					 
					
						2017-10-05 13:03:31 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							e8b418ca03 
							
						 
					 
					
						
						
							
							Update jsonrpc dependencies and rewrite dapps to futures. ( #6522 )  
						
						... 
						
						
						
						* Bump version.
* Fix RPC crate.
* Fix BoxFuture in crates.
* Compiles and passes tests!
* Get rid of .boxed()
* Fixing issues with the UI.
* Remove minihttp. Support threads.
* Reimplement files serving to do it in chunks.
* Increase chunk size.
* Remove some unecessary copying.
* Fix tests.
* Fix stratum warning and ipfs todo.
* Switch to proper branch of jsonrpc.
* Update Cargo.lock.
* Update docs.
* Include dapps-glue in workspace.
* fixed merge artifacts
* Fix test compilation. 
						
					 
					
						2017-10-05 12:35:01 +02:00