3526 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	a444326a1e	v3.9.4	2017-08-03 22:06:26 -07:00
kumavis	c4cb371ce8	Merge pull request #1857 from MetaMask/hotFixCancleTx ... fix cancelTransaction not receiving a callback	2017-08-03 21:01:13 -07:00
kumavis	d526f68c8e	test - actions - tx - fix async test	2017-08-03 20:56:53 -07:00
kumavis	efb7543c6d	test - actions - remove commented code	2017-08-03 20:53:47 -07:00
kumavis	500e7d1f04	nodeify - test - syntax nitpick	2017-08-03 20:52:09 -07:00
frankiebee	b955b5a89a	add test for no callback error	2017-08-03 22:10:33 -04:00
frankiebee	a8966c4a4f	fix test	2017-08-03 22:02:31 -04:00
frankiebee	7de58c8709	fix cancelTransaction not reciving a callback	2017-08-03 21:22:08 -04:00
Frankie	fea03ad82e	Merge pull request #1856 from MetaMask/v3.9.3 ... v3.9.3	2017-08-03 21:17:16 -04:00
kumavis	10c6aeb2f8	v3.9.3	2017-08-03 17:01:09 -07:00
Kevin Serrano	cc3aea7f75	Merge pull request #1855 from MetaMask/blacklist-refactor2 ... deps - bump eth-detect-phishing	2017-08-03 16:29:27 -07:00
kumavis	026f8592d8	deps - bump eth-detect-phishing	2017-08-03 15:59:01 -07:00
Kevin Serrano	b1311b48c9	Merge pull request #1852 from MetaMask/blacklist-refactor2 ... blacklist - use module eth-phishing-detect	2017-08-03 14:37:21 -07:00
kumavis	34b1e80088	Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-refactor2	2017-08-03 14:28:48 -07:00
kumavis	d4877cb4e2	blacklist - use module eth-phishing-detect	2017-08-03 14:25:02 -07:00
Kevin Serrano	15bcbb4941	Merge pull request #1850 from MetaMask/stack ... remove stack from txs	2017-08-03 13:09:27 -07:00
frankiebee	dce593fd7b	remove stack from txs	2017-08-03 15:39:55 -04:00
kumavis	8a9d0073b1	Merge pull request #1848 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 1: promises for everyone and more tests!	2017-08-02 19:57:16 -07:00
Kevin Serrano	2c37d43888	Merge pull request #1849 from MetaMask/blacklist-refactor ... Blacklist refactor	2017-08-02 16:20:53 -07:00
frankiebee	5ac4c2de6f	remove unused sinon	2017-08-02 19:11:51 -04:00
frankiebee	340dbe75fc	use async with #publishTransaction	2017-08-02 19:09:37 -04:00
frankiebee	0808eb2256	fix test	2017-08-02 19:07:18 -04:00
frankiebee	b80c7e417b	move newUnapprovedTransaction to transactions.js	2017-08-02 18:59:34 -04:00
kumavis	8c6f01b910	blacklist controller - breakout from metamask and infura controllers	2017-08-02 15:54:59 -07:00
kumavis	ecaa235b5e	phishing detection - move phishing detection into contentscript and metamask controller	2017-08-02 14:26:10 -07:00
kumavis	aea5735b29	obj-multiplex - missing name error + prefer const over var	2017-08-02 14:25:28 -07:00
frankiebee	25bc15ba17	lint fixes	2017-08-02 11:47:13 -04:00
frankiebee	25cffd21f8	Merge branch 'master' into transactionControllerRefractor	2017-08-02 11:41:29 -04:00
frankiebee	ece9200c72	fix spelling mistake	2017-08-02 11:36:07 -04:00
frankiebee	3a4726018e	fix addTxDefaults	2017-08-02 11:35:35 -04:00
frankiebee	21e76484d6	add test for addTxDefaults	2017-08-02 11:34:45 -04:00
frankiebee	432f516ab0	make addUnapprovedTransaction async function and use promise based ethQuery	2017-08-02 10:26:25 -04:00
kumavis	9eb13aee00	blacklist - add tests for metamask subdomains	2017-08-01 17:05:36 -07:00
kumavis	9d345e744d	blacklist - clearer test format	2017-08-01 16:58:40 -07:00
Kevin Serrano	d15e402ed8	Merge pull request #1838 from MetaMask/i1805-LiveBlacklistUpdating ... Live blacklist updating	2017-07-27 15:22:09 -07:00
Dan Finlay	7c71ee1bab	Do not blacklist files	2017-07-27 15:16:42 -07:00
Dan Finlay	eb92d65c4d	Add Levenshtein item to changelog	2017-07-26 16:57:58 -07:00
Dan Finlay	6675241fa9	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 16:46:59 -07:00
Dan Finlay	8b1726cc55	Live update blacklist from Infura	2017-07-26 16:30:54 -07:00
Dan Finlay	e3b5bb2052	Merge pull request #1837 from MetaMask/i1833-levencheck ... Levenshtein Checking Logic Added To Blacklist	2017-07-26 16:25:30 -07:00
Dan Finlay	f147b928b2	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 15:32:19 -07:00
Kevin Serrano	aa282b4e3a	Give credit where it is due	2017-07-26 15:31:16 -07:00
Kevin Serrano	a639543665	Changelog bump	2017-07-26 15:29:13 -07:00
Kevin Serrano	66f6d5a4e0	Add levenshtein logic to blacklister.	2017-07-26 15:25:30 -07:00
Kevin Serrano	6a9d40c558	Add test for blacklister.	2017-07-26 15:24:57 -07:00
Kevin Serrano	520cda0058	Merge pull request #1834 from MetaMask/Version-3.9.2 ... Version 3.9.2	2017-07-26 14:28:09 -07:00
Dan Finlay	b50c10f373	Version 3.9.2	2017-07-26 14:15:24 -07:00
Dan Finlay	3d8ebf2265	Begin implementing live-updating blacklist, not working yet	2017-07-26 12:27:16 -07:00
Frankie	f23efec3e3	Merge pull request #1830 from MetaMask/providerProxyFix ... NonceTracker - Provider proxy fix	2017-07-26 14:56:13 -04:00
kumavis	55a55141d0	nonce-tracker - fix test	2017-07-26 11:43:37 -07:00