3110 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas Huang	3367363b12	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
Thomas Huang	62ee038889	Merge branch 'master' into i1419-rinkebydefaultnetwork	2017-05-15 18:06:48 -07:00
Thomas Huang	4c10e2021a	Change default network to rinkeby	2017-05-15 18:05:11 -07:00
Dan Finlay	85ca8b4539	Merge pull request #1431 from MetaMask/pe-bump ... Bump provider engine for event filters fix	2017-05-15 17:53:11 -07:00
kumavis	b904fa5d86	changelog - add note on filter fix	2017-05-15 17:13:13 -07:00
kumavis	c1b0aaa443	deps - bump provider-engine 12.0.6	2017-05-15 17:11:07 -07:00
Dan Finlay	6abdec608e	Merge branch 'master' into i1407-FixNonEditingTxForm	2017-05-15 15:36:03 -07:00
Dan Finlay	fe3e943169	Merge pull request #1422 from MetaMask/drop-asyncq ... background - drop async-q in favor of async/await	2017-05-15 15:35:19 -07:00
Dan Finlay	81122170b5	Add stage 0 support to build system	2017-05-15 15:31:19 -07:00
Dan Finlay	f9c0fc0e8c	Clean up test	2017-05-15 15:23:38 -07:00
Dan Finlay	fc7b4cb4bc	Linted	2017-05-15 15:22:49 -07:00
Dan Finlay	75d9b5619c	Verify updating gas value updates	2017-05-15 15:21:28 -07:00
Dan Finlay	4b341e6a95	Got test failing nearly correctly	2017-05-15 15:07:38 -07:00
Dan Finlay	c4be4c7195	Skip jazzicons in unit tests	2017-05-15 14:35:24 -07:00
kumavis	5c9449dec1	background - drop async-q in favor of async/await	2017-05-12 13:09:23 -07:00
Dan Finlay	117cf9c331	Merge pull request #1417 from MetaMask/fixMigrator2 ... Fix and simplify migrator with es7	2017-05-12 12:55:16 -07:00
Dan Finlay	19db11856b	Remove redux dependency from eth-balance and its dependent tree ... For better unit testability of the conf-tx view.	2017-05-12 12:44:51 -07:00
kumavis	dde3beb044	ci - use node 7.6.0	2017-05-12 12:37:31 -07:00
kumavis	2c8bbe3b25	migrator - fix typo	2017-05-12 12:27:40 -07:00
kumavis	092807f56e	Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2	2017-05-12 12:25:21 -07:00
kumavis	154eac4a3a	Merge pull request #1421 from MetaMask/es7 ... Add support for async/await	2017-05-12 12:24:43 -07:00
Dan Finlay	61f5c42a45	Add support for async/await	2017-05-12 12:04:42 -07:00
Dan Finlay	daec667c16	Add support for async/await	2017-05-12 11:31:40 -07:00
kumavis	70a328e028	migrator - cleaner migration runner with es7	2017-05-11 18:15:59 -07:00
Dan Finlay	f0eeb1e162	Got a useful error message for next step	2017-05-11 17:43:40 -07:00
Dan Finlay	de5cf2526c	Fix test up a bit	2017-05-11 17:15:45 -07:00
Dan Finlay	60746a9859	Use react test utils to start composing test	2017-05-11 17:09:23 -07:00
kumavis	08b5148b80	Merge pull request #1416 from MetaMask/i1389-lesscurrency ... Trim currency list	2017-05-11 16:47:08 -07:00
Kevin Serrano	974368fe08	Prettify JSON	2017-05-11 16:28:11 -07:00
Dan Finlay	16005ebd3a	Got test failing	2017-05-11 15:28:33 -07:00
Dan Finlay	113f7d67f1	Fix tests add logs	2017-05-11 14:29:44 -07:00
frankiebee	8421cf9cce	Create test for Migrator	2017-05-11 23:25:34 +02:00
frankiebee	6c01b26845	use asyncQ.waterfall instead of asyncQ.eachSeries	2017-05-11 23:25:33 +02:00
Kevin Serrano	d389d0efd6	Bump changelog	2017-05-11 12:31:08 -07:00
Kevin Serrano	73e1cd2317	Trim currency list.	2017-05-11 12:30:39 -07:00
frankiebee	1772d34e94	fix migrator	2017-05-11 10:10:50 +02:00
Dan Finlay	e9b11a430b	Add an attempt at a unit test for reproducing #1407	2017-05-10 17:26:51 -07:00
Dan Finlay	d737bd1633	Break up pending-tx component for better unit testability	2017-05-10 17:26:09 -07:00
Thomas Huang	ecaa4cdeb2	Merge pull request #1404 from MetaMask/Version-3.6.4 ... Version 3.6.4	2017-05-09 17:23:02 -07:00
Dan Finlay	3ed7205b75	Version 3.6.4	2017-05-09 17:08:33 -07:00
Kevin Serrano	66fcf35ad7	Merge pull request #1402 from MetaMask/ens-fix ... ens - add mainnet ens support	2017-05-09 11:38:18 -07:00
kumavis	ac54c7d96b	ens - add mainnet ens support	2017-05-09 11:28:39 -07:00
kumavis	03d454f73b	Merge pull request #1397 from MetaMask/Version-3.6.3 ... Version 3.6.3	2017-05-08 22:36:47 -07:00
Dan Finlay	ff1a1284cc	Version 3.6.3	2017-05-08 22:05:38 -07:00
Kevin Serrano	dfc19183c9	Merge pull request #1394 from MetaMask/Version-3.6.2 ... Version 3.6.2: Persnickety Pachycephalosaurus	2017-05-08 16:30:47 -07:00
Dan Finlay	662a646fa9	Version 3.6.2	2017-05-08 16:20:37 -07:00
Dan Finlay	49d64d11db	Merge pull request #1393 from MetaMask/i1364-devwarning2 ... Add new beta notice.	2017-05-08 16:19:07 -07:00
Kevin Serrano	ea4e4a3264	Merge pull request #1382 from MetaMask/i1381-GasPriceInGwei ... Set gas price in gwei	2017-05-08 16:07:34 -07:00
Kevin Serrano	f131f59c82	Changelog bump	2017-05-08 16:03:28 -07:00
Kevin Serrano	d61b587f30	Redefine txmeta when submitting.	2017-05-08 16:02:41 -07:00