3958 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
sdtsui	0171918407	Add rough layout for flat layout tx details, add notes for breakpoints	2017-08-03 01:17:27 -07:00
sdtsui	267d12646c	Implement 'clear buttons' for tx view	2017-08-03 00:43:24 -07:00
sdtsui	6fd1c15a5c	Fix color for large password input	2017-08-03 00:25:25 -07:00
sdtsui	0e631f6ac0	Add notes for @Zanibar, with props.isUnlocked and currentView.name logs	2017-08-03 00:22:41 -07:00
sdtsui	d6779115cd	Fix background color for lock screen	2017-08-03 00:21:19 -07:00
sdtsui	3ed81847d1	Isolate routing logic for isUnlocked, remove stray logs	2017-08-03 00:01:38 -07:00
sdtsui	c7ac20ff65	Finalize sidebar dimensions	2017-08-02 23:14:53 -07:00
sdtsui	01788376d5	Finalize height for main screens, excluding sidebar	2017-08-02 23:07:35 -07:00
sdtsui	c47f81b2e0	Finalize width of main container for all viewports	2017-08-02 22:59:04 -07:00
sdtsui	b523faba13	Make mobile view flush with header	2017-08-02 22:23:48 -07:00
sdtsui	ff7ba83a6c	Add note for styling buttons	2017-08-02 22:09:12 -07:00
sdtsui	b70a399faa	Isolate container component, add refactor notes	2017-08-02 21:53:40 -07: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
sdtsui	41250f9769	Adjust header spacing for 500px and 900px heights	2017-08-02 19:48:33 -07:00
sdtsui	dd4586ee84	Adjust sidebar transition using @cjeria\'s feedback	2017-08-02 19:26:46 -07:00
sdtsui	61b4b1f947	Ensure app-header is rendered in responsive layout	2017-08-02 19:13:17 -07:00
sdtsui	49e3713704	Cleanup send, move send token into separate func to make room for send ETH	2017-08-02 18:24:48 -07:00
sdtsui	46da924d48	Add Ethereum Logo	2017-08-02 18:24:30 -07:00
sdtsui	c312f34119	Move overlay out of transition area	2017-08-02 17:50:27 -07:00
sdtsui	8a39ef03c2	Hook up css animation	2017-08-02 17:49:04 -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
sdtsui	84aba21ae9	Add notes for overlay click action	2017-08-02 14:19:13 -07:00
sdtsui	9ebdc343aa	Implement custom sidebar, with close button	2017-08-02 14:17:58 -07:00
sdtsui	dfa10763e3	Integrate slideout menu with tx view	2017-08-02 13:32:02 -07:00
sdtsui	7767f9f7ad	Hook up responsive sidebar	2017-08-02 13:03:36 -07:00
sdtsui	96d3b2f35f	Add dependejncy: react-burger-menu	2017-08-02 13:03:30 -07:00
sdtsui	22b03c62e6	Add burger icon and phone-visible media queries	2017-08-02 12:29:07 -07:00
sdtsui	41c585c796	Make wallet view visible iff vw above 575px	2017-08-02 12:18:29 -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