3748 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	24a13d116c	Fix fox positioning.	2017-08-03 16:35:14 -07:00
kumavis	e223b0c789	test - dont mix callback and promise	2017-08-03 16:34:38 -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
kumavis	bb8a09375d	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:12:24 -07:00
kumavis	da16f39626	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
kumavis	da7471e095	lint fixes	2017-08-03 14:48:19 -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
frankiebee	b471afcdb3	use error for #approveTransaction when setting failed	2017-08-02 19:24:34 -04: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
frankiebee	340dbe75fc	use async with #publishTransaction	2017-08-02 19:09:37 -04:00
frankiebee	0808eb2256	fix test	2017-08-02 19:07:18 -04:00
frankiebee	b80c7e417b	move newUnapprovedTransaction to transactions.js	2017-08-02 18:59:34 -04:00
kumavis	8c6f01b910	blacklist controller - breakout from metamask and infura controllers	2017-08-02 15:54:59 -07:00
kumavis	ecaa235b5e	phishing detection - move phishing detection into contentscript and metamask controller	2017-08-02 14:26:10 -07:00
kumavis	aea5735b29	obj-multiplex - missing name error + prefer const over var	2017-08-02 14:25:28 -07:00
frankiebee	25bc15ba17	lint fixes	2017-08-02 11:47:13 -04:00
frankiebee	25cffd21f8	Merge branch 'master' into transactionControllerRefractor	2017-08-02 11:41:29 -04:00
frankiebee	ece9200c72	fix spelling mistake	2017-08-02 11:36:07 -04:00
frankiebee	3a4726018e	fix addTxDefaults	2017-08-02 11:35:35 -04:00
frankiebee	21e76484d6	add test for addTxDefaults	2017-08-02 11:34:45 -04:00
frankiebee	432f516ab0	make addUnapprovedTransaction async function and use promise based ethQuery	2017-08-02 10:26:25 -04:00
kumavis	9eb13aee00	blacklist - add tests for metamask subdomains	2017-08-01 17:05:36 -07:00
kumavis	9d345e744d	blacklist - clearer test format	2017-08-01 16:58:40 -07:00
kumavis	4115c25d8f	lint fix	2017-08-01 13:21:02 -07:00
Kevin Serrano	947f13d58c	Merge pull request #1841 from sdtsui/fix/dropdown-toggle ... [Part-1] Fix/dropdown toggle	2017-08-01 10:59:20 -07:00
sdtsui	4044b58b5a	Fix dropdown behavior - network	2017-07-28 15:55:55 -07:00
sdtsui	34834c108d	Fix dropdown toggle behavior - settings	2017-07-28 15:40:26 -07:00
sdtsui	24d375aaf1	Fix dropdown toggle behavior - account dropdowns	2017-07-28 15:31:07 -07:00
Dan Finlay	651fec5112	Create distinct responsive 'home.html' file, hard-code popup.html size ... Because firefox was having inconsistent sizing, made a second html file for forcing the view to a certain size. Still allows us to develop a responsive interface via the `home.html` file, which shares all the same react JS & CSS as popup.html.	2017-07-28 11:06:39 -07:00
Dan Finlay	9ac0a18f3b	Correct viewport param	2017-07-27 18:43:18 -07:00
Dan Finlay	d1828b6dc9	Fix react warning	2017-07-27 18:43:09 -07:00
Dan Finlay	a25c4f34c0	Limit max width of seed word conf screen	2017-07-27 18:32:32 -07:00
Dan Finlay	87c26eb5bc	Correct token pluralization for one token	2017-07-27 18:07:42 -07:00
Dan Finlay	6c25f9950b	Bump changelog	2017-07-27 15:25:00 -07:00
Dan Finlay	d932524eaf	Merge branch 'master' into NewUI	2017-07-27 15:24:10 -07:00
Kevin Serrano	d15e402ed8	Merge pull request #1838 from MetaMask/i1805-LiveBlacklistUpdating ... Live blacklist updating	2017-07-27 15:22:09 -07:00
Dan Finlay	7c71ee1bab	Do not blacklist files	2017-07-27 15:16:42 -07:00
Dan Finlay	f8cadbcb32	Merge branch 'master' into NewUI	2017-07-27 15:10:02 -07:00