3905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	53a467cd1e	Some progress	2017-09-12 15:06:19 -07:00
Dan Finlay	4738746968	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	2017-09-11 15:19:17 -07:00
Kevin Serrano	10b03cd6a2	Merge pull request #2065 from MetaMask/Version-3.10.0 ... Version 3.10.0	2017-09-11 15:15:40 -07:00
Dan Finlay	6c318f238d	Version 3.10.0	2017-09-11 14:37:53 -07:00
Dan Finlay	e7159f0e48	Merge pull request #2045 from MetaMask/rejectallunapproved ... Feature - Reject all unapproved transactions button (MM Submission: feat. @davidp94)	2017-09-11 14:31:59 -07:00
Kevin Serrano	27ba7f6ed3	Show reject all only when tx count is > 1	2017-09-11 14:12:35 -07:00
Kevin Serrano	06889377c8	Remove markdown from changelog.	2017-09-11 14:00:35 -07:00
Kevin Serrano	2e18dd27a4	Merge github.com:MetaMask/metamask-extension into rejectallunapproved	2017-09-11 13:58:46 -07:00
Dan Finlay	96107556dc	Merge pull request #2051 from MetaMask/ci-speedup ... ci - dont need global install of test utils	2017-09-11 11:34:16 -07:00
Kevin Serrano	68b22d409a	Merge pull request #2049 from MetaMask/i1938-removecryptopermissions ... Remove cryptonator from chrome manifest file	2017-09-10 11:05:52 -07:00
Thomas Huang	430d6d20f1	Merge pull request #2047 from MetaMask/i1997-networkindicate ... Add caret to dropdown network selector	2017-09-08 14:38:00 -07:00
kumavis	5fa0b992a7	Merge pull request #2057 from MetaMask/Version-3.9.13 ... Version 3.9.13	2017-09-08 13:06:59 -07:00
Dan Finlay	585a32534d	Version 3.9.13	2017-09-08 12:17:58 -07:00
kumavis	d03b0547bb	inpage provider - define sendAsync on the prototype	2017-09-08 11:52:00 -07:00
kumavis	bcb60f8ef2	Merge branch 'master' into i1938-removecryptopermissions	2017-09-07 23:05:15 -07:00
kumavis	16957fa8ae	ci - dont need global install of test utils	2017-09-07 22:49:53 -07:00
Dan Finlay	a704e1d143	Merge pull request #2048 from MetaMask/i1984-tokenvalidations ... Add Token Validations and Info	2017-09-07 20:26:31 -07:00
Kevin Serrano	a7f0255085	Add to changelog.	2017-09-07 18:18:14 -07:00
Kevin Serrano	b7e24dcda7	Remove cryptonator from chrome permissions.	2017-09-07 18:17:43 -07:00
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
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