3709 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	2b98d2b095	Merge pull request #1765 from MetaMask/Version-3.8.6 ... Version 3.8.6	2017-07-12 16:17:21 -07:00
Dan Finlay	c6f867ef67	Merge branch 'master' into Version-3.8.6	2017-07-12 16:09:11 -07:00
Dan Finlay	1375807499	Merge branch 'master' into UpdateMetadata	2017-07-12 15:42:23 -07:00
Dan Finlay	ebe7666426	Update eth-contract-metadata on build	2017-07-12 15:39:54 -07:00
kumavis	f82f8a9fa4	Merge pull request #1768 from MetaMask/AddBlacklist ... Add first version of phishing site warning	2017-07-12 15:38:49 -07:00
Dan Finlay	76a2a59ec5	Refresh blacklist before dist	2017-07-12 15:24:59 -07:00
Dan Finlay	aec813eace	Correct github link	2017-07-12 15:15:19 -07:00
frankiebee	751103d948	Merge branch 'master' into nonce-tracker	2017-07-12 15:10:58 -07:00
frankiebee	aeefcbd75b	Fix test to match behavior	2017-07-12 15:10:52 -07:00
Dan Finlay	ed272dcbc0	Bump node version	2017-07-12 15:09:01 -07:00
frankiebee	bd26ec46aa	mv updateAndApproveTx to txController	2017-07-12 15:07:56 -07:00
frankiebee	da35f6744e	use new nodeify	2017-07-12 15:06:49 -07:00
Dan Finlay	0079126b7d	Point blacklist at main repository	2017-07-12 14:33:03 -07:00
Dan Finlay	2c5b9da06a	Bump changelog	2017-07-12 13:14:18 -07:00
Dan Finlay	52b92fbe40	Add first version of phishing site warning ... Links to my own blacklist for now, since I added a package.json for easy importing. We can point at the main 408H repository once this is merged: https://github.com/409H/EtherAddressLookup/pull/24 Redirects detected phishing sites [here](https://metamask.io/phishing.html).	2017-07-12 13:09:20 -07:00
Dan Finlay	eddc8cfee7	Version 3.8.6	2017-07-11 16:00:20 -07:00
Dan Finlay	822ebca3eb	Merge pull request #1758 from MetaMask/3.8.5 ... Version 3.8.5	2017-07-11 15:58:57 -07:00
Dan Finlay	6811fb2679	Merge branch 'master' into 3.8.5	2017-07-11 15:52:19 -07:00
kumavis	91ef01be4c	Merge pull request #1763 from MetaMask/prov-bump ... deps - bump prov-eng for retry on gateway timeout	2017-07-11 15:44:50 -07:00
kumavis	1448090ec7	deps - bump prov-eng	2017-07-11 15:33:12 -07:00
kumavis	23d44e5399	tests - disable infura test	2017-07-11 15:30:36 -07:00
kumavis	0cc60fda8f	deps - bump prov-eng for fetch retry	2017-07-11 14:18:09 -07:00
kumavis	9f46984fee	metamask - on rpc err show whole error body	2017-07-11 14:17:47 -07:00
frankiebee	231ad48564	Use txParams	2017-07-11 12:52:56 -07:00
kumavis	6587f6eabd	deps - bump prov-eng for retry on gateway timeout	2017-07-11 12:43:15 -07:00
frankiebee	971d25a8ab	Merge branch 'master' into nonce-tracker	2017-07-11 12:41:03 -07:00
kumavis	a1fd9bc6be	Merge pull request #1762 from MetaMask/ImproveRetryLogic ... Improve retry logic	2017-07-11 12:29:20 -07:00
Dan Finlay	c7b9e3fb18	Improve insufficient balance checking in retry loop	2017-07-11 12:19:01 -07:00
frankiebee	a670e54973	Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin into nonce-tracker	2017-07-11 12:18:44 -07:00
frankiebee	c121ac21ec	remove irrelevan code	2017-07-11 12:16:08 -07:00
kumavis	0eee232e26	Merge pull request #1761 from MetaMask/resubmimtErrors ... add "Gateway timeout"	2017-07-11 12:05:00 -07:00
frankiebee	611338c4e0	use .includes	2017-07-11 12:01:59 -07:00
Dan Finlay	d97c6533b8	Remove local nonce error setting.	2017-07-11 12:00:17 -07:00
frankiebee	11d57adc5c	add "Gateway timeout" to ignored errors when resubmiting and use .includes over .startsWith	2017-07-11 11:57:42 -07:00
kumavis	de967d2dfd	3.8.5	2017-07-07 20:05:03 -07:00
Frankie	2d1b7c0ee1	Merge pull request #1757 from MetaMask/resubmit-fix ... Resubmit fix	2017-07-07 19:36:40 -07:00
kumavis	512b6cae81	migration 16 - move resubmit warning back to submitted state	2017-07-07 19:31:27 -07:00
kumavis	c425ad4ec7	tx controller - resubmit - correctly set error on bad nonce/balance	2017-07-07 19:13:06 -07:00
kumavis	c53aac398a	tx controller - correctly set error message on resubmit error	2017-07-07 19:09:32 -07:00
kumavis	4fa999e4de	tx controller - resubmit - recognize parity known hash message	2017-07-07 19:02:34 -07:00
kumavis	fd6caf8713	Merge pull request #1754 from MetaMask/Version-3.8.4 ... Version 3.8.4	2017-07-07 18:56:37 -07:00
kumavis	f5de16c911	test - tx controller - fix promise handling	2017-07-07 14:32:03 -07:00
kumavis	ab8bae421e	test - tx-controller - stub block-tracker method	2017-07-07 14:26:52 -07:00
kumavis	d228f46254	Merge branch 'master' into nonce-tracker	2017-07-07 14:21:43 -07:00
Dan Finlay	04a0b949a2	Version 3.8.4	2017-07-07 11:24:33 -07:00
kumavis	678cfd2175	Merge pull request #1750 from MetaMask/failIfError ... Fail if error	2017-07-07 03:23:34 -07:00
frankiebee	092a9c9def	fail transactions that fail in resubmit	2017-07-07 03:05:39 -07:00
kumavis	34e2f6650d	tx controller - clean code	2017-07-07 01:50:48 -07:00
kumavis	8661989f51	tx controller - move comments	2017-07-07 01:37:45 -07:00
frankiebee	9955668409	add comment	2017-07-06 23:10:04 -07:00