3440 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	da16f39626	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
kumavis	da7471e095	lint fixes	2017-08-03 14:48:19 -07:00
greenkeeper[bot]	eff9a578f7	docs(readme): add Greenkeeper badge	2017-07-18 22:41:33 +00:00
greenkeeper[bot]	82aa0d48d4	chore(package): update dependencies	2017-07-18 22:41:30 +00:00
Dan Finlay	92a8af9912	Merge pull request #1794 from MetaMask/nonce-tracker-fixes ... Nonce tracker fixes	2017-07-18 15:41:15 -07:00
kumavis	2832713a46	changelog - add nonce-tracker note	2017-07-18 15:30:32 -07:00
kumavis	12d6f21627	transactions - block nonce-tracker while updating pending transactions	2017-07-18 15:27:15 -07:00
kumavis	aa48ed34c4	nonce-tracker - fix lock mechanism to be a real mutex	2017-07-18 15:11:29 -07:00
kumavis	67fdba5e42	transaction - promisify _checkPendingTxs	2017-07-18 14:00:43 -07:00
kumavis	d249da77d7	nonce-tracker - return nonce as integer	2017-07-18 13:59:56 -07:00
kumavis	4f9fc8014a	nonce-tracker - validate nonce calc components	2017-07-18 12:48:16 -07:00
kumavis	1e71850582	Merge pull request #1787 from MetaMask/i1637-TransactionOrder ... Fix transaction confirmation ordering	2017-07-18 09:34:02 -07:00
kumavis	e083e77585	Merge pull request #1791 from MetaMask/ciBadge ... Change Ci Badge url for readme	2017-07-18 09:32:42 -07:00
tmashuang	d9a195f86b	Shield looks better	2017-07-18 09:20:48 -07:00
tmashuang	0ebec8d0a8	Change Ci Badge url for readme	2017-07-18 09:08:24 -07:00
Dan Finlay	5f2335e68f	Merge pull request #1786 from MetaMask/turnOffAutoFaucet ... turn off auto faucet	2017-07-17 14:49:12 -07:00
frankiebee	948f3880a3	turn off auto faucet and remove file	2017-07-17 17:37:01 -04:00
Dan Finlay	614501e743	Fix transaction confirmation ordering ... Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed. Fixes #1637	2017-07-17 14:18:00 -07:00
Kevin Serrano	919f3c4601	Merge pull request #1781 from MetaMask/AddSupportLink ... Add support page link to help page	2017-07-17 10:04:41 -07:00
Dan Finlay	a4e567ffc5	Add support page link to help page ... Also adjust github link to be a new bug link, which goes to the new issue page.	2017-07-17 09:57:16 -07:00
kumavis	43a3d0d01d	Merge pull request #1777 from MetaMask/InfuraTest ... Infura Network response tests	2017-07-14 14:39:18 -07:00
tmashuang	a4c7d95d0d	Sinon stub infura network status	2017-07-14 13:06:42 -07:00
tmashuang	6cf2a956c1	Update Sinon	2017-07-14 13:05:56 -07:00
tmashuang	02cf65d513	Use Let instead of var	2017-07-14 11:50:41 -07:00
tmashuang	bda52f7cba	Infura Network response tests	2017-07-14 10:34:03 -07:00
Frankie	9d3207fb73	Merge pull request #1617 from MetaMask/nonce-tracker ... transaction controller - use nonce-tracker	2017-07-13 15:48:50 -04:00
frankiebee	7eccf5905a	make publishTransaction and signTransaction async methods	2017-07-13 15:25:43 -04:00
frankiebee	d6001daab8	remove denodeify	2017-07-13 15:24:19 -04:00
kumavis	43b7d5f0eb	Merge pull request #1775 from MetaMask/BlacklistFaster ... Redirect from malicious sites faster	2017-07-13 11:00:40 -07:00
Dan Finlay	5e31fc97cd	Redirect from malicious sites faster	2017-07-13 10:38:56 -07:00
kumavis	3d082203ec	Merge pull request #1771 from MetaMask/addNonceErrToErrLIst ... Add nonce err to err list	2017-07-12 23:41:26 -07:00
frankiebee	6086bcdf0d	limit the range for retryCount	2017-07-12 20:01:07 -07:00
frankiebee	de0cd6e663	write a migration for resubmit tx's to get put back into a submitted state	2017-07-12 19:03:35 -07:00
frankiebee	27cb02bc58	add "nonce too low" to the ignored errs list for tx retrys	2017-07-12 19:03:34 -07:00
kumavis	88a51febfc	Merge pull request #1770 from MetaMask/Version-3.9.0 ... Version 3.9.0	2017-07-12 17:07:57 -07:00
Dan Finlay	1357526dfc	Remove css reference	2017-07-12 16:42:24 -07:00
Dan Finlay	414b979219	Version 3.9.0	2017-07-12 16:38:56 -07:00
kumavis	278e370317	Merge pull request #1769 from MetaMask/UpdateMetadata ... Update eth-contract-metadata on build	2017-07-12 16:17:31 -07:00
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