4355 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	cb7d07ebae	Fix mismatched decimal/hex conversion in pending-tx	2017-10-25 11:32:38 -07:00
Dan Finlay	c0e0522c30	Remove css build bundle from uat	2017-10-25 10:39:03 -07:00
Dan Finlay	074f10575f	Update changelog	2017-10-25 10:29:46 -07:00
Kevin Serrano	242456ba6a	Resolve merge conflict.	2017-10-24 16:44:25 -07:00
Kevin Serrano	98d8275743	Fix for gas price to be lowered.	2017-10-24 16:43:03 -07:00
Dan Finlay	35ca7e83bd	Reduce minimum gas price to 100 MWEI ... Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.	2017-10-24 15:10:03 -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
Frankie	61eea51310	Merge pull request #2429 from MetaMask/i2428-AltEnsTlds ... Add support for alternative ENS TLDs	2017-10-23 11:49:04 -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
Chi Kei Chan	5aaa2d679b	Add ShapeShift UI	2017-10-20 21:51:37 -07:00
Chi Kei Chan	c6a3d00d80	Fix merge conflict; separate onboarding buy screen	2017-10-20 21:51:37 -07:00
Chi Kei Chan	e88baff2ee	Add missing presets	2017-10-20 21:51:37 -07:00
Jacky Chan	ad647050d6	Move "Skip this step" to side panel	2017-10-20 21:51:37 -07:00
Jacky Chan	a4ad88c331	Disable CTA unless notice is scrolled to bottom	2017-10-20 21:51:37 -07:00
Jacky Chan	945cc5d18d	Fix Buy Ether flow	2017-10-20 21:51:37 -07:00
Jacky Chan	638bbe0428	Shuffle tokens	2017-10-20 21:51:37 -07:00
Jacky Chan	85e485128f	Add Go to Coinbase; Show Buy Ether after signup	2017-10-20 21:51:37 -07:00
Jacky Chan	4ecd28ca9b	Hide Warning after changing import options	2017-10-20 21:51:37 -07:00
Jacky Chan	0cc521e130	Implement Buy Ether Screen UI	2017-10-20 21:51:37 -07:00
Jacky Chan	449bce5eea	Implement Import Account Screen	2017-10-20 21:51:37 -07:00
Jacky Chan	1a9b217558	Add BackupPhraseScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	fd4fbdc0cd	Add NoticeScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	e1497fafa6	Add UniqueImageScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	4e446410eb	Add Breadcrumbs	2017-10-20 21:51:37 -07:00
Jacky Chan	537f8a6ce1	CreatePasswordScreen	2017-10-20 21:51:37 -07:00
Jacky Chan	0264ecaad7	Adding CreatePasswordScreen	2017-10-20 21:51:37 -07:00
Thomas Huang	20cb6a76dd	Merge pull request #2419 from MetaMask/Version-3.11.1 ... Version 3.11.1	2017-10-20 21:58:18 -04:00
Dan Finlay	56dcf7c011	Version 3.11.1	2017-10-20 14:07:54 -07:00
Frankie	09e04606cd	Merge pull request #2401 from MetaMask/filter-fix-maybe ... filters bug fix	2017-10-20 13:13:18 -07:00
kumavis	a71c95b987	changelog entry for filter fix	2017-10-20 12:32:15 -07:00
kumavis	61e1b821d4	Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe	2017-10-20 12:31:40 -07:00
kumavis	8472ca406a	deps - bump eth-json-rpc-filters for log filter fix	2017-10-20 12:29:12 -07:00
kumavis	2a18f732c7	Merge pull request #2412 from MetaMask/x-frame-options ... mascara - set x-frame-options header to DENY	2017-10-20 11:04:11 -07:00
Thomas Huang	e3a7da961d	Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVault ... Select first account on create or restore vault	2017-10-20 12:09:44 -04:00