aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into i18nDan Finlay2018-03-0717-166/+1542
|\
| * Merge pull request #3458 from MetaMask/version-4.2.0v4.2.0Thomas Huang2018-03-072-9/+7
| |\ | | | | | | Version 4.2.0
| | * Version 4.2.0kumavis2018-03-072-9/+7
| |/
| * Merge pull request #3335 from MetaMask/ImportAccountMessageV2kumavis2018-03-078-25/+59
| |\ | | | | | | Import account disclaimer and change loose label to imported.
| | * Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-0712-23/+56
| | |\
| | * \ Merge branch 'master' into ImportAccountMessageV2Dan Finlay2018-03-0710-100/+324
| | |\ \
| | * \ \ Merge branch 'master' into ImportAccountMessageV2Thomas Huang2018-03-0349-144/+3297
| | |\ \ \
| | * | | | Import Account disclaimerThomas2018-03-032-9/+12
| | | | | |
| | * | | | Swap color scheme for import account labelThomas2018-03-031-2/+3
| | | | | |
| | * | | | Add changes to CHANGELOGThomas2018-02-281-0/+3
| | | | | |
| | * | | | Remove committed out merge codeThomas2018-02-281-16/+0
| | | | | |
| | * | | | Change Loose label to ImportedThomas2018-02-282-2/+2
| | | | | |
| | * | | | Add import account disclaimerThomas2018-02-283-5/+45
| | | | | |
| * | | | | Merge pull request #3259 from MetaMask/controllerStubskumavis2018-03-075-127/+1471
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Offline testing
| | * | | | Using noop to not lose itThomas2018-02-281-1/+1
| | | | | |
| | * | | | Revert initializing first-time-stateThomas2018-02-282-17/+3
| | | | | |
| | * | | | Network controller nockThomas Huang2018-02-161-24/+16
| | | | | |
| | * | | | Offline testingThomas Huang2018-02-166-104/+1470
| | | | | |
| * | | | | Merge pull request #3455 from MetaMask/i2475-UnifyLogInWordingkumavis2018-03-073-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | Replace Lock wording with Log Out / Log In
| | * \ \ \ \ Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-0711-98/+320
| | |\ \ \ \ \
| | * | | | | | Replace Lock wording with Log Out / Log InDan Finlay2018-03-073-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2475
| * | | | | | | Merge pull request #3411 from MetaMask/AutoVersionBumpkumavis2018-03-071-7/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Clean up run version bump script
| | * | | | | | | Clean up run version bump scriptDan Finlay2018-03-031-7/+6
| | | | | | | | |
* | | | | | | | | Correct merge conflict resolution errors.Dan2018-03-072-9/+0
| | | | | | | | |
* | | | | | | | | Missing comma in messages.jsonDan2018-03-071-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into i18nDan2018-03-07146-646/+6356
|\| | | | | | | |
| * | | | | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefinedDan Finlay2018-03-076-5/+30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Shapeshift form handles 'market info unavailable' errors.
| | * | | | | | | | Shapeshift form handles market info unavailable errors.Dan2018-03-076-5/+30
| | | | | | | | | |
| * | | | | | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-editDan Finlay2018-03-071-3/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Gracefully handle null token balance in new ui send.
| | * | | | | | | | | Gracefully handle null token balance in new ui send.Dan2018-03-061-3/+7
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #3444 from danjm/i3348-minus-not-a-numberDan Finlay2018-03-071-2/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | Prevent user from selecting max amount until gas is estimated.
| | * | | | | | | | Prevent user from selecting max amount until there is an estimated gas total.Dan2018-03-061-2/+3
| | |/ / / / / / /
| * | | | | | | | Ensure this reference is defined in old-ui info.js (#3450)Dan J Miller2018-03-071-3/+3
| | | | | | | | |
| * | | | | | | | Default add-token decimal value to string (#3451)Dan J Miller2018-03-071-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #3309 from scsaba/edge-supportDan Finlay2018-03-074-2/+182
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Add Edge Support
| | * | | | | | add browserify-unibabel to package.jsonCsaba Solya2018-03-061-2/+3
| | | | | | | |
| | * | | | | | fix testCsaba Solya2018-02-231-1/+2
| | | | | | | |
| | * | | | | | add negative decrypt testCsaba Solya2018-02-231-0/+20
| | | | | | | |
| | * | | | | | fix testsCsaba Solya2018-02-231-6/+20
| | | | | | | |
| | * | | | | | make keyFromPassword privateCsaba Solya2018-02-231-3/+3
| | | | | | | |
| | * | | | | | adding testsCsaba Solya2018-02-231-0/+66
| | | | | | | |
| | * | | | | | Merge branch 'master' into edge-supportCsaba S2018-02-22382-3802/+42016
| | |\ \ \ \ \ \
| | * | | | | | | add edge supportCsaba Solya2018-02-223-0/+78
| | | | | | | | |
| * | | | | | | | Fix seed phrase validation clearing form (#3417)Alexander Tseung2018-03-074-92/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
| * | | | | | | | Add missed changelog updates. (#3407)Dan J Miller2018-03-061-0/+5
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-062-6/+7
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix NewUI reveal seed flow. (#3410)Dan J Miller2018-03-034-8/+22
| | | | | | |
| * | | | | | Allow adding 0 balance tokens in old ui and editing custom token info in new ↵Dan J Miller2018-03-033-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3395) * Shows tokens with 0 balance in old ui; goHome after adding tokens. * Allow users to edit custom token info when not autofilled. (New UI add token screen).
| * | | | | | Merge pull request #3398 from MetaMask/AutoVersionBumpkumavis2018-03-038-3/+1163
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | Add version bumping script
| | * | | | | Remove logsDan Finlay2018-03-033-9/+0
| | | | | | |
| | * | | | | Add version bumping scriptDan Finlay2018-03-038-3/+1172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One step towards automating our deploy process is automating our version bumping scheme. This PR does that.
| * | | | | | Merge pull request #3396 from MetaMask/Version-4.1.3kumavis2018-03-032-1/+3
| |\| | | | | | | | | | | | | | | | | | | Version 4.1.3
| | * | | | | Version 4.1.3v4.1.3Dan Finlay2018-03-032-1/+3
| |/ / / / /
| * | | | | Add retry transaction back into old ui transaction list item (#3381)Thomas Huang2018-03-032-35/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add retry transaction back into old ui transaction list item * Update Changelog
| * | | | | Merge pull request #3394 from MetaMask/i3372-PreserveInpageProviderNameThomas Huang2018-03-034-5/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix inpage provider name regression
| | * | | | | Fix inpage provider name regressionDan Finlay2018-03-034-5/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3372 by not minifying the name of our inpage provider, which some people were using to identify MetaMask (not our preferred, supported method of web3.currentProvider.isMetaMask).
| * | | | | Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-023-46/+190
| | | | | |
| * | | | | Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
| | | | | |
| * | | | | Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-0210-6/+1657
| |\ \ \ \ \ | | | | | | | | | | | | | | Check in all font files locally.
| | * | | | | Correct ttf format name to 'truetype'Dan2018-03-023-126/+126
| | | | | | |
| | * | | | | Check in all font files locally.Kevin Serrano2018-03-0110-6/+1657
| | | | | | |
| * | | | | | Merge pull request #3363 from MetaMask/4.1.2v4.1.2Thomas Huang2018-03-012-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | 4.1.2
| | * | | | | | 4.1.2kumavis2018-03-012-1/+5
| |/ / / / / /
| * | | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1Thomas Huang2018-03-012-1/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Version 4.1.1
| | * | | | | | v4.1.1kumavis2018-03-012-1/+7
| | | | | | | |
| * | | | | | | Merge pull request #3359 from MetaMask/token-check-urlkumavis2018-03-012-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | [new-ui] add token - check for logo url before trying to use
| | * | | | | | changelog - add entry about 'Add Token' screen fixkumavis2018-03-011-0/+2
| | | | | | | |
| | * | | | | | add token - check for logo url before trying to usekumavis2018-03-011-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvementskumavis2018-03-015-3/+54
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [NewUI] Onboarding flow style improvements
| | * | | | | | | Padding of alpha warning aligns with app-barDan2018-02-281-1/+1
| | | | | | | | |
| | * | | | | | | Adds beta label to Metamask name in full screen app bar.Dan2018-02-282-0/+17
| | | | | | | | |
| | * | | | | | | Move beta warning to app header.Dan2018-02-282-1/+6
| | | | | | | | |
| | * | | | | | | NewUI first time flow warning message change.Dan2018-02-281-1/+1
| | | | | | | | |
| | * | | | | | | Body width container in first time flow is consistent with app bar.Dan2018-02-282-1/+30
| | | | | | | | |
| * | | | | | | | Merge pull request #3339 from danjm/i3336-cancel-button-buy-ethkumavis2018-03-011-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [Old-UI] Fix cancel button on buy eth screen.
| | * | | | | | | | Fix cancel button on buy eth screen.Dan2018-02-281-1/+1
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-013-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment'
| | * | | | | | | | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵Dan2018-02-283-3/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | indication of contract tx state.
| * | | | | | | | Merge pull request #3353 from MetaMask/sentry-fail-tx-1kumavis2018-03-014-8/+44
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Sentry - improve ethjs-rpc error formating for failed txs
| | * | | | | | | | sentry - extractErrorMessage - fix comment formattingkumavis2018-03-011-1/+1
| | | | | | | | | |
| | * | | | | | | | sentry - failed tx - improve ethjs-rpc error formatingkumavis2018-03-012-5/+41
| | | | | | | | | |
| | * | | | | | | | sentry - clean - move setupRaven to libkumavis2018-03-013-3/+3
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #3350 from danjm/onclick-undefined-sentry-errorkumavis2018-03-011-9/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | [old-ui] Prevent user from switching network in old-ui notification
| | * | | | | | | Prevent user from switching network in old-ui notificationDan2018-03-011-9/+11
| | |/ / / / / /
| * | | | | | | Merge pull request #3346 from danjm/i3228-event-not-definedkumavis2018-03-013-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | [old-ui] Define event locally in onClickOutside method in account-dropdowns.js
| | * | | | | | Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-013-3/+3
| |/ / / / / /
| * | | | | | Merge pull request #3333 from MetaMask/mascara-deployFrankie2018-02-281-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | mascara deploy - improve deploy instructions
| | * \ \ \ \ \ Merge branch 'master' into mascara-deploykumavis2018-02-28580-12071/+67151
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | mascara deploy - improve deploy instructionskumavis2017-04-072-1/+10
| | | | | | | |
| * | | | | | | Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0Frankie2018-02-281-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Update metamascara to the latest version 🚀
| | * | | | | | fix(package): update metamascara to version 2.0.0greenkeeper[bot]2017-10-141-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #3323 from MetaMask/version-4.0.0v4.1.0Frankie2018-02-282-1/+11
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Version 4.1.0
| | * | | | | | | changelog - improve changelog noteskumavis2018-02-281-3/+3
| | | | | | | | |
| | * | | | | | | Bump VersionThomas2018-02-282-1/+7
| | | | | | | | |
| | * | | | | | | Version 4.0.0Thomas2018-02-232-1/+5
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #3275 from MetaMask/licenseDan Finlay2018-02-281-27/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Standardize license
| | * | | | | | | Update LICENSE to current year.Thomas2018-02-271-1/+1
| | | | | | | | |
| | * | | | | | | Standardize license.Kevin Serrano2018-02-141-27/+13
| | | | | | | | |
| * | | | | | | | Merge pull request #3281 from MetaMask/sentry-failed-tx-debatchDan Finlay2018-02-281-1/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | sentry - report failed tx with more specific message
| | * | | | | | | sentry - report failed tx with more specific messagekumavis2018-02-171-1/+2
| | | | | | | | |
| * | | | | | | | Merge pull request #3324 from MetaMask/fix-feature-flagsKevin Serrano2018-02-271-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | fix feature flags being undefined
| | * | | | | | | fix feature flags being undefinedfrankiebee2018-02-271-0/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #3050 from MetaMask/uatDan Finlay2018-02-22382-3802/+42016
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | [EPIC] Merge UAT into master
| | * | | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fixThomas Huang2018-02-221-1/+11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [NewUI] Prevents new tx from active tab from opening popup
| | | * | | | | | Prevents new transaction from generating popup when metamask is open in an ↵Dan2018-02-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | active tab.
| | * | | | | | | Merge pull request #3288 from MetaMask/uat-masterDan Finlay2018-02-226-4/+24
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Uat master
| | | * | | | | | | Merge branch 'master' into uat-masterDan Finlay2018-02-226-4/+24
| | |/| | | | | | | | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3278 from MetaMask/Version-3.14.1Dan Finlay2018-02-171-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Make announcement more general
| | * | | | | | | | Make announcement more generalDan Finlay2018-02-021-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge pull request #3250 from MetaMask/i#3136kumavis2018-02-161-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | fix - hex prefix estimatedGas on txMeta
| | * | | | | | | | | fix - hex prefix estimatedGas on txMetafrankiebee2018-02-151-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #3267 from MetaMask/i3266-IgnoreZeroGasLimitkumavis2018-02-162-2/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | Default validated block gas limit to 8MM when none identified
| | * | | | | | | | | lint - lift comment to new linekumavis2018-02-161-1/+2
| | | | | | | | | | |
| | * | | | | | | | | Fix incorrect promise instantiationDan Finlay2018-02-161-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Default validated block gas limit to 8MM when none identifiedDan Finlay2018-02-161-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mitigates #3266
| * | | | | | | | | Merge pull request #3265 from MetaMask/Version-3.14.2kumavis2018-02-162-1/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Version 3.14.2
| | * | | | | | | | | Version 3.14.2v3.14.2Dan Finlay2018-02-162-1/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3260 from MetaMask/changelog-mesh-testingDan Finlay2018-02-161-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | CHANGELOG.md - Add mesh testing container note
| | * | | | | | | | | Update CHANGELOG.mdkumavis2018-02-161-0/+1
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #3222 from MetaMask/mesh-testDan Finlay2018-02-162-0/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | metamask mesh - inject mesh testing container
| | * | | | | | | | metamask mesh - inject mesh testing containerkumavis2018-02-112-0/+13
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge pull request #3242 from MetaMask/AddChangelogEntryKevin Serrano2018-02-141-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | Bump changelog
| | * | | | | | | Bump changelogDan Finlay2018-02-141-0/+2
| |/ / / / / / /
| * | | | | | | Merge pull request #3224 from lazaridiscom/masterDan Finlay2018-02-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | use the providers initial _blocktracker (fixes #2393)
| | * | | | | | use the providers initial _blocktracker. fixes #2393Lazaridis2018-02-111-1/+1
| |/ / / / / /
| | | * | | | Merge pull request #3296 from ↵Thomas Huang2018-02-2211-36/+109
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | danjm/MM-806-new-ui-first-time-import-seed-in-popup [NewUI] Fix Import Existing DEN in popup New UI first time flow.
| | | | * | | Remove output fileThomas Huang2018-02-211-1889/+0
| | | | | | |
| | | | * | | Use same logic for downloading state logs in the old/uatThomas Huang2018-02-211-1/+7
| | | | | | |
| | | | * | | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of ↵Thomas Huang2018-02-217-37/+31
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup
| | | | | * | | Fix old-ui active notices width.Dan2018-02-211-1/+3
| | | | | | | |
| | | | | * | | Render loading inside notice screen, and don't set isLoading from ↵Dan2018-02-213-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unMarkPasswordForgotten.
| | | | | * | | Fix promise constructionDan Finlay2018-02-211-1/+1
| | | | | | | |
| | | | | * | | Add 8MM gas limit default to send screenDan Finlay2018-02-211-1/+2
| | | | | | | |
| | | | | * | | Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| | | | | | | |
| | | | * | | | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of ↵Thomas Huang2018-02-210-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/danjm/metamask-extension into MM-806-new-ui-first-time-import-seed-in-popup
| | | | | * | | Temporarily disable loading indicator.Dan2018-02-211-3/+4
| | | | | | | |
| | | | * | | | Temporarily disable loading indicator.Dan2018-02-212-3/+1893
| | | | |/ / /
| | | | * | | Fix variable spelling error.Dan2018-02-212-7/+8
| | | | | | |
| | | | * | | Fix Import Existing DEN in popup New UI first time flow.Dan2018-02-204-9/+80
| | | |/ / /
| | | * | | Merge pull request #3286 from danjm/uat-version-bumpkumavis2018-02-171-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | [NewUI] uat version bump
| | | | * | | Bump uat version to 4.0.12Dan2018-02-171-1/+1
| | | |/ / /
| | | * | | Ensures that mascara initialize screen is not shown in popup. (#3279)Dan J Miller2018-02-171-1/+4
| | | | | |
| | | * | | Merge pull request #3200 from alextsg/cb-703kumavis2018-02-1720-50/+68
| | | |\ \ \ | | | | | | | | | | | | | | [NewUI] Remove accessing PropTypes from main React package
| | | | * | | Remove accessing PropTypes from main React packageAlexander Tseung2018-02-0720-50/+68
| | | | | | |
| | | * | | | Merge pull request #3261 from MetaMask/uat-oldui-compatibilitykumavis2018-02-164-5/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Adjust old UI css compatibility with new UI style changes
| | | | * | | | Make oldui compatible with newUI style changesThomas Huang2018-02-164-5/+6
| | | | | | | |
| | | * | | | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-164-7/+10
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adds the mascara first time flow to the extension when opened in browser. * Fix tests after addition of mascara first time flow to new ui.
| | | * | | | Merge pull request #3240 from MetaMask/AddSassToDevDepsDan Finlay2018-02-141-0/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Add node-sass to dev dependencies
| | | | * | | | Add node-sass to dev dependenciesDan Finlay2018-02-141-0/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | To fix build
| | | * | | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fixDan J Miller2018-02-142-3/+4
| | | |\ \ \ \ | | | | | | | | | | | | | | | | [NewUI] Only open a new window on restore from seed if in extension view.
| | | | * | | | Remove isInBrowser method and use environment-type.jsDan2018-02-142-22/+4
| | | | | | | |
| | | | * | | | Only open a new window on restore from seed if in extension view.Dan2018-02-143-3/+22
| | | | | | | |
| | | * | | | | Merge pull request #3239 from MetaMask/uat-nextDan J Miller2018-02-1459-281/+2143
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Uat next
| | | | * \ \ \ \ Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-146-35/+204
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | [NewUI] Add reset account button to new UI.
| | | | | * | | | Add reset account button to new UI.Dan2018-02-096-35/+204
| | | | | | | | |
| | | | * | | | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screensDan Finlay2018-02-142-5/+42
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [NewUI] Try beta link on unlock and privacy screens.
| | | | | * | | | | Try beta link on unlock and privacy screens.Dan2018-02-092-5/+42
| | | | | |/ / / /
| | | | * | | | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-133-26/+20
| | | | | | | | |
| | | | * | | | | Send screen style updates. (#3234)Dan J Miller2018-02-134-9/+52
| | | | | | | | |
| | | | * | | | | Remove chrome focus outline for mouse users. (#3230)Dan J Miller2018-02-134-1/+40
| | | | | | | | |
| | | | * | | | | Fix exception thrown in selected token tx list with shapeshift txs (#3215)Alexander Tseung2018-02-091-3/+3
| | | | | | | | |
| | | | * | | | | Fixes shapeshift txs so that they render in tx list. (#3208)Dan J Miller2018-02-092-36/+28
| | | | |/ / / /
| | | | * | | | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019Dan J Miller2018-02-0818-26/+269
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | [NewUI] Merge uat to uatnext feb072019
| | | | | * \ \ \ Merge branch 'uat' into uat-nextDan2018-02-0818-26/+269
| | | | | |\ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge pull request #3203 from danjm/merge-master-to-uat-feb72018Dan J Miller2018-02-0818-26/+269
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Merge master to UAT feb72018
| | | | * | | | | | Point add-token unit test to old-ui component.Dan2018-02-081-1/+1
| | | | | | | | | |
| | | | * | | | | | 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
| |/ / / / / / / / /
| | | | | * / / / / Make blockies icon round to match identicons (#3205)Alexander Tseung2018-02-082-5/+5
| | | | | |/ / / /
| | | | | * | | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-087-24/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.
| | | | | * | | | Update modal header design on send screen (#3196)Alexander Tseung2018-02-074-67/+134
| | | | | | | | |
| | | | | * | | | Fix alignment of ellipsis and address in wallet view. (#3198)Dan J Miller2018-02-073-2/+3
| | | | | |/ / /
| | | | | * | | Remove duplicate token balance on uat next. (#3195)Dan J Miller2018-02-071-2/+0
| | | | | | | |
| | | | | * | | Integration tests for signature requests confirmations. (#3194)Dan J Miller2018-02-075-2/+292
| | | | | | | |
| | | | | * | | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-065-5/+304
| | | | | | | |
| | | | | * | | Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-065-24/+70
| | | | | | | |
| | | | | * | | Change styling of Import Account with Seed Phrease (#3182)Alexander Tseung2018-02-063-29/+44
| | | | | | | |
| | | | | * | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-017-17/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use tooltip for display of helper text in wallet views copy to clipboard feature. * Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change. * Remove unnecessary tabIndex attribute from wallet view address element.
| | | | | * | | [NewUI] Updates capitalization and alignment for the import account screen. ↵Dan J Miller2018-02-013-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3122) * Updates capitalization and alignment for the import account screen. * Align elements in import form.
| | | | | * | | [NewUI] Set default new account name as placeholder, but not value (#3121)Dan J Miller2018-02-011-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set default new account name as placehold, and not value, in new account create screen. * Set new account number in create-form.js in constructor.
| | | | | * | | Fix bug stemming from erroneously persistant unlock failure error message. ↵Dan J Miller2018-01-302-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3123)
| | | | | * | | Functional Integration Tests for send ether flow. (#3119)Dan J Miller2018-01-304-0/+670
| | | | |/ / /
| | | | * | | 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
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:14:34 +0800