2990 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	1358966202	Merge branch 'master' into i1412-decimalizethegas	2017-05-17 10:42:15 -07:00
kumavis	965a72486f	Merge pull request #1441 from MetaMask/FixGasReset ... Fix a test, add another	2017-05-16 23:49:19 -07:00
Dan Finlay	31c7daee73	Fix bug where edited gas parameters did not take effect ... Fixes #1407	2017-05-16 23:33:40 -07:00
Dan Finlay	6491b42266	Add test around txManager#approveTransaction	2017-05-16 18:16:18 -07:00
Dan Finlay	c6fd509051	Improve test	2017-05-16 17:06:19 -07:00
Dan Finlay	c1bef31d9d	Linted	2017-05-16 16:50:03 -07:00
Dan Finlay	cfb7bfed18	Fix quotation mark	2017-05-16 16:44:17 -07:00
Kevin Serrano	90bfa3cbcd	Fix merge conflicts.	2017-05-16 16:28:57 -07:00
Kevin Serrano	44f25cd93c	Changelog bump	2017-05-16 16:21:50 -07:00
Kevin Serrano	d8130f1eff	Fix reset button.	2017-05-16 16:20:58 -07:00
Dan Finlay	caeadc2407	Linted and removed unused deps	2017-05-16 16:19:10 -07:00
Kevin Serrano	53b8d18a5f	Complete transition into BN.	2017-05-16 15:30:22 -07:00
Dan Finlay	a15e753c80	Add gas updating test to tx controller tests	2017-05-16 13:22:03 -07:00
Dan Finlay	a00941c889	Remove only line from test	2017-05-16 13:21:31 -07:00
Frankie	43ea223c9f	Merge pull request #1434 from MetaMask/mascara-scaling ... Mascara UI mobile scaling	2017-05-16 21:46:36 +02:00
kumavis	855453987a	Merge pull request #1438 from MetaMask/TxController ... Rename tx manager to tx controller	2017-05-16 11:56:56 -07:00
kumavis	44148d6135	Merge pull request #1440 from MetaMask/i1439-FixFiatFormatting ... Fix fiat rendering	2017-05-16 11:54:23 -07:00
Dan Finlay	68d6ea44a0	Fix path references	2017-05-16 11:39:00 -07:00
Dan Finlay	b4e6ea9db7	Fix fiat rendering ... Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used.	2017-05-16 11:36:21 -07:00
Dan Finlay	2df9344be5	Rename tx manager to tx controller	2017-05-16 10:35:28 -07:00
Dan Finlay	d165f3a2b6	Merge pull request #1436 from MetaMask/mig13 ... migration 13 - change provider from testnet to ropsten	2017-05-16 09:09:28 -07:00
kumavis	28aba6e9de	migration 13 - change provider from testnet to ropsten	2017-05-15 23:56:13 -07:00
kumavis	01b6d9c374	test - format test data 001	2017-05-15 23:54:05 -07:00
kumavis	9560de80a0	Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm ... Add test around conf-tx view's gas editing.	2017-05-15 23:25:20 -07:00
kumavis	e28e0acaa8	lint - mandatory dangle ... 😛	2017-05-15 23:21:46 -07:00
kumavis	d5636080cf	ui - send - clean props assignment	2017-05-15 23:12:47 -07:00
kumavis	687dfc87bd	Merge pull request #1432 from MetaMask/i1419-rinkebydefaultnetwork ... I1419 rinkebydefaultnetwork	2017-05-15 22:58:36 -07:00
kumavis	9fbe3e5371	mascara - fix deploy instructions	2017-05-15 22:12:06 -07:00
kumavis	05933a7acb	mascara - ui - fix scale on mobile	2017-05-15 22:01:04 -07:00
kumavis	a8306f1579	mascara - add deploy instructions	2017-05-15 21:59:24 -07:00
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