Commit Graph

5610 Commits

Author SHA1 Message Date
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
Dan J Miller 100642c0ea Fix bug stemming from erroneously persistant unlock failure error message. (#3123) 2018-01-29 18:44:43 -08:00
Dan J Miller b63f0f3de2 Functional Integration Tests for send ether flow. (#3119) 2018-01-29 17:24:53 -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
Dan Finlay 03fbf75b4e
Merge pull request #3065 from MetaMask/Version-3.13.7
Version 3.13.7
2018-01-22 16:34:40 -08:00
Thomas b62ec394f5 Revert integration to oldUi 2018-01-22 16:10:07 -08:00
Thomas ce0de5feed String interpolate version in settings 2018-01-22 16:09:23 -08:00
Dan Finlay f6fb1bc08f Merge branch 'Version-3.13.7' of github.com:MetaMask/metamask-plugin into Version-3.13.7 2018-01-22 16:09:00 -08:00
Dan Finlay 022b125495 Merge remote-tracking branch 'origin/master' into Version-3.13.7 2018-01-22 16:08:14 -08:00
Thomas baba179ccb Remove duplicate eth-contract-metadata 2018-01-22 16:08:00 -08:00
Thomas d59136eb49 Add ExtensionPlatform = 'development' to mockUi 2018-01-22 16:06:35 -08:00
Dan Finlay 5568053cd8 Version 3.13.7 2018-01-22 16:06:20 -08:00
kumavis f26933493c
Merge branch 'master' into Version-3.13.7 2018-01-22 16:05:34 -08:00
kumavis b1c34639f8
Merge pull request #3066 from MetaMask/sentry-failed-tx
sentry - report failed txs
2018-01-22 16:04:10 -08:00
kumavis 7e32ba2833 changelog - add note on sentry 2018-01-22 15:57:25 -08:00
kumavis b91e2b5eb1 sentry - report failed txs 2018-01-22 15:54:26 -08:00
Dan Finlay 4b9c166a64 Version 3.13.7 2018-01-22 15:46:09 -08:00
Kevin Serrano 0373a3840b
Merge pull request #3047 from MetaMask/fix-provider-json-parse
Fix providers retry logic and retries expired error messages
2018-01-22 15:12:56 -08:00
Dan Finlay 222748fbde
Merge pull request #3064 from MetaMask/engine-patch
deps - bump json rpc engine for bugfix
2018-01-22 14:14:20 -08:00
kumavis 2b7542054e deps - bump json rpc engine for bugfix 2018-01-22 12:52:15 -08:00
kumavis b76f590043
Merge pull request #3025 from MetaMask/i#3018
add a `x` close button to gas calc loding screen on conf-tx
2018-01-22 11:40:22 -08:00
Dan Finlay 128b64cc2c Bump changelog 2018-01-22 11:15:05 -08:00
Chi Kei Chan 338ebe5f40
Merge pull request #3049 from chikeichan/newmaster
Merge master to uat
2018-01-19 15:58:26 -08:00
Dan c554e52e82 Get version from manifest instead of hard coding in New UI info page. 2018-01-19 15:31:11 -08:00
Chi Kei Chan c415b56ce7 update yarn.lock 2018-01-19 15:30:28 -08:00
Chi Kei Chan 77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
kumavis 4670aad291 deps - bump provider engine and infura-middleware for better retry and error messages 2018-01-19 14:07:38 -08:00
kumavis 02df9a6bd1 deps - bump providers for better JSON parse error messages 2018-01-19 12:16:53 -08:00
kumavis 4e63924e60 4.0.10 2018-01-18 16:02:35 -08:00