5719 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas	208b3bc4c1	Add i18n back into JsonImportSubview	2018-03-12 08:07:12 -07:00
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
kumavis	4bc69f72c3	test - mascara - fix async wrap	2018-03-11 21:39:46 -07:00
kumavis	3537c391db	test - use new async selectors for faster testing	2018-03-11 19:29:35 -07:00
kumavis	ecb792ae50	genStates - fix fs api calls	2018-03-11 19:06:14 -07:00
kumavis	07fa26d1f0	test - add comment about test behavior oddity	2018-03-11 18:52:27 -07:00
kumavis	0419276958	test - poll for element instead of manual timeouts	2018-03-11 14:52:29 -07:00
kumavis	7e56c6b6fa	test - genStates - use async api	2018-03-11 14:51:54 -07:00
kumavis	2c3e6552d2	ci - wrap env var in quotes	2018-03-10 11:13:27 -08:00
kumavis	74502296ed	ci - split integration tests into parallel firefox and chrome runs	2018-03-10 11:09:45 -08:00
kumavis	ddc85354d3	Merge pull request #3501 from MetaMask/circleci-2.0 ... ci - introduce circle ci 2.0	2018-03-09 16:07:28 -08:00
kumavis	efe516857a	ci - adjust scss cache key	2018-03-09 15:30:58 -08:00
kumavis	5cbd5cd50a	ci - cache firefox against Revision	2018-03-09 15:20:59 -08:00
kumavis	650a88412b	ci - cache firefox install under build number	2018-03-09 15:16:34 -08:00
kumavis	a59d9d996c	ci - split download and install firefox steps	2018-03-09 15:11:09 -08:00
kumavis	6093d46ba1	ci - install firefox58 and cache	2018-03-09 14:58:02 -08:00
kumavis	702d09b557	ci - prep-deps - install latest firefox	2018-03-09 14:27:27 -08:00
Thomas Huang	634e5d8f55	Merge pull request #3500 from MetaMask/greenkeeper-chill ... deps - update deps to appease greenkeeper	2018-03-09 17:06:44 -05:00
kumavis	9378bc50d2	ci - optimize - dont update npm	2018-03-09 14:01:42 -08:00
kumavis	dab47e5bfa	ci - integration tests need to generate scss cache key	2018-03-09 14:00:36 -08:00
kumavis	6c3706f3e8	ci - fix typo	2018-03-09 13:50:57 -08:00
kumavis	3580196650	test - breakout npm script for building for integration tests	2018-03-09 13:48:48 -08:00
kumavis	7ad1421f61	ci - fix config formatting	2018-03-09 13:43:18 -08:00
kumavis	e024b57150	ci - add prep-scss to flow	2018-03-09 13:41:18 -08:00
kumavis	79a0b22ea4	ci - parallize flat + mascara integration tests	2018-03-09 13:37:13 -08:00
kumavis	828ac9a232	ci - breakup npm test into parallel processes	2018-03-09 13:15:36 -08:00
kumavis	69345770fb	ci - restore node_modules before test	2018-03-09 13:04:53 -08:00
kumavis	8cf6db16f7	ci - test on all branches	2018-03-09 12:52:29 -08:00
kumavis	4ed6ac92e4	ci - update circle config	2018-03-09 12:47:01 -08:00
kumavis	a13ed5e65a	ci - introduce circle ci 2.0	2018-03-09 12:38:28 -08:00
kumavis	25f147cc4b	deps - update package-lock	2018-03-09 11:58:37 -08:00
greenkeeper[bot]	ce139db99b	chore(package): update gulp-stylelint to version 7.0.0	2018-03-09 11:57:55 -08:00
greenkeeper[bot]	16050f4aeb	chore(package): update stylelint-config-standard to version 18.2.0	2018-03-09 11:57:26 -08:00
greenkeeper[bot]	c05b220024	fix(package): update gulp-autoprefixer to version 5.0.0	2018-03-09 11:56:52 -08:00
kumavis	85d48b4fb7	deps - remove unused missippi dep	2018-03-09 11:53:59 -08:00
greenkeeper[bot]	c4f697d87f	chore(package): update browserify to version 16.1.1 ... Closes #2861	2018-03-09 11:51:10 -08:00
kumavis	b4a686a5c6	deps - bump pump	2018-03-09 11:51:03 -08:00
kumavis	7d0363e950	Merge pull request #3497 from MetaMask/testing ... Persist rinkeby.infura.io and clean nock after	2018-03-09 11:49:48 -08:00
Thomas	ae795c9770	Persist rinkeby.infura.io and clean nock after	2018-03-09 11:20:18 -08:00
Dan Finlay	174f57b464	Document process of adding a new translation	2018-03-09 11:18:43 -08:00
kumavis	51b806797a	Merge pull request #3496 from MetaMask/nsp-fix ... node security - ignore known hoek advisory	2018-03-09 11:07:58 -08:00
kumavis	4c698be1d5	node security - ignore known hoek advisory	2018-03-09 10:53:10 -08:00
Alexander Tseung	a07550d2ab	Increase tap areas for menu buttons on mobile	2018-03-09 18:50:00 +01:00
Alexander Tseung	ab1b39f554	Remove de-selected token from selectedTokens hash instead of setting to null (#3494)	2018-03-09 16:31:53 +01:00
Alexander Tseung	d84341f323	Add empty object default value for tokenData (#3493)	2018-03-09 16:31:17 +01:00
Alexander Tseung	4b2e52795d	Explicitly define state in import account from json component (#3491)	2018-03-09 16:30:31 +01:00
Dan Finlay	f28bbe5b03	Merge pull request #3485 from MetaMask/package-lock ... meta - add package-lock to git	2018-03-08 17:25:20 -08:00
kumavis	4af2066298	meta - add package-lock to git	2018-03-08 16:20:23 -08:00
kumavis	a88e436b7d	lint fix	2018-03-08 14:55:35 -08:00
kumavis	455faece9e	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-08 14:14:49 -08:00