aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into uatDan2018-02-0818-26/+269
|\
| * Merge pull request #3177 from MetaMask/Version-3.14.1Thomas Huang2018-02-022-1/+5
| |\ | | | | | | Version 3.14.1
| | * Version 3.14.1v3.14.1Dan Finlay2018-02-022-1/+5
| |/
| * Merge pull request #3176 from MetaMask/FirefoxSettingsOverflowDan Finlay2018-02-022-1/+7
| |\ | | | | | | Scrollable Settings screen for Firefox
| | * Scrollable Settings screen for FirefoxThomas2018-02-022-1/+7
| |/
| * Merge pull request #3175 from MetaMask/Version-3.13.9Frankie2018-02-023-2/+4
| |\ | | | | | | Version 3.14.0
| | * Version 3.14.0Dan Finlay2018-02-022-1/+3
| | |
| | * Remove deps from build processDan Finlay2018-02-021-1/+1
| |/ | | | | | | Was running out of stdout memory, preventing me from building.
| * Merge pull request #3161 from MetaMask/AddResetExplanationFrankie2018-02-012-59/+20
| |\ | | | | | | Add reset explanation
| | * Add explanation of account resettingDan Finlay2018-02-011-0/+20
| | |
| | * Remove unused fileDan Finlay2018-02-011-59/+0
| | |
| * | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-016-4/+74
| |\ \ | | | | | | | | Set address to default with empty string, add test validation.
| | * | Bump ChangelogThomas2018-01-311-0/+1
| | | |
| | * | Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to depsThomas2018-01-311-2/+4
| | | |
| | * | Clean up test, remove react & mountWithStoreThomas2018-01-311-3/+2
| | | |
| | * | Set address to default with empty string, add test validation.Thomas2018-01-314-2/+70
| | | |
| * | | Merge pull request #3148 from MetaMask/localStorage-clean-upFrankie2018-02-016-9/+55
| |\ \ \ | | |_|/ | |/| | remove BlacklistController from disk state
| | * | fix changelogfrankiebee2018-02-011-1/+1
| | | |
| | * | Merge branch 'master' into localStorage-clean-upFrankie2018-02-017-0/+102
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #3155 from brunobar79/feature/reset-accountDan Finlay2018-02-017-0/+102
| |\ \ \ | | | | | | | | | | Added reset account feature
| | * | | clean upBruno Barbieri2018-02-011-19/+13
| | | | |
| | * | | add test for wipeTransactionsBruno Barbieri2018-02-011-0/+49
| | | | |
| | * | | preserve other networks TXsBruno Barbieri2018-02-011-3/+4
| | | | |
| | * | | use txMeta.txParamsBruno Barbieri2018-01-311-1/+1
| | | | |
| | * | | wipe only transactions for current accountBruno Barbieri2018-01-313-9/+15
| | | | |
| | * | | clean upBruno Barbieri2018-01-311-3/+3
| | | | |
| | * | | added reset account featureBruno Barbieri2018-01-316-0/+52
| |/ / /
| | * | Merge branch 'localStorage-clean-up' of ↵frankiebee2018-02-012-0/+7
| | |\ \ | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into localStorage-clean-up
| | | * \ Merge branch 'master' into localStorage-clean-upFrankie2018-01-312-0/+7
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #3145 from MetaMask/i3089-FixNullErrorFrankie2018-01-312-0/+8
| |\ \ \ \ | | | | | | | | | | | | Add warning when importing no valid file
| | * | | | Add warning when importing no valid fileDan Finlay2018-01-312-0/+8
| |/ / / / | | | | | | | | | | | | | | | Fixes #3089
| | * / / remove RecentBlocks from diskfrankiebee2018-02-013-3/+3
| | |/ /
| | * | test for migration 021frankiebee2018-01-312-0/+16
| | | |
| | * | add to CHANGELOG.mdfrankiebee2018-01-311-0/+2
| | | |
| | * | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
| | | |
| | * | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
| |/ /
| * | Merge pull request #3126 from MetaMask/Version-3.13.8Thomas Huang2018-01-302-1/+4
| |\ \ | | |/ | |/| Version 3.13.8
| | * Version 3.13.8v3.13.8Dan Finlay2018-01-302-1/+4
| |/
| * Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0Thomas Huang2018-01-301-1/+1
| |\ | | | | | | Update gulp-watch to the latest version 🚀
| | * chore(package): update gulp-watch to version 5.0.0greenkeeper[bot]2018-01-071-1/+1
| | |
| * | Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0Thomas Huang2018-01-301-1/+1
| |\ \ | | | | | | | | Update mocha to the latest version 🚀
| | * | chore(package): update mocha to version 5.0.0greenkeeper[bot]2018-01-181-1/+1
| | | |
| * | | Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0Thomas Huang2018-01-301-1/+1
| |\ \ \ | | | | | | | | | | Update testem to the latest version 🚀
| | * | | chore(package): update testem to version 2.0.0greenkeeper[bot]2018-01-251-1/+1
| | | | |
| * | | | Merge pull request #3101 from MetaMask/eventemitterwarningThomas Huang2018-01-302-0/+4
| |\ \ \ \ | | | | | | | | | | | | Bump up EventEmitter listener warning threshold count to 20
| | * | | | Bump ChangelogKevin Serrano2018-01-261-0/+2
| | | | | |
| | * | | | Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
| | |/ / /
| * | | | Merge pull request #3100 from MetaMask/kovan-fixDan Finlay2018-01-261-1/+1
| |\ \ \ \ | | |/ / / | |/| | | deps - bump eth-json-rpc-infura for kovan fix
| | * | | deps - bump eth-json-rpc-infura for kovan fixkumavis2018-01-261-1/+1
| |/ / /
* | | | Merge branch 'master' into uatThomas Huang2018-01-241-1/+0
|\| | |
| * | | Merge pull request #3065 from MetaMask/Version-3.13.7Dan Finlay2018-01-232-1/+8
| |\ \ \ | | | | | | | | | | Version 3.13.7
| | * \ \ Merge branch 'Version-3.13.7' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2018-01-230-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Version-3.13.7
| | | * \ \ Merge branch 'master' into Version-3.13.7kumavis2018-01-233-2/+15
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | * | | Version 3.13.7v3.13.7Dan Finlay2018-01-232-1/+8
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into Version-3.13.7Dan Finlay2018-01-233-1/+14
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3066 from MetaMask/sentry-failed-txkumavis2018-01-233-1/+14
| |\ \ \ \ \ | | |_|/ / / | |/| | | | sentry - report failed txs
| | * | | | changelog - add note on sentrykumavis2018-01-231-0/+1
| | | | | |
| | * | | | sentry - report failed txskumavis2018-01-232-1/+13
| |/ / / /
| | * / / Version 3.13.7Dan Finlay2018-01-232-1/+8
| |/ / /
| * | | Merge pull request #3047 from MetaMask/fix-provider-json-parseKevin Serrano2018-01-231-2/+2
| |\ \ \ | | | | | | | | | | Fix providers retry logic and retries expired error messages
| | * | | deps - bump provider engine and infura-middleware for better retry and error ↵kumavis2018-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | messages
| | * | | deps - bump providers for better JSON parse error messageskumavis2018-01-201-2/+2
| | | | |
| * | | | Merge pull request #3064 from MetaMask/engine-patchDan Finlay2018-01-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | deps - bump json rpc engine for bugfix
| | * | | | deps - bump json rpc engine for bugfixkumavis2018-01-231-1/+1
| |/ / / /
| * | | | Merge pull request #3025 from MetaMask/i#3018kumavis2018-01-233-2/+18
| |\ \ \ \ | | |/ / / | |/| | | add a `x` close button to gas calc loding screen on conf-tx
| | * | | Bump changelogDan Finlay2018-01-231-0/+2
| | | | |
| | * | | add a `x` close button to gas calc loding screen on conf-txfrankiebee2018-01-182-2/+16
| | | | |
* | | | | Merge pull request #3069 from tmashuang/uatDan J Miller2018-01-2411-27/+75
|\ \ \ \ \ | | | | | | | | | | | | Revert integration tests to uat to oldUI
| * | | | | Merge branch 'master' into uatThomas2018-01-237-7/+43
| | | | | |
| * | | | | Revert integration to oldUiThomas2018-01-231-18/+23
| | | | | |
| * | | | | String interpolate version in settingsThomas2018-01-231-1/+1
| | | | | |
| * | | | | Remove duplicate eth-contract-metadataThomas2018-01-231-1/+1
| | | | | |
| * | | | | Add ExtensionPlatform = 'development' to mockUiThomas2018-01-232-0/+7
|/ / / / /
* | | | | Merge pull request #3049 from chikeichan/newmasterChi Kei Chan2018-01-2014-73/+208
|\ \ \ \ \ | | | | | | | | | | | | Merge master to uat
| * | | | | update yarn.lockChi Kei Chan2018-01-201-24/+99
| | | | | |
| * | | | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-20352-3709/+39827
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3023 from MetaMask/build-lock-gulpDan Finlay2018-01-191-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | build - lock pre-release gulp dep to commit
| | * \ \ \ \ Merge branch 'master' into build-lock-gulpThomas Huang2018-01-197-42/+40
| | |\ \ \ \ \
| | * | | | | | test - stub provider needs to handle errorskumavis2018-01-181-2/+2
| | | | | | | |
| | * | | | | | build - lock pre-release gulp dep to commitkumavis2018-01-181-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #3016 from MetaMask/sentryDan Finlay2018-01-195-1/+38
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Stability - Add Sentry Remote Error Reporting
| | * | | | | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| | | | | | | | |
| | * | | | | | | sentry - dedupe raven vendorkumavis2018-01-182-5/+2
| | | | | | | | |
| | * | | | | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| | | | | | | | |
| | * | | | | | | sentry - breakout raven setup and add release configkumavis2018-01-183-9/+35
| | | | | | | | |
| | * | | | | | | sentry - update raven and add to uikumavis2018-01-184-7/+13
| | | | | | | | |
| | * | | | | | | sentry - add raven + sentry reporting configkumavis2018-01-182-0/+8
| | | | | | | | |
| * | | | | | | | Merge pull request #3035 from MetaMask/infura-rest-fixDan Finlay2018-01-191-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | BugFix - infura rest api uri length limit fix
| | * | | | | | | deps - bump infura provider for uri length limit fixkumavis2018-01-191-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #3029 from MetaMask/test-provider-stubThomas Huang2018-01-196-43/+33
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Tests - Improved provider stubbing with test-block-middleware
| | * | | | | | deps - re-add eth-block-trackerkumavis2018-01-181-0/+1
| | | | | | | |
| | * | | | | | test - createTestProviderTools includes block tracker layerkumavis2018-01-185-22/+25
| | | | | | | |
| | * | | | | | test - tx controller - fix txGasUtil referencekumavis2018-01-182-3/+4
| | | | | | | |
| | * | | | | | deps - bump json-rpc-engine for better errorskumavis2018-01-181-1/+1
| | | | | | | |
| | * | | | | | test - typo - fix spelling of word stubbedkumavis2018-01-184-8/+8
| | | | | | | |
| | * | | | | | test - remove createEthJsQueryStubkumavis2018-01-182-18/+3
| |/ / / / / /
| * | | | | | Merge pull request #3021 from MetaMask/i#3020kumavis2018-01-181-0/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | transactions - transition approved transactions to failed transactions…
| | * | | | | Update transactions.jskumavis2018-01-181-1/+1
| | | |_|/ / | | |/| | |
| | * | | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
| |/ / / /
| * | | | Merge pull request #3019 from MetaMask/i#3015Frankie2018-01-181-2/+22
| |\ \ \ \ | | |/ / / | |/| | | transactions - wrap addTxDefaults in a try catch and re try addTxDefa…
| | * | | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
| | | | |
| | * | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ↵frankiebee2018-01-181-2/+20
| |/ / / | | | | | | | | | | | | boot if they did not complete
| * | | Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoadingFrankie2018-01-181-1/+1
| |\ \ \ | | | | | | | | | | Add network-indicator classname to network loading spinner
| | * | | Add network-indicator classname to network loading spinnerThomas2018-01-181-1/+1
| |/ / /
* | / / Get version from manifest instead of hard coding in New UI info page.Dan2018-01-201-1/+3
| |/ / |/| |
* | | 4.0.10kumavis2018-01-191-1/+1
| | |
* | | Fix transaction list font sizes, paddingAlexander Tseung2018-01-192-17/+7
| | |
* | | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-194-3/+26
|\ \ \ | | | | | | | | [NewUI] Update popout to fullscreen icon
| * | | Fix lint errorsAlexander Tseung2018-01-181-1/+1
| | | |
| * | | Update popout to fullscreen iconAlexander Tseung2018-01-183-2/+25
| | | |
* | | | [NewUI] Send screen gas loading fixes (#3027)Dan J Miller2018-01-183-27/+25
|/ / / | | | | | | | | | | | | | | | * Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send. * Fix variable name.
* | | Show now tokens by default and improve search on add token screen.Dan2018-01-181-5/+10
| | |
* | | Fix tx-list, confirmation screen stylingAlexander Tseung2018-01-184-13/+18
| | |
* | | Merge pull request #3005 from alextsg/cb-385Chi Kei Chan2018-01-182-1/+4
|\ \ \ | | | | | | | | [NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
| * | | Fix rendering QR code in old UI, hide unnecessary back buttonAlexander Tseung2018-01-172-1/+4
| | | |
* | | | Merge pull request #3007 from alextsg/uat-master-011618Chi Kei Chan2018-01-1824-84/+395
|\ \ \ \ | | | | | | | | | | [NewUI] Merge master into uat branch
| * | | | Fix merge conflictsAlexander Tseung2018-01-171-5/+14
| | | | |
| * | | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-17351-3712/+39761
| |\| | | | | |/ / | |/| |
| * | | Merge pull request #2996 from MetaMask/Version-3.13.5Thomas Huang2018-01-172-1/+3
| |\ \ \ | | | | | | | | | | Version 3.13.5
| | * | | Version 3.13.5v3.13.5Dan Finlay2018-01-172-1/+3
| |/ / /
| * | | Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimitkumavis2018-01-172-6/+24
| |\ \ \ | | | | | | | | | | Set gas limit to 21k for recipients with no code
| | * \ \ Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-173-0/+5
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeightkumavis2018-01-173-0/+5
| |\ \ \ \ | | | | | | | | | | | | I2779 firefox specify account detail height
| | * \ \ \ Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-176-18/+56
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-1611-29/+116
| | |\ \ \ \
| | * | | | | Edit: Fix Firefox scrollbar ChangelogThomas Huang2018-01-161-1/+1
| | | | | | |
| | * | | | | Bump ChangelogThomas2018-01-161-0/+3
| | | | | | |
| | * | | | | Add max height for Firefox addon overflow and hide horizontal scrolltmashuang2018-01-111-0/+2
| | | | | | |
| | * | | | | Add one px to address for Firefox clippingtmashuang2018-01-111-0/+1
| | | | | | |
| | | | * | | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
| | | | | | |
| | | | * | | Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-176-18/+56
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #2984 from MetaMask/RenameLockToLogoutThomas Huang2018-01-171-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Rename lock to log out
| | * | | | | | Rename lock to log outDan Finlay2018-01-161-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Fixes #2475
| * | | | | | Merge pull request #2962 from MetaMask/open-popupDan Finlay2018-01-165-17/+55
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Open popup before estimateGas finishes
| | * | | | | Merge branch 'master' into open-popupFrankie2018-01-169-26/+90
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | add to CHANGELOG.mdfrankiebee2018-01-161-0/+2
| | | | | | |
| | * | | | | test - fix to match expected behaviorfrankiebee2018-01-151-14/+28
| | | | | | |
| | * | | | | test - create ethJsQuery stubfrankiebee2018-01-151-1/+14
| | | | | | |
| | * | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
| | | | | | |
| | * | | | | add a loading spinner to conf-tx viewfrankiebee2018-01-151-0/+6
| | | | | | |
| | | | * | | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-164-15/+78
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #2953 from MetaMask/i2826-SignBytesFrankie2018-01-162-4/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix signTypedData bytes signing
| | * \ \ \ \ \ Merge branch 'master' into i2826-SignBytesFrankie2018-01-163-11/+75
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-163-11/+76
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve gas price estimation by backfilling recent-blocks
| | * | | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| | | | | | | | |
| | * | | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-123-9/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925
| | | * | | | | | Merge branch 'master' into i2826-SignBytesDan Finlay2018-01-164-7/+8
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | | * | | | | | Bump keyringController versionDan Finlay2018-01-161-3/+1
| | | | | | | | |
| | | * | | | | | Fix signTypedData bytes signingDan Finlay2018-01-142-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2826
| | | | | | * | | Set gas limit to 21k for recipients with no codeDan Finlay2018-01-162-5/+24
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #2907
| * | | | | | | Merge pull request #2862 from wbt/UpdateNoticeDan Finlay2018-01-162-3/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update notice
| | * | | | | | | Cut statement about test network defaultwbt2018-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing inaccurate statement that default is test network, because most users now connect to the main network by default. See also https://github.com/MetaMask/metamask-extension/commit/f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b
| | * | | | | | | Cut statement about test network defaultwbt2018-01-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing inaccurate statement that default is test network, because most users now connect to the main network by default. See also https://github.com/MetaMask/metamask-extension/commit/f6e551ef5f3773cf5637c2ae0e11fdeb5f40645b
| * | | | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-162-4/+7
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Provider - Use Infura rest api for infura networks
| | * | | | | | | Merge branch 'master' into infura-rest-apikumavis2018-01-126-5/+32
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | deps - bump eth-json-infurakumavis2018-01-101-1/+1
| | | | | | | | |
| | * | | | | | | provider - infura - use infura REST apikumavis2018-01-092-4/+7
| | | | | | | | |
| | * | | | | | | bugfix - transactions controller - breakout logic and fix order of ↵kumavis2018-01-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operations bug
| * | | | | | | | Merge pull request #2909 from MetaMask/UpdateSupportLinksKevin Serrano2018-01-132-4/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | Update support links for helpscout
| | * | | | | | | Use httpsDan Finlay2018-01-132-2/+2
| | | | | | | | |
| | * | | | | | | Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinksDan Finlay2018-01-136-5/+30
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update support link on readmeDan Finlay2018-01-131-1/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #2926 from MetaMask/gulp-npmlsDan Finlay2018-01-122-3/+16
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | build - add 'deps' step that records output of 'npm ls' into build
| | * | | | | | | build - add 'deps' step that records output of 'npm ls' into buildkumavis2018-01-111-1/+15
| | | | | | | | |
| | * | | | | | | deps - gulp in dev deps onlykumavis2018-01-111-2/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #2917 from x86kernel/ci/add-ko-localekumavis2018-01-121-0/+10
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | Add korean localization file
| | * | | | | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
| |/ / / / / /
| * | | | | | Merge pull request #2906 from MetaMask/Version-3.13.4Thomas Huang2018-01-102-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Version 3.13.4
| | * | | | | | Version 3.13.4v3.13.4Dan Finlay2018-01-102-1/+3
| |/ / / / / /
| | | * / / / Update support links for helpscoutDan Finlay2018-01-101-3/+3
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #2855 from abitrolly/patch-2kumavis2018-01-091-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | info.js Remove width element to fix email layout
| | * | | | | info.js Remove width element to fix email layoutAnatoli Babenia2018-01-041-1/+0
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #2902 from MetaMask/DefaultToOneGweiDan Finlay2018-01-091-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Default to 1 gwei for empty blocks
| | * \ \ \ \ Merge branch 'master' into DefaultToOneGweiDan Finlay2018-01-091-1/+1
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #2796 from MetaMask/filter-case-sensitiveDan Finlay2018-01-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | bugfix: deps - eth-json-rpc-filters@1.2.5
| | * | | | | | deps - eth-json-rpc-filters@1.2.5kumavis2017-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | fix case sensitive address check in filters
| * | | | | | | Merge pull request #2901 from MetaMask/DefaultToOneGweikumavis2018-01-092-0/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Default gas estimate to 1 gwei for networks with no block activity
| * \ \ \ \ \ \ \ Merge pull request #2899 from MetaMask/danfinlay-patch-1kumavis2018-01-091-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Default to estimating 1 gwei for empty blocks.
| | * | | | | | | | Default to estimating 1 gwei for empty blocks.Dan Finlay2018-01-091-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | To avoid estimating 0 gwei on low-traffic private networks.
| | | | * / / / / Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Add test for gas estimate defaultDan Finlay2018-01-091-0/+19
| | | | | | | |
| | * | | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
| |/ / / / / /
| * | | | | | Merge pull request #2896 from MetaMask/kumavis-patch-2Dan Finlay2018-01-091-2/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | bugfix - transaction controller - fix order of operations
| | * | | | | bugfix - transactions controller - breakout logic and fix order of ↵kumavis2018-01-091-2/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | operations bug
| * | | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackagekumavis2018-01-091-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Update vinyl-buffer to version 1.0.1
| | * | | | | Update vinyl-buffer to version 1.0.1Thomas Huang2018-01-041-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-093-0/+44
| |\ \ \ \ \ | | | | | | | | | | | | | | Account for 0x/empty string recipient
| | * \ \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-096-2/+57
| | |\ \ \ \ \
| | * | | | | | Account for 0x/empty string address and contract creationThomas2018-01-083-0/+44
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-094-6/+34
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Fix condition where failing seed word checks would infinite-spin future attempts.
| | * | | | | Update CHANGELOG.mdKevin Serrano2018-01-091-0/+1
| | | | | | |
| | * | | | | Test for failure of the async methods.Kevin Serrano2018-01-041-2/+20
| | | | | | |
| | * | | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-042-4/+13
| | | | | | |
| * | | | | | Merge pull request #2879 from MetaMask/ImproveGasEstimationDan Finlay2018-01-096-2/+57
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Improve gas estimation
| | * | | | | Fix feature to workDan Finlay2018-01-063-6/+16
| | | | | | |
| | * | | | | LintedDan Finlay2018-01-061-3/+0
| | | | | | |
| | * | | | | Bump changelogDan Finlay2018-01-061-0/+1
| | | | | | |
| | * | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-064-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the 50th percentile lowest gas price of the previous 20 blocks.
| | * | | | | Add test for better gas estimationDan Finlay2018-01-061-0/+25
| |/ / / / /
* | | | | | Readjust gas fees when switching networks on the send screenAlexander Tseung2018-01-172-22/+44
| | | | | |
* | | | | | Vertically centers the text of the new ui modal header. (#2987)Dan J Miller2018-01-171-0/+1
| | | | | |
* | | | | | Adding one or more tokens sets the selected token before returning the user ↵Dan J Miller2018-01-172-0/+8
| |_|_|_|/ |/| | | | | | | | | | | | | | to the main screen. (#2995)
* | | | | [NewUI-flat] Fix gulp build (#2975)Dan J Miller2018-01-163-14/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only run uglify when building for prod; set environment when building for prod; use gulp-uglify-es. * Revert change of dist script.
* | | | | Restore display of all unconfirmed transactions.Dan2018-01-161-34/+34
| | | | |
* | | | | Fix send screen value inputAlexander Tseung2018-01-161-3/+11
| | | | |
* | | | | Fix Hide Token modal styling, popup positioningAlexander Tseung2018-01-164-25/+15
| | | | |
* | | | | Merge pull request #2964 from alextsg/cb-505cDan Finlay2018-01-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [NewUI] Move blockies option to the bottom of Settings
| * | | | | Move blockies option to the bottom of SettingsAlexander Tseung2018-01-151-1/+1
| | | | | |
* | | | | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-163-26/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Place all users of extension into old UI (disable auto adding). * Fix lint errors.
* | | | | | Fix confirm Add Token button orderAlexander Tseung2018-01-131-4/+4
| | | | | |
* | | | | | Fix Add Token button order, stylingAlexander Tseung2018-01-132-14/+16
| | | | | |
* | | | | | Fix input box padding and select highlight in new account create and import ↵Dan2018-01-132-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | page.
* | | | | | New add account page with create and import options.Dan2018-01-1313-95/+475
| | | | | |
* | | | | | Merge pull request #2928 from alextsg/cb-388Chi Kei Chan2018-01-1324-234/+284
|\ \ \ \ \ \ | | | | | | | | | | | | | | [NewUI] Update main view styling
| * \ \ \ \ \ Merge branch 'uat' into cb-388Chi Kei Chan2018-01-130-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'uat' into cb-388Chi Kei Chan2018-01-1324-315/+758
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Fix styling in initializationAlexander Tseung2018-01-133-7/+21
| |/ / / / / |/| | | | |
* | | | | | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-1314-318/+717
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos
* | | | | | Fix margin styling for name and address in account detail section. (#2790)Dan J Miller2018-01-122-3/+4
| | | | | |
* | | | | | [NewUI] Build mascara with uglification and gzipping. (#2735)Dan J Miller2018-01-124-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds uglification and gzipping. * Build mascara with uglification and gzipping. * Remove gzipping from extension build.
* | | | | | Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-122-2/+6
| | | | | |
* | | | | | Fix padding of a hovered tx-list-item (#2859)Dan J Miller2018-01-121-1/+1
| | | | | |
| * | | | | Fix token balance colorAlexander Tseung2018-01-121-1/+3
| | | | | |
| * | | | | Fix lint errorsAlexander Tseung2018-01-121-1/+0
| | | | | |
| * | | | | Change styling for network dropdownAlexander Tseung2018-01-122-58/+25
| | | | | |
| * | | | | Update styling for buttons, font weightsAlexander Tseung2018-01-1216-125/+83
| | | | | |
| * | | | | Update main view stylingAlexander Tseung2018-01-1113-85/+198
|/ / / / /
* | | | | 4.0.9kumavis2018-01-091-1/+1
| | | | |
* | | | | ui - fix font path namekumavis2018-01-091-2/+2
| | | | |
* | | | | Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-0412-1313/+2204
|\ \ \ \ \ | | | | | | | | | | | | [NewUI] Merge NewUI-flat into uat
| * \ \ \ \ Merge pull request #2845 from alextsg/NewUI-flat-4.0.5cAlexander Tseung2018-01-0410-14/+115
| |\ \ \ \ \ | | | | | | | | | | | | | | [NewUI] Merge master into NewUI-flat
| | * | | | | Fix merge conflictAlexander Tseung2018-01-041-1/+0
| | | | | | |
| | * | | | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-04338-3279/+38277
| | |\ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| * | | | | Fix sign typed dataAlexander Tseung2017-12-302-1298/+2088
| | | | | |
| * | | | | Fix mascara first time flow button colorsAlexander Tseung2017-12-301-3/+3
| | | | | |
| | * | | | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-032-2/+10
| | |\ \ \ \ | | | | | | | | | | | | | | transactions - throw error if txParams.value contains a decimal
| | | * | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| | | | | | |
| | | * | | | Merge branch 'master' into tx-param-vaalidationFrankie2017-12-225-18/+122
| | | |\ \ \ \
| | | * | | | | SpellingDan Finlay2017-12-221-1/+1
| | | | | | | |
| | | * | | | | add to CHANGELOG.mdfrankiebee2017-12-211-0/+2
| | | | | | | |
| | | * | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
| | | | | | | |
| | * | | | | | Merge pull request #2840 from oosthuizenr/masterkumavis2018-01-031-5/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | UI - Never show seed phrase if locked
| | | * | | | | | fix commentoosthuizenr2018-01-031-1/+1
| | | | | | | | |
| | | * | | | | | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
| | |/ / / / / /
| | * | | | | | Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0kumavis2018-01-031-1/+1
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | Update vinyl-source-stream to the latest version 🚀
| | | * | | | | chore(package): update vinyl-source-stream to version 2.0.0greenkeeper[bot]2017-12-231-1/+1
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-292-3/+63
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | only check nonces of transactions who's from address match the txMeta
| | | * | | | | tests - be more verbose in test messagesfrankiebee2017-12-291-2/+2
| | | | | | | |
| | | * | | | | add tests for #_checkIfNonceIsTakenfrankiebee2017-12-281-2/+61
| | | | | | | |
| | | * | | | | transactions:pending - only check nonces of transactions who's from adress ↵frankiebee2017-12-281-1/+2
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | match the txMeta
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 08:46:21 +0800