5172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	4d6bae774a	Merge pull request #2620 from MetaMask/update-deps ... Update greenkeeper deps for master	2017-11-28 10:24:54 -08:00
Dan Finlay	725277dbdb	Merge pull request #2441 from MetaMask/kumavis-patch-3 ... NetworkController - add warning when aborting lookupNetwork	2017-11-27 16:21:25 -08:00
kumavis	634102df63	network controller - warn via log.warn	2017-11-27 13:59:32 -10:00
Thomas Huang	698e9ba441	Update greenkeeper deps for master	2017-11-27 13:49:49 -06:00
Thomas Huang	e71115735c	Merge pull request #2605 from MetaMask/i2577-SeedPhraseBug ... Fix a possible seed phrase bug	2017-11-27 13:37:42 -06:00
Thomas Huang	9b25f89728	Update babelify to 8.0.0	2017-11-27 12:35:19 -06:00
Thomas Huang	94fe294caf	Merge pull request #2607 from MetaMask/i2504-OperaFix ... Ensure Opera build excludes chromereload file	2017-11-27 11:38:58 -06:00
Jason Clark	a34362b776	Fixes changes requested in pullrequestreview-79088534	2017-11-27 08:11:48 -07:00
Thomas Huang	109050817a	Update react, react-dom, and react-test-renderer to 15.6.2	2017-11-27 08:46:47 -06:00
Thomas Huang	1ee91a51cc	Update ethjs-query to v0.3.1	2017-11-26 10:46:28 -06:00
Thomas Huang	178b657c75	Update Qunit to QunitJS v2.4.1	2017-11-26 10:03:17 -06:00
Thomas Huang	cefe6cded6	Update to Enzyme 3.2.0	2017-11-25 18:37:12 -06:00
Jason Clark	abefcc9612	more eslint fixes	2017-11-25 15:57:54 -07:00
Jason Clark	6f5c32b7ce	adding blockies lib to eslint ignore so it doesn't blow up the style checker and fail the build	2017-11-25 15:52:46 -07:00
Jason Clark	75ef848196	making eslint happy	2017-11-25 15:47:34 -07:00
Jason Clark	bd48d858f4	fixing blockies display issues	2017-11-25 15:11:29 -07:00
Jason Clark	1b89ceb63a	swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code	2017-11-25 14:33:42 -07:00
Jason Clark	41be4714c2	tweaking styling	2017-11-24 14:18:46 -07:00
Jason Clark	dc7bd3c628	incremental commit of working blockie component	2017-11-24 13:48:56 -07:00
Thomas Huang	cc304647ae	Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0 ... Update react-markdown to the latest version 🚀	2017-11-24 13:31:24 -06:00
Jason Clark	fc46a16a32	toggle wired up to preferences property store	2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)	90fc4812bc	incremental commit	2017-11-23 18:33:44 -07:00
Dan Finlay	4a42c816c2	Ensure Opera build excludes chromereload file ... Fixes #2504	2017-11-21 15:19:10 -08:00
Dan Finlay	bd45022a2f	Bump changelog	2017-11-20 14:48:19 -08:00
Dan Finlay	8dd0093184	Remove logs	2017-11-20 14:46:36 -08:00
Dan Finlay	764a5bac56	Get test passing	2017-11-20 14:44:12 -08:00
Dan Finlay	d19aa016aa	Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-Test	2017-11-20 14:15:21 -08:00
Dan Finlay	884f203564	Add failing test for #2577 Seed Phrase Bug	2017-11-20 14:15:00 -08:00
Dan Finlay	597af980dd	Prevent multiple submissions of first time form	2017-11-20 14:03:47 -08:00
Dan Finlay	65cb970487	Prevent creation of multiple vaults ... Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.	2017-11-20 14:03:12 -08:00
Dan Finlay	c0aa7ce857	Add reproduction and mutex code	2017-11-20 13:27:29 -08:00
Dan Finlay	28409294c3	Remove unneeded type casting	2017-11-21 03:42:46 +08:00
Dan Finlay	c6713e93ad	Fix bug where gas param was not a string ... Prevented sending transactions. Fixes #2598	2017-11-21 03:42:46 +08:00
Thomas Huang	408bbe726f	Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error ... Add useful error when duplicate web3 is detected.	2017-11-20 11:38:41 -06:00
Thomas Huang	7a4097e6a6	Merge pull request #2596 from MetaMask/issue-template-support-link ... Point issue template at new support center	2017-11-20 10:52:52 -06:00
greenkeeper[bot]	fac516e5eb	fix(package): update react-markdown to version 3.0.0	2017-11-20 09:08:48 +00:00
Dan Finlay	db321d95cc	Point issue template at new support center	2017-11-17 11:27:02 -08:00
Chi Kei Chan	b944a63ff8	Merge pull request #2591 from MetaMask/NewUI-flat ... Release 4.0.4	2017-11-15 13:33:47 -08:00
Chi Kei Chan	fbd04a6af6	Merge pull request #2590 from MetaMask/merge-master ... Merge master	2017-11-15 12:39:34 -08:00
Chi Kei Chan	03968ffafe	Version Bump	2017-11-15 12:23:39 -08:00
Chi Kei Chan	e61ba93194	Merge branch 'master' into merge-master	2017-11-15 12:03:13 -08:00
Daniel Tsui	f8d38f44c2	Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimator ... [NewUI] Use currency input component in gas customizer	2017-11-15 13:30:34 -06:00
Dan	960cc8abcb	Gas customzier does not consider amount when sending tokens.	2017-11-15 15:29:57 -03:30
Dan	bbdb35c35a	Use currency input component in input number, to improve input behaviour in gas estimator	2017-11-15 15:00:35 -03:30
Alexander Tseung	59e46e7cb2	Show tokens with zero balance	2017-11-14 16:19:24 -08:00
Dan	9e3f921ba9	Create single action for updating all of send in redux state.	2017-11-14 16:18:00 -08:00
Dan	4671f28476	Allow editing of token transactions.	2017-11-14 16:18:00 -08:00
Dan	0a91671ff6	Fix lint errors.	2017-11-14 16:18:00 -08:00
Dan	34ca7290c5	Allow editing of send ether.	2017-11-14 16:18:00 -08:00
Thomas Huang	707a10548d	Merge pull request #2540 from doraemondrian/master ... newUnaprovedTx => newUnapprovedTx	2017-11-14 09:41:11 -08:00