5382 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan	d8896a8c31	Merge branch 'master' into uat	2018-02-07 16:32:47 -03:30
Thomas Huang	dc24a6e8c2	Merge pull request #3177 from MetaMask/Version-3.14.1 ... Version 3.14.1	2018-02-01 16:12:27 -08:00
Dan Finlay	9f304e3026	Version 3.14.1	2018-02-01 15:53:18 -08:00
Dan Finlay	daa7caf7bb	Merge pull request #3176 from MetaMask/FirefoxSettingsOverflow ... Scrollable Settings screen for Firefox	2018-02-01 15:51:55 -08:00
Thomas	10e75dc4dd	Scrollable Settings screen for Firefox	2018-02-01 14:53:43 -08:00
Frankie	3b89a3f6ce	Merge pull request #3175 from MetaMask/Version-3.13.9 ... Version 3.14.0	2018-02-01 14:47:20 -08:00
Dan Finlay	0608d1579f	Version 3.14.0	2018-02-01 12:27:19 -08:00
Dan Finlay	678bf561ce	Remove deps from build process ... Was running out of stdout memory, preventing me from building.	2018-02-01 12:26:17 -08:00
Frankie	0b4e3c5d6a	Merge pull request #3161 from MetaMask/AddResetExplanation ... Add reset explanation	2018-01-31 14:49:29 -08:00
Dan Finlay	86d56419f4	Add explanation of account resetting	2018-01-31 14:31:56 -08:00
Dan Finlay	4f61029177	Remove unused file	2018-01-31 14:20:59 -08:00
Frankie	1a93b1ade2	Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs ... Set address to default with empty string, add test validation.	2018-01-31 14:18:47 -08:00
Frankie	1eec2ca8c0	Merge pull request #3148 from MetaMask/localStorage-clean-up ... remove BlacklistController from disk state	2018-01-31 14:15:52 -08:00
frankiebee	6106ff020f	fix changelog	2018-01-31 13:18:15 -08:00
Frankie	201e0579a5	Merge branch 'master' into localStorage-clean-up	2018-01-31 11:57:38 -08:00
Dan Finlay	f165356196	Merge pull request #3155 from brunobar79/feature/reset-account ... Added reset account feature	2018-01-31 11:40:33 -08:00
frankiebee	7e14468013	Merge branch 'localStorage-clean-up' of https://github.com/MetaMask/metamask-extension into localStorage-clean-up	2018-01-31 10:50:52 -08:00
frankiebee	c3adbda5f5	remove RecentBlocks from disk	2018-01-31 10:49:58 -08:00
Bruno Barbieri	94dd77d194	clean up	2018-01-31 13:34:14 -05:00
Bruno Barbieri	a70eda3651	add test for wipeTransactions	2018-01-31 13:29:30 -05:00
Bruno Barbieri	c1b7cfe91d	preserve other networks TXs	2018-01-31 13:29:02 -05:00
Bruno Barbieri	7dc1b09f94	use txMeta.txParams	2018-01-31 04:40:32 -05:00
Bruno Barbieri	03d17c75ae	wipe only transactions for current account	2018-01-31 04:25:32 -05:00
Bruno Barbieri	5f39844382	clean up	2018-01-31 03:36:04 -05:00
Bruno Barbieri	e6fda855a5	added reset account feature	2018-01-31 03:33:15 -05:00
Thomas	1f8dd5f0de	Bump Changelog	2018-01-30 16:11:16 -08:00
Frankie	f690355bd4	Merge branch 'master' into localStorage-clean-up	2018-01-30 15:36:24 -08:00
Frankie	1a32690a12	Merge pull request #3145 from MetaMask/i3089-FixNullError ... Add warning when importing no valid file	2018-01-30 15:32:04 -08:00
Dan Finlay	11a944719f	Add warning when importing no valid file ... Fixes #3089	2018-01-30 15:11:05 -08:00
frankiebee	e0caeae06d	test for migration 021	2018-01-30 15:03:42 -08:00
frankiebee	fa89976c68	add to CHANGELOG.md	2018-01-30 14:07:32 -08:00
frankiebee	28ee0aae91	creater migration to remove BlacklistController	2018-01-30 14:07:32 -08:00
frankiebee	f13ad6bd6a	remove BlacklistController from disk state	2018-01-30 14:07:32 -08:00
Thomas	a193ba60c6	Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to deps	2018-01-30 13:34:21 -08:00
Thomas	0f10aa3729	Clean up test, remove react & mountWithStore	2018-01-30 13:29:05 -08:00
Thomas	c2cef0f815	Set address to default with empty string, add test validation.	2018-01-30 13:26:37 -08:00
Thomas Huang	5f2d8eb5d2	Merge pull request #3126 from MetaMask/Version-3.13.8 ... Version 3.13.8	2018-01-29 11:46:06 -08:00
Dan Finlay	62b2ce5b69	Version 3.13.8	2018-01-29 11:38:25 -08:00
Thomas Huang	b991ac0422	Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0 ... Update gulp-watch to the latest version 🚀	2018-01-29 10:09:51 -08:00
Thomas Huang	ea68a5d22a	Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0 ... Update mocha to the latest version 🚀	2018-01-29 10:04:41 -08:00
Thomas Huang	5b24ef023a	Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0 ... Update testem to the latest version 🚀	2018-01-29 09:56:57 -08:00
Thomas Huang	9623270299	Merge pull request #3101 from MetaMask/eventemitterwarning ... Bump up EventEmitter listener warning threshold count to 20	2018-01-29 09:50:59 -08:00
Dan Finlay	780b21039e	Merge pull request #3100 from MetaMask/kovan-fix ... deps - bump eth-json-rpc-infura for kovan fix	2018-01-25 14:04:02 -08:00
Kevin Serrano	1b8613ed23	Bump Changelog	2018-01-25 12:29:12 -08:00
Kevin Serrano	19a379edba	Bump limit for event emitter warning.	2018-01-25 12:28:11 -08:00
kumavis	fe6b11eb50	deps - bump eth-json-rpc-infura for kovan fix	2018-01-25 11:03:50 -08:00
greenkeeper[bot]	145db2906d	chore(package): update testem to version 2.0.0	2018-01-24 20:15:48 +00:00
Thomas Huang	a9ecf9c6fc	Merge branch 'master' into uat	2018-01-23 10:55:21 -08:00
Dan J Miller	62ce65c99e	Merge pull request #3069 from tmashuang/uat ... Revert integration tests to uat to oldUI	2018-01-23 15:08:39 -03:30
Thomas	97ca86733c	Merge branch 'master' into uat	2018-01-23 01:12:50 -08:00