3625 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sdtsui	0cd72db2d2	Adds early breakpoint from @frankiebee 's + @kumavis 's CR	2017-08-04 12:57:16 -07:00
kumavis	650956934c	Merge branch 'NewUI' of github.com:MetaMask/metamask-extension into NewUI	2017-08-03 22:24:41 -07:00
kumavis	0a5a46b8f4	test - integration - better error handling	2017-08-03 22:24:22 -07:00
kumavis	75b397b158	Merge branch 'master' into NewUI	2017-08-03 22:21:13 -07:00
Frankie	a3cd2a091c	Merge pull request #1859 from MetaMask/v3.9.4 ... v3.9.4	2017-08-04 01:16:22 -04:00
kumavis	a444326a1e	v3.9.4	2017-08-03 22:06:26 -07:00
kumavis	f804567d24	test - integration - syntax - prefer const	2017-08-03 21:50:41 -07:00
kumavis	925edd5f7d	test - integration - remove unused code	2017-08-03 21:50:17 -07:00
kumavis	44616483e0	test - integration - throw error on failure	2017-08-03 21:40:32 -07:00
kumavis	29dcadc346	ui - dropdown - use Object.assign syntax to appease coverage parser	2017-08-03 21:32:08 -07:00
kumavis	5a9257208c	Merge branch 'master' into NewUI	2017-08-03 21:02:01 -07:00
kumavis	c4cb371ce8	Merge pull request #1857 from MetaMask/hotFixCancleTx ... fix cancelTransaction not receiving a callback	2017-08-03 21:01:13 -07:00
kumavis	17c9fd450f	Merge pull request #1858 from sdtsui/NewUI ... UI Tweaks, Minor Bugfixes, and Dropdown Resizing	2017-08-03 20:59:47 -07:00
kumavis	d526f68c8e	test - actions - tx - fix async test	2017-08-03 20:56:53 -07:00
kumavis	efb7543c6d	test - actions - remove commented code	2017-08-03 20:53:47 -07:00
kumavis	500e7d1f04	nodeify - test - syntax nitpick	2017-08-03 20:52:09 -07:00
sdtsui	777eb865df	Adjust padding of accountSwitcher dropdown	2017-08-03 20:03:48 -07:00
sdtsui	5ddb40f60c	Adjust top and bottom padding of accountSwitcher	2017-08-03 19:23:22 -07:00
sdtsui	baee076348	Lint ui/app	2017-08-03 19:17:46 -07:00
sdtsui	6f14f4b717	Allow new accounts selector to handle clicks	2017-08-03 19:10:37 -07:00
frankiebee	b955b5a89a	add test for no callback error	2017-08-03 22:10:33 -04:00
sdtsui	28fd016d12	Increase size of accountSelection dropdown	2017-08-03 19:08:36 -07:00
frankiebee	a8966c4a4f	fix test	2017-08-03 22:02:31 -04:00
sdtsui	36d8c3dd39	Increase size of settings dropdown and account settings dropdown	2017-08-03 18:55:11 -07:00
sdtsui	086441e41c	Increase size of network dropdown	2017-08-03 18:50:29 -07:00
sdtsui	10d3a519c8	De-dupe click handler for sandwich-expando	2017-08-03 18:35:10 -07:00
frankiebee	7de58c8709	fix cancelTransaction not reciving a callback	2017-08-03 21:22:08 -04:00
Frankie	fea03ad82e	Merge pull request #1856 from MetaMask/v3.9.3 ... v3.9.3	2017-08-03 21:17:16 -04:00
sdtsui	4d6a289629	Add note with previous fa-angle-down for future refactor	2017-08-03 17:50:00 -07:00
sdtsui	aff213e845	Position account switcher icon back in app header	2017-08-03 17:49:23 -07:00
sdtsui	850e9b63d2	Move accountselector menu-droppo up to app-header	2017-08-03 17:17:00 -07:00
sdtsui	ecb09fcc0a	Disable account selection dropdown from account details	2017-08-03 17:08:19 -07:00
sdtsui	67f10d660f	Adjust account checksumAddress location up	2017-08-03 17:03:14 -07:00
kumavis	10c6aeb2f8	v3.9.3	2017-08-03 17:01:09 -07:00
Kevin Serrano	24a13d116c	Fix fox positioning.	2017-08-03 16:35:14 -07:00
Kevin Serrano	77908e1181	Fix wonky widths for notices.	2017-08-03 16:30:57 -07:00
Kevin Serrano	cc3aea7f75	Merge pull request #1855 from MetaMask/blacklist-refactor2 ... deps - bump eth-detect-phishing	2017-08-03 16:29:27 -07:00
Kevin Serrano	b4f621c980	Add maximum width for private key reveal	2017-08-03 16:00:44 -07:00
kumavis	026f8592d8	deps - bump eth-detect-phishing	2017-08-03 15:59:01 -07:00
Kevin Serrano	ce2e9872cf	Remove 100% properties that were messing up sizing.	2017-08-03 15:51:20 -07:00
Kevin Serrano	6176a4b1bf	Add QR functionality	2017-08-03 15:32:44 -07:00
Kevin Serrano	b1311b48c9	Merge pull request #1852 from MetaMask/blacklist-refactor2 ... blacklist - use module eth-phishing-detect	2017-08-03 14:37:21 -07:00
kumavis	34b1e80088	Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-refactor2	2017-08-03 14:28:48 -07:00
kumavis	d4877cb4e2	blacklist - use module eth-phishing-detect	2017-08-03 14:25:02 -07:00
Kevin Serrano	81982d01c0	Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI	2017-08-03 13:10:46 -07:00
Kevin Serrano	15bcbb4941	Merge pull request #1850 from MetaMask/stack ... remove stack from txs	2017-08-03 13:09:27 -07:00
frankiebee	dce593fd7b	remove stack from txs	2017-08-03 15:39:55 -04:00
kumavis	8a9d0073b1	Merge pull request #1848 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 1: promises for everyone and more tests!	2017-08-02 19:57:16 -07:00
Kevin Serrano	2c37d43888	Merge pull request #1849 from MetaMask/blacklist-refactor ... Blacklist refactor	2017-08-02 16:20:53 -07:00
frankiebee	5ac4c2de6f	remove unused sinon	2017-08-02 19:11:51 -04:00