3615 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
sdtsui	f329c232a2	Hook up new dropdown components	2017-07-18 05:40:43 -07:00
sdtsui	b9dfb3cd1e	Remove account options icons	2017-07-18 05:31:53 -07:00
sdtsui	fce7bf3a1c	Remove accounts screen	2017-07-18 05:31:52 -07:00
sdtsui	2adfce772c	Add new tests for dropdown component	2017-07-18 05:31:52 -07:00
sdtsui	ccf3e0e251	Bump version of menu-droppo to include bugfix	2017-07-18 05:31:52 -07:00
sdtsui	b05775bfa4	Fix click handlers on AccountOptionsMenus	2017-07-18 05:31:52 -07:00
sdtsui	433fb4d242	Cleanup ... Fix lint error breaking gulp build Add presentational options menus	2017-07-18 05:31:39 -07:00
Dan Finlay	5f2335e68f	Merge pull request #1786 from MetaMask/turnOffAutoFaucet ... turn off auto faucet	2017-07-17 14:49:12 -07:00
frankiebee	948f3880a3	turn off auto faucet and remove file	2017-07-17 17:37:01 -04:00
Dan Finlay	614501e743	Fix transaction confirmation ordering ... Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed. Fixes #1637	2017-07-17 14:18:00 -07:00
Kevin Serrano	919f3c4601	Merge pull request #1781 from MetaMask/AddSupportLink ... Add support page link to help page	2017-07-17 10:04:41 -07:00
Dan Finlay	a4e567ffc5	Add support page link to help page ... Also adjust github link to be a new bug link, which goes to the new issue page.	2017-07-17 09:57:16 -07:00
kumavis	43a3d0d01d	Merge pull request #1777 from MetaMask/InfuraTest ... Infura Network response tests	2017-07-14 14:39:18 -07:00
tmashuang	a4c7d95d0d	Sinon stub infura network status	2017-07-14 13:06:42 -07:00
tmashuang	6cf2a956c1	Update Sinon	2017-07-14 13:05:56 -07:00
tmashuang	02cf65d513	Use Let instead of var	2017-07-14 11:50:41 -07:00
tmashuang	bda52f7cba	Infura Network response tests	2017-07-14 10:34:03 -07:00
kumavis	1e0cd5f302	Merge pull request #1772 from sdtsui/new-dropdown ... Implement NewUI Dropdown Component	2017-07-13 23:55:56 -07:00
sdtsui	d01b5c927d	Brighten dropdown menu item\'s text	2017-07-13 22:39:44 -07:00
Frankie	9d3207fb73	Merge pull request #1617 from MetaMask/nonce-tracker ... transaction controller - use nonce-tracker	2017-07-13 15:48:50 -04:00
frankiebee	7eccf5905a	make publishTransaction and signTransaction async methods	2017-07-13 15:25:43 -04:00
frankiebee	d6001daab8	remove denodeify	2017-07-13 15:24:19 -04:00
kumavis	43b7d5f0eb	Merge pull request #1775 from MetaMask/BlacklistFaster ... Redirect from malicious sites faster	2017-07-13 11:00:40 -07:00
Dan Finlay	5e31fc97cd	Redirect from malicious sites faster	2017-07-13 10:38:56 -07:00
sdtsui	1507da139d	Add tests for new dropdown component	2017-07-13 00:40:22 -07:00
sdtsui	a49e5e158a	Implement redesigned dropdown	2017-07-13 00:40:00 -07:00
kumavis	3d082203ec	Merge pull request #1771 from MetaMask/addNonceErrToErrLIst ... Add nonce err to err list	2017-07-12 23:41:26 -07:00
frankiebee	6086bcdf0d	limit the range for retryCount	2017-07-12 20:01:07 -07:00