474 Commits

Author	SHA1	Message	Date
frankiebee	db2836a1ae	dont stop retrying brodcasting txs	2017-06-27 14:19:28 -07:00
Thomas Huang	8194b398f6	Merge branch 'master' into i1584-seederror	2017-06-26 16:32:47 -07:00
Kevin Serrano	d6c14f4609	Bump changelog.	2017-06-26 16:15:11 -07:00
Kevin Serrano	f2cfbda1c9	Bump changelog.	2017-06-26 15:48:41 -07:00
Kevin Serrano	f022c7c714	Merge pull request #1603 from MetaMask/AddTokenList ... Add popular token list	2017-06-22 17:28:10 -07:00
Dan Finlay	2f4ebea306	Bump changelog	2017-06-20 18:26:08 -07:00
Kevin Serrano	b3a6df2dca	Bump changelog.	2017-06-20 15:41:34 -07:00
Kevin Serrano	9da243f42d	Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList	2017-06-19 13:51:38 -07:00
Dan Finlay	39c7ed230d	Merge remote-tracking branch 'origin/master' into AddTokenList	2017-06-15 13:44:58 -07:00
Dan Finlay	0fd32e67d4	Do not mark slowly mined txs as failed. ... Fixes #1567 Also seems to fix #1556 Also improves resubmit performance by only resubmitting on `latest`.	2017-06-14 12:01:45 -07:00
Kevin Serrano	74d15f5cb0	Bump changelog.	2017-06-14 10:13:34 -07:00
Dan Finlay	5c9a228848	Add token list note to changelog	2017-06-13 17:57:18 -07:00
Kevin Serrano	141e66171b	Merge pull request #1600 from MetaMask/i1554-ensSymFix ... ENS symbol renders on proper networks	2017-06-13 14:31:58 -07:00
Kevin Serrano	e9e43637df	Bump changelog.	2017-06-12 16:57:31 -07:00
Dan Finlay	844159cb18	Version 3.7.8	2017-06-12 15:57:01 -07:00
Frankie	3da887e56e	Merge branch 'master' into qrPrefix	2017-06-12 15:09:53 -07:00
frankiebee	b712e7ce64	add to CHANGELOG	2017-06-12 14:48:55 -07:00
kumavis	27220b7bcd	Merge branch 'master' into i#1203MainNetSwitch	2017-06-12 13:27:04 -07:00
Dan Finlay	ba254d9041	Merge branch 'master' into currency-fix	2017-06-12 10:32:54 -07:00
Dan Finlay	3e1d648ec0	Merge branch 'master' into gasupdater	2017-06-12 10:26:40 -07:00
Dan Finlay	e9c693eae4	Version bump changelog	2017-06-08 16:44:11 -07:00
kumavis	f994461763	changelog - note on block-tracker warp	2017-06-08 16:21:16 -07:00
Kevin Serrano	f788ba7244	Resolve changelog merging.	2017-06-05 16:27:15 -07:00
Kevin Serrano	deb882bd6e	Merge branch 'master' into currency-fix	2017-06-05 16:26:49 -07:00
Kevin Serrano	0fb38632be	Bump changelog.	2017-06-05 16:25:02 -07:00
Dan Finlay	838ffb62ee	Version 3.7.6	2017-06-05 15:36:18 -07:00
Dan Finlay	c8f0802a8e	Fix bug that prevented publishing contracts	2017-06-05 15:35:52 -07:00
Dan Finlay	c92afef91d	Version 3.7.5	2017-06-05 13:40:26 -07:00
Kevin Serrano	8d8eb0d8ad	bump changelog	2017-06-02 15:20:41 -07:00
Dan Finlay	611cb7ad93	Version 3.7.4	2017-06-02 11:08:59 -07:00
Dan Finlay	d59021f754	Version 3.7.3	2017-06-01 10:18:20 -07:00
Dan Finlay	76a78fdb3b	Version 3.7.2	2017-05-31 14:06:13 -07:00
Dan Finlay	1203bd15c2	Add names to contract map & conf view	2017-05-26 10:31:42 -07:00
Dan Finlay	7cd42ae9ba	Bump changelog	2017-05-26 00:45:58 -07:00
Thomas Huang	8f9a230d8d	Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider ... Remove streaming subprovider	2017-05-25 15:04:50 -07:00
Dan Finlay	6064161215	Bump changelog	2017-05-25 13:43:53 -07:00
frankiebee	a2064bd16e	add to CHANGELOG	2017-05-24 23:18:09 -04:00
Kevin Serrano	b95f2158bb	bump changelog	2017-05-24 16:23:31 -07:00
Kevin Serrano	10ca3b6467	Fix bug where submit was enabled when invalid params were filled out.	2017-05-24 10:13:43 -07:00
Kevin Serrano	2d739647b9	Bump changelog	2017-05-24 10:01:45 -07:00
Kevin Serrano	45285a5a2f	Merge branch 'master' into i1412-decimalizethegas	2017-05-24 09:55:32 -07:00
Frankie	97ea7454b3	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
frankiebee	c1239608a6	add to CHANGELOG	2017-05-23 20:27:51 -04:00
Dan Finlay	17604f1ef5	Version 3.7.0	2017-05-23 14:49:45 -07:00
Dan Finlay	4dab68c48f	Merge branch 'master' into i1409-StalledTxs	2017-05-23 12:24:45 -07:00
Dan Finlay	cd2ad1733d	Continually resubmit pending txs	2017-05-23 12:22:15 -07:00
Kevin Serrano	97d19f0f79	Merge branch 'master' into i1412-decimalizethegas	2017-05-23 10:43:59 -07:00
Dan Finlay	be5af7cb4b	Throw if ENS Resolver isn't set up ... Instead of resolving to name owners, which can encourage inconsistent usage of ENS. Fixes #1427.	2017-05-22 17:45:29 -07:00
kumavis	99f28527a3	Merge branch 'master' into HelpDebugStalledTxs	2017-05-22 16:21:24 -07:00
Dan Finlay	39f9ffa18a	Bump changelog	2017-05-22 15:25:31 -07:00