3723 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	588b8f0d39	migration 18 - activate	2017-08-14 20:06:15 -07:00
kumavis	ac2b572c34	migration 18 - fix an oops	2017-08-14 20:05:57 -07:00
kumavis	a9e5564e8d	tx controller - test - fix typo from moved test	2017-08-14 19:34:22 -07:00
kumavis	1af797b1b3	tx controller - tx state history various small fixes	2017-08-14 19:15:36 -07:00
kumavis	fec0f2ca5e	tx controller - test - test tx state history in updateTx	2017-08-14 19:15:09 -07:00
kumavis	accd057b1a	migration 18 - move to diff-based history	2017-08-14 18:46:18 -07:00
kumavis	fdffb6fedc	introduce tx-state-history-helper and diff-based history	2017-08-14 18:46:04 -07:00
kumavis	68c6b2d666	Merge pull request #1904 from MetaMask/web3-depreciation ... Web3 depreciation warning	2017-08-12 14:12:01 -07:00
frankiebee	66a012550e	fix wording	2017-08-11 15:54:52 -07:00
frankiebee	d4849f67f9	Add to CHANGELOG	2017-08-11 15:53:01 -07:00
frankiebee	ac9e84ff40	add deprecation warning for web3	2017-08-11 15:52:03 -07:00
Frankie	3b1ac178ef	Merge pull request #1899 from sdtsui/fix/acct-name-lengths ... Fix account name overflow issues	2017-08-11 12:50:05 -04:00
sdtsui	9ec8663605	Cleanup stray logs and lint	2017-08-10 17:50:33 -07:00
sdtsui	2346c9b6b9	Add overflow support for all account names in account details	2017-08-10 17:49:12 -07:00
sdtsui	771f9ec124	Fix logic for dropdown components attaching checkmark to correct account	2017-08-10 17:37:55 -07:00
sdtsui	88f4931c6f	Fix text overflow for dropdown components flagged by @frankiebee	2017-08-10 17:37:36 -07:00
Thomas Huang	4b7fa27ad0	Merge pull request #1894 from MetaMask/3.9.6 ... v3.9.6	2017-08-09 23:10:40 -07:00
kumavis	2b409fb60b	3.9.6	2017-08-09 23:05:50 -07:00
Thomas Huang	15c84600e7	Merge pull request #1892 from MetaMask/deps-query ... deps - bump ethjs-query	2017-08-09 16:23:23 -07:00
kumavis	fa6370c68a	deps - bump ethjs-query	2017-08-09 16:18:38 -07:00
Thomas Huang	1071a35f7b	Merge pull request #1883 from MetaMask/estimateGas-fix ... tx utils - detect estimateGas err and set simulationFailed	2017-08-09 14:03:02 -07:00
kumavis	7da65bdb90	Merge pull request #1885 from MetaMask/dharma ... Feature - Add Dharma Loans Beta to kovan buy options	2017-08-09 12:50:31 -07:00
kumavis	245125eb18	ui - buy eth - formatting and moved network names to config	2017-08-09 12:25:38 -07:00
Frankie	208b71740b	Merge pull request #1884 from MetaMask/waffle-badge ... readme - add waffle.io badge	2017-08-09 09:06:13 -04:00
kumavis	052d338b2b	lint fix	2017-08-09 01:04:42 -07:00
kumavis	897d00efa0	ui - buy eth - add dharma beta to kovan	2017-08-09 01:00:06 -07:00
kumavis	84c3d3c6db	ui - buy button view - refactor	2017-08-09 00:36:18 -07:00
kumavis	b6df46337f	readme - add waffle.io badge	2017-08-08 23:53:32 -07:00
kumavis	b4052cd5e6	tx utils - detect estimateGas err and set simulationFailed	2017-08-08 23:34:18 -07:00
Frankie	57f6fce6b2	Merge pull request #1882 from MetaMask/tx-cont-fixes ... Tx cont fixes	2017-08-09 00:16:49 -04:00
kumavis	25f9746dab	tx controller - fix error serialization	2017-08-08 21:09:28 -07:00
kumavis	5e6962342d	tx controller - fix getBalance fn	2017-08-08 21:08:30 -07:00
kumavis	5418813ed1	util - sufficientBalance - validate input	2017-08-08 21:05:59 -07:00
Frankie	d40bd9a726	Merge pull request #1880 from MetaMask/pendingFix ... fix getPendingTransactions function for pendingTxTracker	2017-08-08 22:00:17 -04:00
frankiebee	9c9165e930	filter by network for pending txs	2017-08-08 21:54:26 -04:00
frankiebee	5bb84f6e21	fix getPendingTransactions function for pendingTxTracker	2017-08-08 21:49:48 -04:00
Thomas Huang	02a6cd255b	Merge pull request #1879 from MetaMask/build-err-fix ... Build sys - prevent err from being swallowed	2017-08-08 18:44:53 -07:00
kumavis	59e83d2b80	build - factor watcify into bundler generation	2017-08-08 17:53:34 -07:00
kumavis	4a4736195f	build - fix error swallowing on dev	2017-08-08 17:46:31 -07:00
kumavis	6767430aa2	deps - bump watchify	2017-08-08 17:46:09 -07:00
Thomas Huang	0e6bc6647e	Merge pull request #1854 from MetaMask/greenkeeper/initial ... Greenkeeper/initial	2017-08-08 16:32:55 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
kumavis	7db1f30590	Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout ... Improve layout for legacy buy screen	2017-08-08 15:56:02 -07:00
kumavis	cd1437fdd3	Merge pull request #1861 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 2	2017-08-08 15:54:08 -07:00
frankiebee	88b84e3895	add json-rpc-engine && eth-json-rpc-middleware to devDependencies	2017-08-08 18:34:59 -04:00
frankiebee	a13643bdb5	fix class names	2017-08-08 18:30:49 -04:00
frankiebee	e761fb0ef7	use provider stub	2017-08-08 18:30:22 -04:00
frankiebee	be4011c310	create a provider stub	2017-08-08 18:30:03 -04:00
sdtsui	9d3b5348aa	Fix layout issues flagged by @tmashuang	2017-08-08 15:17:52 -07:00
sdtsui	b6a7281737	Make buy ui more central to the screen	2017-08-08 15:17:24 -07:00