4800 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chi Kei Chan	7c20011023	Merge branch 'master' into NewUI-flat	2017-10-24 16:50:25 -07:00
Chi Kei Chan	ac3072e037	Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-error ... [NewUI] Disable Send-v2 next button when form is in error	2017-10-24 16:31:35 -07:00
Dan	ef2b0d8485	Simply logic for rendering matching accounts in to-autocomplete dropdown.	2017-10-24 16:31:04 -07:00
Dan	07c4c92db6	Style dropdown of to-autocomplete.	2017-10-24 16:31:04 -07:00
Thomas Huang	ae56b865e8	Merge pull request #1990 from chikeichan/firsttimeflow ... Implement Mascara First Time Flow	2017-10-24 11:22:31 -07:00
tmashuang	099078d13b	Add error messages when importing an account	2017-10-24 08:40:07 -07:00
tmashuang	91b23246cd	Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow	2017-10-24 08:36:02 -07:00
Daniel Tsui	09445ef692	Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-error	2017-10-24 04:32:19 -07:00
Chi Kei Chan	de3a48ec66	Fix mobile add token button	2017-10-24 01:19:00 -07:00
Chi Kei Chan	6daa834323	Disable network dropdown on conf tx screen	2017-10-24 01:07:51 -07:00
Chi Kei Chan	966e4cfd11	Change clickable area for account detail; change network dot size	2017-10-24 00:54:49 -07:00
Chi Kei Chan	4336794355	Fix styling in private key modal	2017-10-24 00:43:12 -07:00
Chi Kei Chan	ba9cefb24e	Add caret to Add Token toggle	2017-10-24 00:38:39 -07:00
Chi Kei Chan	2871beebe6	Add "Add Token" button to side bar	2017-10-24 00:29:20 -07:00
Chi Kei Chan	3891cf1af6	Fix clickable area on logout	2017-10-24 00:16:19 -07:00
Chi Kei Chan	4401800a42	Account menu white check mark	2017-10-24 00:13:49 -07:00
Chi Kei Chan	a63373401b	New Sidebar uplift	2017-10-23 23:59:21 -07:00
Chi Kei Chan	6d3f261b2f	Change LOOSE label to IMPORTED	2017-10-23 23:11:47 -07:00
Alexander Tseung	8895a225dc	Remove Current Provider info from Settings	2017-10-23 23:05:01 -07:00
Dan	e058efd6a8	Use classnames library and disabled attribute on 'Next' button in send-v2	2017-10-23 22:41:30 -07:00
Dan	e737a9565a	Improve customize gas modal error handling	2017-10-23 22:41:30 -07:00
Dan	a7069acf2e	Disable send-v2 next button if in error	2017-10-23 22:41:30 -07:00
Dan	09d659614e	Cleaner implementation of currency-display input.	2017-10-23 22:40:55 -07:00
Alexander Tseung	754d117d18	Fix settings styling on mobile view	2017-10-23 22:40:33 -07:00
Chi Kei Chan	66758b784a	Update token menu css	2017-10-23 15:57:14 -07:00
Dan	0a436dcf9a	Disable send-v2 next button if in error	2017-10-23 16:47:55 -02:30
Chi Kei Chan	0cbaec16f3	Merge pull request #2433 from danjm/NewUI-flat-precision-improvements ... [NewUI] Improves precision of a calculation in send, and in confirm	2017-10-23 11:50:59 -07:00
Chi Kei Chan	9984c9516a	Merge pull request #2434 from danjm/NewUI-flat-clear-send-state ... [NewUI] Clear send state on cancelling and signing.	2017-10-23 11:49:14 -07:00
Frankie	61eea51310	Merge pull request #2429 from MetaMask/i2428-AltEnsTlds ... Add support for alternative ENS TLDs	2017-10-23 11:49:04 -07:00
Chi Kei Chan	8de0292d66	Merge pull request #2431 from alextsg/nu-2406 ... [NewUI] Change all "Buy" to "Deposit"	2017-10-23 11:48:49 -07:00
Chi Kei Chan	4d968fba1e	Merge pull request #2430 from alextsg/cb-130 ... [NewUI] Update settings screen to new UI	2017-10-23 11:48:20 -07:00
Dan	b96ba55229	Clear send state on cancelling and signing.	2017-10-23 16:03:48 -02:30
Dan	b3dad510b7	Improve precision in send and confirm.	2017-10-23 15:53:28 -02:30
Alexander Tseung	bef1405a50	Change all "Buy" to "Deposit"	2017-10-22 22:59:55 -07:00
Alexander Tseung	2c032e0df4	Update settings screen to new UI	2017-10-22 22:40:03 -07:00
Dan Finlay	6d05238469	Try to fix intermittent test failure in NonceTracker tests	2017-10-22 22:24:50 -07:00
Dan Finlay	926abc12b1	Add support for alternative ENS TLDs ... Fixes #2428	2017-10-22 22:12:12 -07:00
Dan Finlay	e564ed8d4c	Version 3.11.2	2017-10-21 15:40:57 -07:00
Thomas Huang	1c273b50d3	Merge pull request #2423 from MetaMask/json-rpc-fix ... Temporarily reversal of json-rpc-engine	2017-10-21 18:08:15 -04:00
Kevin Serrano	721019bc2b	Temporarily reversal of json-rpc-engine	2017-10-21 14:47:12 -07:00
Chi Kei Chan	f503120b82	Add Import With Seed Phrase	2017-10-20 22:31:59 -07:00
Chi Kei Chan	2b26496826	Add mobile responsiveness	2017-10-20 21:51:37 -07:00
Chi Kei Chan	213cf6aa09	Remove import option	2017-10-20 21:51:37 -07:00
Chi Kei Chan	63a5eca967	Fix import	2017-10-20 21:51:37 -07:00
Chi Kei Chan	25f4f69706	Fix capitialization	2017-10-20 21:51:37 -07:00
Chi Kei Chan	5484e68896	Add Integration Tests	2017-10-20 21:51:37 -07:00
Chi Kei Chan	d9735ed5b3	Fixing integraiton test	2017-10-20 21:51:37 -07:00
Chi Kei Chan	996523c790	Fix unit test	2017-10-20 21:51:37 -07:00
Chi Kei Chan	ac50db52a9	Fix linter	2017-10-20 21:51:37 -07:00
Chi Kei Chan	5cbbb476b3	ShapeShift Integration	2017-10-20 21:51:37 -07:00