3568 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
frankiebee	11b744bb87	if an error happens during a tx publication set tx status to fail	2017-07-06 22:30:25 -07:00
Thomas Huang	47936019d2	Merge pull request #1748 from MetaMask/Version-3.8.3 ... Version 3.8.3	2017-07-06 10:19:22 -07:00
Dan Finlay	289fdfb701	Version 3.8.3	2017-07-06 10:05:51 -07:00
Dan Finlay	33c2b864db	Merge pull request #1747 from MetaMask/FailingTestForFailingLowBalanceTx ... Fail txs on retry if balance is insufficient	2017-07-06 10:03:06 -07:00
Dan Finlay	b87d10ab1d	Bump changelog	2017-07-05 23:26:58 -07:00
Dan Finlay	07d4e4fe6f	Fix failing test	2017-07-05 23:24:33 -07:00
Dan Finlay	96df7ad8d3	Add missing done	2017-07-05 23:04:51 -07:00
Dan Finlay	ef1282b556	Typo fix	2017-07-05 22:48:11 -07:00
Dan Finlay	b2f6ae9ace	Merge branch 'FailLowBalance' into FailingTestForFailingLowBalanceTx	2017-07-05 22:43:56 -07:00
Dan Finlay	3abceac55d	Fail pending txs with low balance or invalid nonce	2017-07-05 22:43:31 -07:00
Dan Finlay	a915dfdeaa	Add failing test for retrying an over-spending tx	2017-07-05 22:36:52 -07:00
kumavis	8201ae1b53	Merge pull request #1742 from MetaMask/TokenSymbolMisspelled ... Fix spelling	2017-07-05 22:05:32 -07:00
Dan Finlay	ed8a71d350	Merge branch 'master' into NewUI	2017-07-05 15:49:51 -07:00
tmashuang	5c1ccc657c	Fix spelling	2017-07-05 13:42:15 -07:00
frankiebee	51ff6d74e8	clean up unused code from old noncelock	2017-07-05 12:07:34 -07:00
frankiebee	6d2cddaac9	fix nonce calculation order	2017-07-05 12:00:42 -07:00
kumavis	8aab5d965b	Merge pull request #1741 from MetaMask/ReEnableTokenList ... Reenable Default Token List	2017-07-05 10:38:14 -07:00
Dan Finlay	52a6b9f103	Reenable Default Token List ... Looks pretty clear to me now that the heavy traffic spike was not this feature, but was the EOS crowdsale. Now that we've mitigated their traffic spike, I think we can safely re-introduce this feature.	2017-07-05 10:30:48 -07:00
Dan Finlay	ce3d374d80	Merge pull request #1739 from MetaMask/origin-header ... metamask - append dapp origin domain to rpc request	2017-07-05 10:27:21 -07:00
kumavis	68fc3603df	metamask - append dapp origin domain to rpc request	2017-07-04 12:48:00 -07:00
Thomas Huang	bc844ac80a	Merge pull request #1733 from MetaMask/Version-3.8.2 ... Version 3.8.2	2017-07-03 18:27:01 -07:00
Dan Finlay	af8015c1c5	Version 3.8.2	2017-07-03 18:06:47 -07:00
Dan Finlay	b72861fc98	Make responsive UI more flexy	2017-07-03 17:18:26 -07:00
Dan Finlay	0e5ec5b86d	Add responsive UI dev guide	2017-07-03 16:48:45 -07:00
Dan Finlay	e285f2cae9	Get duplicate UI template working	2017-07-03 16:16:53 -07:00
Dan Finlay	5eb3d5d485	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
Dan Finlay	d0d01552da	Merge branch 'master' into NewUI	2017-07-03 15:36:15 -07:00
Kevin Serrano	ba4a7de1a2	Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig ... No longer show network spinner on config screen	2017-07-03 15:30:51 -07:00
Kevin Serrano	36e0fef854	Merge branch 'master' into i1720-NoSpinnerOnConfig	2017-07-03 15:24:10 -07:00
Kevin Serrano	27c651d8da	Merge pull request #1729 from MetaMask/i1707-ClarifySearchingIndication ... Clarify network searching indication	2017-07-03 15:23:40 -07:00
Dan Finlay	d3c7ba31c5	Bump changelog	2017-07-03 15:13:26 -07:00
Dan Finlay	8f65f964ae	Indicate which network is being searched for	2017-07-03 15:12:24 -07:00
Dan Finlay	4e4d6cea40	Add menu carrat next to network searching indicator	2017-07-03 15:06:26 -07:00
Dan Finlay	1503dba5ca	No longer show network spinner on config screen ... The config screen is used to select networks, so we must not block it with network loading indication.	2017-07-03 13:51:39 -07:00
Dan Finlay	91cd849e76	Began creating new UI template	2017-07-03 13:48:18 -07:00
Thomas Huang	fa533469cb	Merge pull request #1714 from MetaMask/Version-3.8.1 ... Version 3.8.1	2017-06-30 13:58:39 -07:00
Dan Finlay	2e7be151c5	Version 3.8.1	2017-06-30 13:55:04 -07:00
Thomas Huang	96c8236fd8	Merge pull request #1711 from MetaMask/NoPopularTOkens ... Stop loading popular tokens by default	2017-06-30 11:43:46 -07:00
Thomas Huang	7de87154e8	Merge branch 'master' into NoPopularTOkens	2017-06-30 10:55:01 -07:00
Thomas Huang	6a502b9170	Merge pull request #1712 from MetaMask/RemoveTokenSending ... Remove send button	2017-06-30 10:54:27 -07:00
Thomas Huang	72f79de173	Merge branch 'master' into RemoveTokenSending	2017-06-30 10:49:40 -07:00