4038 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	0e6c11a3b5	Fix typo.	2017-09-07 18:01:39 -07:00
Kevin Serrano	54a5a117d5	Fix link to open new tab.	2017-09-07 18:00:45 -07:00
Kevin Serrano	2200a1142f	Bump changelog.	2017-09-07 17:55:49 -07:00
Kevin Serrano	6560a2c3af	Add front-end validation for own adddresses as a token contract address. Add information on token contract addresses.	2017-09-07 17:55:34 -07:00
Kevin Serrano	941ea65af7	Merge pull request #2046 from MetaMask/RewordSeedRestore ... Reword forgot password to restore seed phrase	2017-09-07 16:28:37 -07:00
Kevin Serrano	54fb8e8cef	Add cursor on hover on loading. Change some wording.	2017-09-07 16:26:31 -07:00
Kevin Serrano	8d7f78c1a5	Add caret to indicate network is dropdown.	2017-09-07 16:18:32 -07:00
Dan Finlay	64717726c4	Reword forgot password to restore seed phrase ... This always confuses people, I just finally did it.	2017-09-07 15:27:40 -07:00
Kevin Serrano	13c7b28d40	Merge pull request #1987 from MetaMask/CheckFaq67 ... Add test for trying to reproduce faq#67	2017-09-07 15:26:29 -07:00
Kevin Serrano	55b07b2b4a	Changelog and attribution.	2017-09-07 15:06:57 -07:00
Kevin Serrano	41e9904d9b	Convert icon to button.	2017-09-07 15:03:25 -07:00
Kevin Serrano	3a87a30912	Fold submit and buy ether into one button slot	2017-09-07 13:55:59 -07:00
Kevin Serrano	34e7bb5015	Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved	2017-09-07 13:20:14 -07:00
Thomas Huang	a27a7e22f2	Merge pull request #1893 from MetaMask/readd-loose ... Re-add loose label onto accounts.	2017-09-07 12:57:56 -07:00
Dan Finlay	d4d7c6d89e	Linted	2017-09-07 12:54:28 -07:00
Dan Finlay	65c00e9fbb	Improve test name	2017-09-07 12:53:30 -07:00
Dan Finlay	fadc0617df	Make tx calculations account for gas prices	2017-09-07 12:52:49 -07:00
Dan Finlay	532a4040de	Add test for computing gas price	2017-09-07 12:52:25 -07:00
Dan Finlay	c616581001	Remove logs	2017-09-07 12:47:52 -07:00
Dan Finlay	a95a3c7e4f	Fix balance calc test	2017-09-07 12:47:27 -07:00
Dan Finlay	74c6de7d23	Add constructor comment	2017-09-07 12:45:00 -07:00
Dan Finlay	7b92268428	Fix valueFor test	2017-09-07 12:43:10 -07:00
Dan Finlay	4058574436	Add basic test for valueFor	2017-09-07 12:30:25 -07:00
Kevin Serrano	69c7fe24b3	Place object property retrieval inside try-catch	2017-09-07 12:17:36 -07:00
Dan Finlay	b6e8791bc2	test not passing	2017-09-07 11:59:15 -07:00
Kevin Serrano	f0ab4ce52d	Change expected type to array.	2017-09-07 11:51:04 -07:00
kumavis	440a42bbc3	inpage - add idRemapMiddleware	2017-09-07 10:08:07 -07:00
Dan Finlay	74f7fc4613	Check balances in parallel	2017-09-06 14:37:46 -07:00
Dan Finlay	f9a052deed	Add first passing balance calc test	2017-09-06 14:36:15 -07:00
Dan Finlay	714df393b4	Add test template	2017-09-06 14:27:21 -07:00
Kevin Serrano	7ff5fd8691	Changelog bump	2017-09-06 14:04:17 -07:00
Kevin Serrano	0217984a40	Merge branch 'master' into readd-loose	2017-09-06 13:59:52 -07:00
Kevin Serrano	b5f48730cd	Properly update keyring state on new account addition.	2017-09-06 13:59:41 -07:00
kumavis	351db952c5	Merge pull request #2033 from MetaMask/Version-3.9.12 ... Version 3.9.12	2017-09-06 13:54:47 -07:00
Dan Finlay	5e934994d1	Version 3.9.12	2017-09-06 13:33:30 -07:00
kumavis	47340ca550	Merge pull request #2017 from MetaMask/DevEnviornment ... Update redux middleware imports	2017-09-06 13:18:14 -07:00
tmashuang	36a44ef61f	Update mock-store dependency	2017-09-06 11:04:17 -07:00
Dan Finlay	88556dce74	Merge pull request #2023 from MetaMask/web3-1.0-fix ... inpage - bug fix	2017-09-06 10:33:43 -07:00
kumavis	ea7e46ed38	inpage - bug fix ... prevents mutation of original message object which causes problems with web3 1.0	2017-09-05 16:46:21 -07:00
Kevin Serrano	3e2bd19881	Merge branch 'master' into readd-loose	2017-09-05 15:48:15 -07:00
Kevin Serrano	32c799a135	Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning ... Make eth_sign deprecation warning more useful	2017-09-05 11:49:48 -07:00
Kevin Serrano	ba2d1f8d3e	Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarning ... Make web3 deprecation notice more useful	2017-09-05 11:49:18 -07:00
Dan Finlay	90272e252f	Make eth_sign deprecation warning more useful ... Link to descriptive article that demonstrates the new preferred method.	2017-09-05 11:44:26 -07:00
Dan Finlay	70a61f8712	Make web3 deprecation notice more useful ... Linking to a descriptive & precriptive article on a path forward.	2017-09-05 11:35:33 -07:00
Kevin Serrano	e647337a8a	Resolve merge conflict from master	2017-09-05 09:03:44 -07:00
tmashuang	1172c6a94b	Update development store	2017-09-05 08:58:01 -07:00
kumavis	2885a95471	Merge pull request #2008 from MetaMask/mascara-fix ... mascara - fix iframe stream constructor	2017-09-01 12:07:28 -07:00
Thomas Huang	33dfed15a6	Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0 ... Update sinon to the latest version 🚀	2017-09-01 12:05:08 -07:00
kumavis	dbcc82f5c4	mascara - fix iframe stream constructor	2017-09-01 12:03:28 -07:00
Kevin Serrano	b47d3735fe	Merge pull request #2007 from MetaMask/i2005-HttpsLinjs ... Use HTTPS links when available	2017-09-01 11:57:57 -07:00