3828 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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	6f4bee4599	Hook up send button to Send Token screen	2017-07-31 23:21:11 -07:00
sdtsui	a7fc512650	Implement mobile-friendly responsive layout with flex wrap	2017-07-31 23:07:58 -07:00
sdtsui	9cc461a6c2	Reset popup to 350x500, old form factor as advised by @Zanibas	2017-07-31 23:07:25 -07:00
sdtsui	caab0b61cc	Add rough layout for tx list items	2017-07-31 22:00:18 -07:00
sdtsui	ce06fbd36d	Add tx-view content divider component	2017-07-31 21:34:37 -07:00
sdtsui	c7ace5b23d	Add hyperscript for tx-view tabs	2017-07-31 21:27:37 -07:00
sdtsui	c876428044	Add TxView, use width percentages instead of flex-grow for layout	2017-07-31 21:16:07 -07:00
sdtsui	92bd783e0c	Adjust button styles to left align with wallet text	2017-07-31 20:54:04 -07:00
sdtsui	2d5c3394f4	Use DIN OT in wallet view	2017-07-31 20:46:56 -07:00
sdtsui	fce6041dbe	Add new fonts from @cjeria: DIN Next and DIN OT	2017-07-31 20:44:32 -07:00
sdtsui	3797b9921f	Adjust popup size to 545x450; refactor wallet view to fit	2017-07-31 20:22:15 -07:00
sdtsui	0c1aea97c7	Isolate wallet-content-display component	2017-07-30 22:30:55 -07:00
sdtsui	7d4927c975	Add layout for Buy and Send buttons	2017-07-30 22:25:20 -07:00
sdtsui	610d6da8ae	Add hyperscript for wallet display component	2017-07-30 22:10:59 -07:00
sdtsui	0ca50dfb1b	Center account name and dropdowns	2017-07-30 21:53:13 -07:00
sdtsui	ddbf5613b3	Add note for later on isolating components	2017-07-30 21:35:41 -07:00
sdtsui	4cdfd00f58	Add box shadow to main container	2017-07-30 21:35:27 -07:00
sdtsui	cbd53d4601	Add containers for wallet view and dropdown UI	2017-07-30 21:25:32 -07:00
sdtsui	ca1a4b3096	Add layout for main container elements	2017-07-30 20:42:12 -07:00
sdtsui	b15575b453	Remove old header space	2017-07-30 20:02:42 -07:00
sdtsui	7ea38523ea	Set font-size on body of popup.html, for responsiveness	2017-07-30 19:56:11 -07:00
sdtsui	dd3766242d	Adjust dimensions of popup.html and app bar to match	2017-07-30 19:52:27 -07:00
sdtsui	a7ab69b940	Adjust button styles for Send Token screen	2017-07-30 16:47:47 -07:00
sdtsui	97cb25c9f1	Adjust copy in send token confirmation screen	2017-07-29 23:11:11 -07:00