3593 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankiebee	ba88f7b8dd	fix typo	2017-07-25 18:29:02 -04:00
Frankie	a929fb2387	Merge branch 'master' into betterErrorsOnTx	2017-07-25 18:26:41 -04:00
frankiebee	b81f883150	fix stack wording	2017-07-25 18:23:26 -04:00
frankiebee	1df833bee8	use clone	2017-07-25 18:21:40 -04:00
frankiebee	e0a626da3b	remove line numbers	2017-07-25 18:02:21 -04:00
Frankie	0c73d6d852	Merge pull request #1824 from MetaMask/tx-cont-fix ... TransactionController & NetworkController fixes	2017-07-25 17:46:31 -04:00
kumavis	5ec73c0e65	tx cont - fix test to use async api	2017-07-25 14:39:17 -07:00
kumavis	4445ba1569	tx cont - add argument for provider constructor	2017-07-25 14:36:19 -07:00
kumavis	5b9a6bd367	tx cont - remove old cb from async fn	2017-07-25 13:16:46 -07:00
frankiebee	ab01358a48	Add stack traces both in errors and as a way to track txMetas	2017-07-25 16:08:31 -04:00
Dan Finlay	e081ddf347	Merge pull request #1821 from MetaMask/fetch-retry-2 ... prov-eng - bump to ignore json parse errors	2017-07-25 12:43:48 -07:00
kumavis	77d91ec36f	prov-eng - bump to ignore json parse errors	2017-07-25 11:57:03 -07:00
Dan Finlay	7a04643d8e	Restore sort order fix	2017-07-24 21:43:34 -07:00
Dan Finlay	a22adec66f	Replace ui with responsive-ui	2017-07-24 17:05:07 -07:00
Dan Finlay	fcde52f390	Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI	2017-07-24 17:03:42 -07:00
Dan Finlay	de286d2382	Css tweaks	2017-07-24 17:03:30 -07:00
Thomas Huang	a1fab06490	Simplify the test-coverage script	2017-07-24 13:46:02 -07:00
kumavis	b602b3216b	Merge pull request #1815 from sdtsui/fix/menu-cursor ... Add cursor to account menu buttons	2017-07-24 12:02:36 -07:00
sdtsui	91edab2b1c	Add cursor to account menu buttons	2017-07-24 10:38:24 -07:00
Thomas Huang	24ffb40ec7	Add coveralls to script	2017-07-24 09:06:40 -07:00
Thomas Huang	55b7e457c5	Configure ci build to run tests individually	2017-07-23 21:35:21 -07:00
Thomas Huang	d571f5ee70	Add Test Coverage with nyc package and coveralls for github badge	2017-07-23 21:32:49 -07:00
Dan Finlay	60aea4839c	Improve account-detail panel responsiveness	2017-07-20 17:00:00 -07:00
Dan Finlay	5f61fd242c	Prevent buy button from floating	2017-07-20 16:44:01 -07:00
Dan Finlay	36c997a55e	Make main account detail view more responsive	2017-07-20 16:17:01 -07:00
Dan Finlay	6553c9c64b	Merge pull request #1802 from MetaMask/RestructureNewUI ... Restructure new ui branch folders	2017-07-20 14:05:12 -07:00
Dan Finlay	38dccab12e	Fix reference	2017-07-20 12:54:08 -07:00
Dan Finlay	31e7d8a24b	Fix css links	2017-07-20 12:52:01 -07:00
Dan Finlay	a41e5788cf	Merge branch 'master' into NewUI	2017-07-20 12:39:06 -07:00
Dan Finlay	86d367957f	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
Kevin Serrano	9b24ab0e70	Merge pull request #1801 from MetaMask/i1800-UpdateTutorialLink ... Update tutorial link	2017-07-20 09:59:57 -07:00
Dan Finlay	366ddc6248	Add user support link	2017-07-20 09:55:47 -07:00
Dan Finlay	9018810ac2	Update tutorial links	2017-07-20 09:55:10 -07:00
kumavis	bf1dc47e38	Merge pull request #1799 from MetaMask/Version-3.9.1 ... Version 3.9.1	2017-07-19 12:50:43 -07:00
Dan Finlay	dcf025782b	Version 3.9.1	2017-07-19 12:24:32 -07:00
kumavis	d2fd7e81c4	Merge pull request #1796 from MetaMask/1GweiMinGasPrice ... Lowered minimum gas price to 1 gwei	2017-07-19 11:54:56 -07:00
Dan Finlay	51c5bebdf5	Lowered minimum gas price to 1 gwei	2017-07-19 11:44:00 -07:00
Dan Finlay	92a8af9912	Merge pull request #1794 from MetaMask/nonce-tracker-fixes ... Nonce tracker fixes	2017-07-18 15:41:15 -07:00
kumavis	2832713a46	changelog - add nonce-tracker note	2017-07-18 15:30:32 -07:00
kumavis	12d6f21627	transactions - block nonce-tracker while updating pending transactions	2017-07-18 15:27:15 -07:00
kumavis	aa48ed34c4	nonce-tracker - fix lock mechanism to be a real mutex	2017-07-18 15:11:29 -07:00
kumavis	67fdba5e42	transaction - promisify _checkPendingTxs	2017-07-18 14:00:43 -07:00
kumavis	d249da77d7	nonce-tracker - return nonce as integer	2017-07-18 13:59:56 -07:00
kumavis	4f9fc8014a	nonce-tracker - validate nonce calc components	2017-07-18 12:48:16 -07:00
Dan Finlay	199587383b	Merge pull request #1790 from sdtsui/newui-account-dropdowns ... [newui] - Implement Advanced Option Menu & Account Switching Menu	2017-07-18 11:05:19 -07:00
sdtsui	9e8e445695	Reorder Account Selector and Account Options	2017-07-18 10:51:11 -07:00
kumavis	1e71850582	Merge pull request #1787 from MetaMask/i1637-TransactionOrder ... Fix transaction confirmation ordering	2017-07-18 09:34:02 -07:00
kumavis	e083e77585	Merge pull request #1791 from MetaMask/ciBadge ... Change Ci Badge url for readme	2017-07-18 09:32:42 -07:00
tmashuang	d9a195f86b	Shield looks better	2017-07-18 09:20:48 -07:00
tmashuang	0ebec8d0a8	Change Ci Badge url for readme	2017-07-18 09:08:24 -07:00