aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ci - adjust scss cache keykumavis2018-03-101-3/+3
* ci - cache firefox against Revisionkumavis2018-03-101-3/+3
* ci - cache firefox install under build numberkumavis2018-03-101-3/+3
* ci - split download and install firefox stepskumavis2018-03-101-14/+32
* ci - install firefox58 and cachekumavis2018-03-101-1/+17
* ci - prep-deps - install latest firefoxkumavis2018-03-101-2/+4
* ci - optimize - dont update npmkumavis2018-03-101-4/+1
* ci - integration tests need to generate scss cache keykumavis2018-03-101-1/+9
* ci - fix typokumavis2018-03-101-1/+2
* test - breakout npm script for building for integration testskumavis2018-03-102-3/+4
* ci - fix config formattingkumavis2018-03-101-2/+2
* ci - add prep-scss to flowkumavis2018-03-101-0/+3
* ci - parallize flat + mascara integration testskumavis2018-03-101-8/+49
* ci - breakup npm test into parallel processeskumavis2018-03-101-6/+33
* ci - restore node_modules before testkumavis2018-03-101-2/+4
* ci - test on all brancheskumavis2018-03-101-17/+0
* ci - update circle configkumavis2018-03-101-13/+15
* ci - introduce circle ci 2.0kumavis2018-03-102-17/+52
* Merge pull request #3496 from MetaMask/nsp-fixkumavis2018-03-101-0/+3
|\
| * node security - ignore known hoek advisorykumavis2018-03-101-0/+3
|/
* Remove de-selected token from selectedTokens hash instead of setting to null ...Alexander Tseung2018-03-091-6/+10
* Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
* Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-094-246/+839
* Merge pull request #3485 from MetaMask/package-lockDan Finlay2018-03-092-2/+22512
|\
| * meta - add package-lock to gitkumavis2018-03-092-2/+22512
|/
* Fix flashing to Log in screen after logging in or restoring from seed phrase ...Alexander Tseung2018-03-086-115/+129
* Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-084-9/+232
|\
| * modify verifySeedPhrase to async and call it from addNewAccount alsoCsaba Solya2018-03-061-32/+34
| * move more test code to beforeEachCsaba Solya2018-03-041-23/+8
| * add documentationCsaba Solya2018-03-042-0/+9
| * verify seedwords on log inCsaba Solya2018-03-043-43/+31
| * verify addresses regardless caseCsaba Solya2018-03-032-1/+45
| * fix lint issuesCsaba Solya2018-03-032-11/+11
| * seed phrase verifierCsaba Solya2018-03-033-2/+197
* | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-082-4/+8
* | Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0Thomas Huang2018-03-081-1/+1
|\ \
| * | chore(package): update karma to version 2.0.0greenkeeper[bot]2017-12-221-1/+1
* | | Merge pull request #3460 from trigun0x2/masterThomas Huang2018-03-084-7/+7
|\ \ \
| * | | fix typo in tests and tx-state-managerJeffrey Tong2018-03-083-5/+5
| * | | fix typo in transaction.jsJeffrey Tong2018-03-071-2/+2
|/ / /
* | | Merge pull request #3458 from MetaMask/version-4.2.0v4.2.0Thomas Huang2018-03-072-9/+7
|\ \ \
| * | | Version 4.2.0kumavis2018-03-072-9/+7
|/ / /
* | | Merge pull request #3335 from MetaMask/ImportAccountMessageV2kumavis2018-03-078-25/+59
|\ \ \
| * \ \ 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-0711-98/+320
| |\ \ \ \ \ \ \
| * | | | | | | | Replace Lock wording with Log Out / Log InDan Finlay2018-03-073-3/+5
* | | | | | | | | Merge pull request #3411 from MetaMask/AutoVersionBumpkumavis2018-03-071-7/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clean up run version bump scriptDan Finlay2018-03-031-7/+6
* | | | | | | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefinedDan Finlay2018-03-076-5/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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.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 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 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
* | | | | | | | | | 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
* | | | | | | | Merge pull request #3398 from MetaMask/AutoVersionBumpkumavis2018-03-038-3/+1163
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Remove logsDan Finlay2018-03-033-9/+0
| * | | | | | | Add version bumping scriptDan Finlay2018-03-038-3/+1172
* | | | | | | | Merge pull request #3396 from MetaMask/Version-4.1.3kumavis2018-03-032-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
* | | | | | | Merge pull request #3394 from MetaMask/i3372-PreserveInpageProviderNameThomas Huang2018-03-034-5/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix inpage provider name regressionDan Finlay2018-03-034-5/+9
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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.2kumavis2018-03-012-1/+5
|/ / / / / / /
* | | | | | | Merge pull request #3361 from MetaMask/4.1.1v4.1.1Thomas Huang2018-03-012-1/+7
|\ \ \ \ \ \ \
| * | | | | | | v4.1.1kumavis2018-03-012-1/+7
* | | | | | | | Merge pull request #3359 from MetaMask/token-check-urlkumavis2018-03-012-1/+3
|\| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace 'Contract Published' with 'Contract Deployment' for clearer indicatio...Dan2018-02-283-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3353 from MetaMask/sentry-fail-tx-1kumavis2018-03-014-8/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 messagekumavis2018-02-171-1/+2
* | | | | | | | | Merge pull request #3324 from MetaMask/fix-feature-flagsKevin Serrano2018-02-271-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | fix feature flags being undefinedfrankiebee2018-02-271-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3050 from MetaMask/uatDan Finlay2018-02-22382-3802/+42016
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fixThomas Huang2018-02-221-1/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Prevents new transaction from generating popup when metamask is open in an ac...Dan2018-02-221-1/+11
| * | | | | | | | Merge pull request #3288 from MetaMask/uat-masterDan Finlay2018-02-226-4/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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 generalDan Finlay2018-02-021-1/+1
* | | | | | | | | | Merge pull request #3250 from MetaMask/i#3136kumavis2018-02-161-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix - hex prefix estimatedGas on txMetafrankiebee2018-02-151-2/+3
* | | | | | | | | | | Merge pull request #3267 from MetaMask/i3266-IgnoreZeroGasLimitkumavis2018-02-162-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3265 from MetaMask/Version-3.14.2kumavis2018-02-162-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 containerkumavis2018-02-112-0/+13
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #3242 from MetaMask/AddChangelogEntryKevin Serrano2018-02-141-0/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | 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 #2393Lazaridis2018-02-111-1/+1
|/ / / / / / /
| | * | | | | Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-p...Thomas Huang2018-02-2211-36/+109
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | 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 https://githu...Thomas Huang2018-02-217-37/+31
| | | |\ \ \ \
| | | | * | | | Fix old-ui active notices width.Dan2018-02-211-1/+3
| | | | * | | | Render loading inside notice screen, and don't set isLoading from unMarkPassw...Dan2018-02-213-32/+24
| | | | * | | | 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 https://githu...Thomas Huang2018-02-210-0/+0
| | | |\| | | |
| | | | * | | | 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
| | |\ \ \ \
| | | * | | | 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
| | |\ \ \ \
| | | * | | | 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
| | |\ \ \ \ \
| | | * | | | | 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
| | |/ / / / /
| | * | | | | Merge pull request #3240 from MetaMask/AddSassToDevDepsDan Finlay2018-02-141-0/+1
| | |\ \ \ \ \
| | | * | | | | Add node-sass to dev dependenciesDan Finlay2018-02-141-0/+1
| | |/ / / / /
| | * | | | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fixDan J Miller2018-02-142-3/+4
| | |\ \ \ \ \
| | | * | | | | 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
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-146-35/+204
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | 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
| | | |\ \ \ \ \ \
| | | | * | | | | | 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
| | | |\ \ \ \ \
| | | | * \ \ \ \ 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
| | |\ \ \ \ \ \ \
| | | * | | | | | | 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.1v3.14.1Dan Finlay2018-02-022-1/+5
|/ / / / / / / /
* | | | | | | | Merge pull request #3176 from MetaMask/FirefoxSettingsOverflowDan Finlay2018-02-022-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | 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.0Dan Finlay2018-02-022-1/+3
| * | | | | | | | Remove deps from build processDan Finlay2018-02-021-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #3161 from MetaMask/AddResetExplanationFrankie2018-02-012-59/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 https://github.com/MetaMask/metamask-...frankiebee2018-02-012-0/+7
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ 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 fileDan Finlay2018-01-312-0/+8
|/ / / / / / / / / / /
| * / / / / / / / / / 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.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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:49:51 +0800