Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							aaeb5d4cd7 
							
						 
					 
					
						
						
							
							Fixes for parity-extension ( #6990 )  
						
						... 
						
						
						
						* Fix extension support.
* Fix environment variables on windows.
* Fix package-lock.json
* Fix build issues. 
						
					 
					
						2017-11-09 13:20:26 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							152e56c5d9 
							
						 
					 
					
						
						
							
							Don't add {css,js}.map from dapps ( #6931 )  
						
						
						
					 
					
						2017-10-30 14:36:37 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f282823e78 
							
						 
					 
					
						
						
							
							Shell updates (bonds, updated Dapps) ( #6897 )  
						
						... 
						
						
						
						* Remove stage-0
* Re-add stage-0 for `export default from './xyz';`
* Add background loading image
* Add window.isParity for parity-specific actions
* inject bonds (temporary)
* Remove loading text overlay
* Remove background around logo
* Remove debug log
* Fix account selection (correct component used)
* Update with changed dapp dependencies
* Add oo7 to list of babel node_module targets
* injectObjects -> onDappLoad 
						
					 
					
						2017-10-25 16:54:41 +02:00 
						 
				 
			
				
					
						
							
							
								David Dorgan 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf1e6afcc 
							
						 
					 
					
						
						
							
							Revert "Sync parity-ewf with parity"  
						
						... 
						
						
						
						This reverts commit f7ba063b22 
						
					 
					
						2017-10-24 13:31:58 +01:00 
						 
				 
			
				
					
						
							
							
								David Dorgan 
							
						 
					 
					
						
						
						
						
							
						
						
							f7ba063b22 
							
						 
					 
					
						
						
							
							Sync parity-ewf with parity  
						
						
						
					 
					
						2017-10-24 12:31:50 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							de6066d6b0 
							
						 
					 
					
						
						
							
							Add babel-polyfill entry  
						
						
						
					 
					
						2017-10-16 15:45:30 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							413da805b5 
							
						 
					 
					
						
						
							
							Update status styling  
						
						
						
					 
					
						2017-09-19 14:28:33 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2bcdb07b62 
							
						 
					 
					
						
						
							
							Run electron (dev) from build directory  
						
						
						
					 
					
						2017-09-11 10:37:09 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							be56a06790 
							
						 
					 
					
						
						
							
							Basic electron interface  
						
						
						
					 
					
						2017-08-30 11:59:38 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							317addb7e3 
							
						 
					 
					
						
						
							
							Remove ~ alias  
						
						
						
					 
					
						2017-08-09 09:36:40 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							28e2383778 
							
						 
					 
					
						
						
							
							Update build  
						
						
						
					 
					
						2017-08-04 16:23:54 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							49a4499d52 
							
						 
					 
					
						
						
							
							Update webpack  
						
						
						
					 
					
						2017-08-04 14:28:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							44a7c3d0b6 
							
						 
					 
					
						
						
							
							Re-add modules path  
						
						
						
					 
					
						2017-08-04 13:50:51 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf851ad91 
							
						 
					 
					
						
						
							
							Really excluse node_modules  
						
						
						
					 
					
						2017-08-04 13:44:38 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							2df7a5fe51 
							
						 
					 
					
						
						
							
							Cheap source-maps for development  
						
						
						
					 
					
						2017-08-04 13:26:56 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							0892bc90ed 
							
						 
					 
					
						
						
							
							Update sourcemap types  
						
						
						
					 
					
						2017-08-04 13:24:03 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							e7641e38d8 
							
						 
					 
					
						
						
							
							Update build  
						
						
						
					 
					
						2017-08-03 16:50:35 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							34f9e69bff 
							
						 
					 
					
						
						
							
							Update file-loader  
						
						
						
					 
					
						2017-08-03 13:30:17 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							cbd32035c8 
							
						 
					 
					
						
						
							
							Cleanup webpack config  
						
						
						
					 
					
						2017-08-02 08:44:56 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							aa95c09a88 
							
						 
					 
					
						
						
							
							Re-add happypack for babel builds  
						
						
						
					 
					
						2017-08-01 18:11:35 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							1d96ba7dfc 
							
						 
					 
					
						
						
							
							Update  
						
						
						
					 
					
						2017-08-01 17:35:17 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							67db54d765 
							
						 
					 
					
						
						
							
							Update webpack config for semantic  
						
						
						
					 
					
						2017-08-01 15:51:03 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							dea25b194e 
							
						 
					 
					
						
						
							
							Update build (yes, external dapps launch)  
						
						
						
					 
					
						2017-08-01 15:36:32 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							52828c0444 
							
						 
					 
					
						
						
							
							Update inject  
						
						
						
					 
					
						2017-08-01 15:04:07 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							f8bf4a1522 
							
						 
					 
					
						
						
							
							Update build to pull from external repos  
						
						
						
					 
					
						2017-08-01 14:41:13 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							317a59d550 
							
						 
					 
					
						
						
							
							Build update  
						
						
						
					 
					
						2017-08-01 08:02:28 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							0e7c115b73 
							
						 
					 
					
						
						
							
							Update build  
						
						
						
					 
					
						2017-07-31 22:53:29 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7f6e2a3a35 
							
						 
					 
					
						
						
							
							Build with parallel-webpack  
						
						
						
					 
					
						2017-07-31 17:08:51 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							fdebeaf95b 
							
						 
					 
					
						
						
							
							Update webpack  
						
						
						
					 
					
						2017-07-31 13:58:18 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							58c3948316 
							
						 
					 
					
						
						
							
							Remove extra options  
						
						
						
					 
					
						2017-07-31 12:06:21 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							6a51ff22d0 
							
						 
					 
					
						
						
							
							Cleanup unused vars  
						
						
						
					 
					
						2017-07-31 11:24:54 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							6349da22ac 
							
						 
					 
					
						
						
							
							Fix NODE_ENV=production build  
						
						
						
					 
					
						2017-07-31 11:24:25 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							abb62d5c2a 
							
						 
					 
					
						
						
							
							Ui 2 parity build fixes ( #6182 )  
						
						... 
						
						
						
						* Update API reference
* Deprecation warning
* Add missing parity-reactive-ui
* Add dapps to packages/dapps
* Add parity.js dependency
* Update with js-ui with compiled bundle.js 
						
					 
					
						2017-07-28 17:56:48 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							4000ec681f 
							
						 
					 
					
						
						
							
							Ui 2 js build fixes ( #6176 )  
						
						... 
						
						
						
						* Update API reference
* Deprecation warning
* Add missing parity-reactive-ui
* Add dapps to packages/dapps
* Add parity.js dependency 
						
					 
					
						2017-07-28 15:37:58 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a1b8fabd99 
							
						 
					 
					
						
						
							
							Ui 2 packages ( #6169 )  
						
						... 
						
						
						
						* Ensure all internal dapps have package.json
* Update compilation rules
# Conflicts:
#	js/src/redux/providers/balancesActions.js
#	js/src/ui/Form/TypedInput/typedInput.js
* Remove SignerIcon
* Cleanup providers
* Enable request of new token from app
* Queue when no token (yet)
* Add location & token request
* Cleanup send logic
* Request token
* Request comms token
* Remove yarn.lock (not updated)
* Update version to 1.99.99 (publish prepare)
* Move jsonrpc to seperate repo
* Update jsonrpc references
* Update repo info
* Update repo info
* Additional debugging
* Update repo references
* Move ABI to js-abi repo
* Move webWorker to shared
* Fix package reference
* Worker location
* Move js-ui & js-shared components
* Update file references
* Update package repo locations
* Remove debugging info
* Cleanup debug
* Split api into own repo
* Update api local references
* Update app loading
* Update dependencies
* Allow serving of /parity-utils
* Error when EthereumProvider has not been attached
* Use inject.js
* Correct appId retrieval 
						
					 
					
						2017-07-28 10:25:34 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a068f72f08 
							
						 
					 
					
						
						
							
							Ui 2 pubsub components ( #6152 )  
						
						... 
						
						
						
						* Remove Application.orig from merge
* Disable i18n extraction for development
* Retrieve blockNumber via pubsub
* Chain via pubsub
* StatusIndicator with health
* WIP
* WIP
* s/BlockStatus/BlockNumber/
* Adjust BlockNumber display
* Cleanup debug
* Fix statusbar indicator
* NetPeers component
* Add BlockTimestamp
* Export statics on observer
* Cleanup debug logs
* Update references 
						
					 
					
						2017-07-26 16:54:47 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							09e40c2f0d 
							
						 
					 
					
						
						
							
							Upgrade webpack  
						
						
						
					 
					
						2017-07-26 12:08:34 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							49fdd23d58 
							
						 
					 
					
						
						
							
							Ui 2 move to packages/* ( #6113 )  
						
						... 
						
						
						
						* Move secureApi to shell
* Extract isTestnet test
* Use mobx + subscriptions for status
* Re-add status indicator
* Add lerna
* Move intial packages to js/packages
* Move 3rdparty/{email,sms}-verification to correct location
* Move package.json & README to library src
* Move tests for library packages
* Move views & dapps to packages
* Move i18n to root
* Move shell to actual src (main app)
* Remove ~ references
* Change ~ to root (explicit imports)
* Finalise convert of ~
* Move views into dapps as well
* Move dapps to packages/
* Fix references
* Update css
* Update test spec locations
* Update tests
* Case fix
* Skip flakey tests
* Update enzyme
* Skip previously ignored tests
* Allow empty api for hw
* Re-add theme for embed 
						
					 
					
						2017-07-21 15:46:53 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							36f94fde05 
							
						 
					 
					
						
						
							
							Ui 2 package upgrades ( #6076 )  
						
						... 
						
						
						
						* Upgrade to React 15.6
* Import PropTypes from prop-types
* Update package.json
* UI version in built version
* Cleanup /api/health status failures
* Check reponse.ok
* Add icons to view dapps
* Adjust layout for dapps
* Slightly darker balance background
* Adjust shadows 
						
					 
					
						2017-07-17 18:37:33 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							3d24ae0981 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-07-10 17:36:55 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							204fe44b29 
							
						 
					 
					
						
						
							
							Add new md tnc ( #5937 )  
						
						... 
						
						
						
						* Add new md tnc
* Skip markdown import in test 
						
					 
					
						2017-07-10 13:23:59 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							8798ed4499 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-06-28 14:27:25 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							0f41121556 
							
						 
					 
					
						
						
							
							Empty local middleware, until explicitly requested ( #5912 )  
						
						... 
						
						
						
						* Empty local middleware, until explicitly requested
* Remove previous empty overrides (unneeded now)
* Re-add over-zealous keyethereum removal 
						
					 
					
						2017-06-23 13:40:16 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							72f3576c78 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-06-23 11:48:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cd60987b 
							
						 
					 
					
						
						
							
							Adjust keyethereum/secp256 aliasses ( #5903 )  
						
						... 
						
						
						
						* Alias keyethereum to empty for libraries/npm
* Alias long-standing vertx warning to empty
* Alias secp256k1
* remove package-lock.json (not active atm) 
						
					 
					
						2017-06-22 13:29:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							a60c5527c7 
							
						 
					 
					
						
						
							
							Keyethereum fs dependency ( #5902 )  
						
						... 
						
						
						
						* Set process.browser
* Empty fs module (keyethereum dep)
* !== 
						
					 
					
						2017-06-22 11:49:44 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							121b742482 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	Cargo.lock
#	ethcore/src/evm/instructions.rs
#	js/package.json
#	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js 
						
					 
					
						2017-06-14 10:16:42 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7bbd48a2bd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						... 
						
						
						
						# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js 
						
					 
					
						2017-06-13 11:02:38 +02:00 
						 
				 
			
				
					
						
							
							
								Maciej Hirsz 
							
						 
					 
					
						
						
						
						
							
						
						
							b2a42f03eb 
							
						 
					 
					
						
						
							
							Public node WASM, performance and fixes ( #5734 )  
						
						
						
					 
					
						2017-06-12 15:57:16 +02:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							45c6cc6ac0 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ui-2  
						
						
						
					 
					
						2017-05-24 14:09:51 +02:00