aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-13134-814/+5293
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | added tooltipbrunobar792018-07-124-6/+17
| * | | | | | | | | | forget device and autiload account features addedbrunobar792018-07-126-2/+134
| * | | | | | | | | | update to temp dependenciesbrunobar792018-07-123-16/+18
| * | | | | | | | | | clean upbrunobar792018-07-113-6/+6
| * | | | | | | | | | account removal is workingbrunobar792018-07-116-15/+79
| * | | | | | | | | | finish warning modal UIbrunobar792018-07-119-3/+120
| * | | | | | | | | | added ui to remove accountsbrunobar792018-07-103-4/+50
| * | | | | | | | | | fix trezor labelbrunobar792018-07-101-1/+1
| * | | | | | | | | | added label for trezor accountsbrunobar792018-07-101-1/+3
| * | | | | | | | | | fix account duplicationbrunobar792018-07-102-7/+3
| * | | | | | | | | | fix all the account related bugsbrunobar792018-07-103-17/+42
| * | | | | | | | | | copy updatedbrunobar792018-07-073-3/+6
| * | | | | | | | | | update package-lock.jsonbrunobar792018-07-072-242/+50
| * | | | | | | | | | update connect harwdware screenbrunobar792018-07-073-9/+34
| * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-0760-275/+1091
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | UI refactorbrunobar792018-07-064-99/+110
| * | | | | | | | | | | Refactor UIbrunobar792018-07-064-266/+328
| * | | | | | | | | | | move strings to localization filebrunobar792018-07-062-11/+21
| * | | | | | | | | | | added message for non-chrome browsersbrunobar792018-07-062-1/+39
| * | | | | | | | | | | package.json updated and tests passingbrunobar792018-07-042-0/+58
| * | | | | | | | | | | tests are passingbrunobar792018-07-042-39263/+30830
| * | | | | | | | | | | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-041-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | package-lock updatebrunobar792018-07-041-27/+10
| * | | | | | | | | | | | lint fixbrunobar792018-07-042-3/+3
| * | | | | | | | | | | | fix merge conflictsbrunobar792018-07-049-864/+13539
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ fix merge conflictsbrunobar792018-07-04125-739/+710
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | update package-lock.jsonbrunobar792018-07-034-9747/+6185
| * | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-035-3655/+2782
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | move hardcoded strings to localization filebrunobar792018-07-032-17/+22
| * | | | | | | | | | | | | | | always open connect hardware in full screen modebrunobar792018-07-031-1/+9
| * | | | | | | | | | | | | | | allow to open specific route in fullscreen modebrunobar792018-07-031-2/+5
| * | | | | | | | | | | | | | | fix environment detection regexbrunobar792018-07-031-1/+1
| * | | | | | | | | | | | | | | use latest eth-keyring-controllerbrunobar792018-07-022-3/+4
| * | | | | | | | | | | | | | | fix merge conflictsbrunobar792018-07-0295-7184/+8625
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | use latest eth-trezor-keyringbrunobar792018-06-262-2/+2
| * | | | | | | | | | | | | | | | fixesbrunobar792018-06-233-6552/+6543
| * | | | | | | | | | | | | | | | point to new version of eth-trezor-keyringbrunobar792018-06-231-1/+1
| * | | | | | | | | | | | | | | | clean upBruno2018-06-131-16/+19
| * | | | | | | | | | | | | | | | fix merge conflictsBruno2018-06-1312-125/+146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of git://github.com/Metamask/metamask-extension into d...Bruno2018-06-1312-6576/+6595
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/brunobar79/metamask-extension in...Bruno2018-06-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into developBruno2018-06-0667-317/+841
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into developBruno2018-05-31149-17174/+5990
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into developBruno2018-05-1797-3419/+8695
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | upgrade eth-trezor-keyringBruno2018-06-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | move TrezorKeyring to its own packageBruno2018-06-136-1383/+53
| * | | | | | | | | | | | | | | | | | | | | | added support for signPersonalMessageBruno2018-06-131-28/+45
| * | | | | | | | | | | | | | | | | | | | | | clean upBruno2018-06-111-92/+21
| * | | | | | | | | | | | | | | | | | | | | | sign transactions is pretty closeBruno2018-06-111-49/+77
| * | | | | | | | | | | | | | | | | | | | | | balances workingBruno2018-06-113-6/+22
| * | | | | | | | | | | | | | | | | | | | | | add account workingBruno2018-06-112-8/+13
| * | | | | | | | | | | | | | | | | | | | | | clean upBruno2018-06-112-8/+15
| * | | | | | | | | | | | | | | | | | | | | | initial trezor supportBruno2018-06-1014-6478/+8369
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #4656 from MetaMask/portal-metamask-ens-testDan Finlay2018-07-205-38/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Revert package-lock changesbitpshr2018-07-193-28311/+32814
| * | | | | | | | | | | | | | | | | | | | | | Version Circle cache keys for easy flushingbitpshr2018-07-191-13/+13
| * | | | | | | | | | | | | | | | | | | | | | Update variable namebitpshr2018-07-191-2/+2
| * | | | | | | | | | | | | | | | | | | | | | Pin @material-ui/core@1.2.0 to maintain React 15 compatbitpshr2018-07-192-7/+15
| * | | | | | | | | | | | | | | | | | | | | | Updates for lintingbitpshr2018-07-191-1/+1
| * | | | | | | | | | | | | | | | | | | | | | Updatesbitpshr2018-07-191-33/+37
| * | | | | | | | | | | | | | | | | | | | | | Add support for .test Ropsten ENS domainsbitpshr2018-07-194-32802/+28297
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #4833 from MetaMask/brave-flag-sentryJenny Pollack2018-07-192-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | remove local testsJenny Pollack2018-07-192-3/+0
| * | | | | | | | | | | | | | | | | | | | | sentry - add detection for Brave BrowserJenny Pollack2018-07-192-4/+11
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #4813 from MetaMask/no-inject-blueskybookingDan Finlay2018-07-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Do not inject on blueskybooking.comDan Finlay2018-07-171-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-addressWhymarrh Whitby2018-07-192-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x in walletWhymarrh Whitby2018-07-181-1/+1
| * | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x in tx listWhymarrh Whitby2018-07-181-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #4814 from whymarrh/send-dataWhymarrh Whitby2018-07-1914-21/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Don't set txData to an empty stringWhymarrh Whitby2018-07-181-1/+1
| * | | | | | | | | | | | | | | | | | | Inline single-use vars in send-footer.utilsWhymarrh Whitby2018-07-181-3/+1
| * | | | | | | | | | | | | | | | | | | Send data along with other tx paramsWhymarrh Whitby2018-07-187-16/+66
| * | | | | | | | | | | | | | | | | | | Hook up send component w/ UPDATE_SEND_HEX_DATA actionWhymarrh Whitby2018-07-183-5/+28
| * | | | | | | | | | | | | | | | | | | Add updateSendHexData actionWhymarrh Whitby2018-07-182-0/+17
| * | | | | | | | | | | | | | | | | | | Add hex data row to send screenWhymarrh Whitby2018-07-185-2/+43
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #4800 from MetaMask/i4785-confirm-screen-fixesAlexander Tseung2018-07-1826-2221/+351
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use Number constructor for number conversion. Use existing noConversionRateAv...Alexander Tseung2018-07-183-7/+4
| * | | | | | | | | | | | | | | | | | Merge developAlexander Tseung2018-07-183-1746/+0
| * | | | | | | | | | | | | | | | | | Fix testsAlexander Tseung2018-07-184-76/+13
| * | | | | | | | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ...Alexander Tseung2018-07-1817-104/+322
| * | | | | | | | | | | | | | | | | | Remove unused confirm transaction filesAlexander Tseung2018-07-184-299/+23
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retryAlexander Tseung2018-07-183-22/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Increase clickable area and padding of Retry Transaction barAlexander Tseung2018-07-173-22/+16
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #4777 from MetaMask/i4661-currencyConversionBugWhymarrh Whitby2018-07-182-11/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | lint fixSara Reynolds2018-07-171-6/+4
| * | | | | | | | | | | | | | | | | Fix edge cases and add translation compatibilitySara Reynolds2018-07-172-6/+15
| * | | | | | | | | | | | | | | | | Update onlyRenderConversions function to method and account for edge casesSara Reynolds2018-07-171-26/+24
| * | | | | | | | | | | | | | | | | Fixes conversion status for tokens without conversion ratesSara Reynolds2018-07-171-14/+29
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #4621 from MetaMask/one-send-directoryWhymarrh Whitby2018-07-17129-55/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix send import paths in confirm tx componentsWhymarrh Whitby2018-07-162-3/+3
| * | | | | | | | | | | | | | | | | Fix send import path in customize gas modalWhymarrh Whitby2018-07-161-1/+1
| * | | | | | | | | | | | | | | | | Fix send import path in ToAutoCompleteWhymarrh Whitby2018-07-161-1/+1
| * | | | | | | | | | | | | | | | | Fix lint warnings in the send/ directory.Dan2018-07-164-32/+28
| * | | | | | | | | | | | | | | | | Remove send_ directory, revert to just having sendDan2018-07-16124-20/+142
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4636 from MetaMask/bmd/tos-linkWhymarrh Whitby2018-07-165-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix tos link;Bobby Dresser2018-07-135-6/+5
* | | | | | | | | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocompleteDan J Miller2018-07-143-121/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fix classnameTrejGun2018-07-051-1/+4
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into to-autocompleteАнна2018-07-05157-33248/+33516
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fixes #4664trejgun2018-07-033-121/+139
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypesDan J Miller2018-07-1414-60/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into contextTypesTrejGun2018-07-05157-33248/+33516
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | convert contextType to static prop for refactored componentstrejgun2018-07-0514-60/+57
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4787 from MetaMask/stop-inject-harbourairThomas Huang2018-07-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add harbourair.com to injection block listDan Finlay2018-07-131-0/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-11214-33189/+34938
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Remove unsued nonce tracker functiontmashuang2018-06-261-13/+0
* | | | | | | | | | | | | | | | | | Merge pull request #4766 from whymarrh/null-translationsWhymarrh Whitby2018-07-134-41/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove unneeded MetaMaskConnect connect wrapperWhymarrh Whitby2018-07-122-28/+1
| * | | | | | | | | | | | | | | | | | Fallback to English and then the key for I18nProvider#tWhymarrh Whitby2018-07-122-11/+16
| * | | | | | | | | | | | | | | | | | Inline locale variable in fetchLocale fnWhymarrh Whitby2018-07-121-2/+1
* | | | | | | | | | | | | | | | | | | Merge pull request #4779 from whymarrh/tx-view-tooltipsWhymarrh Whitby2018-07-132-13/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add tooltip to new tab icon in tx-viewWhymarrh Whitby2018-07-122-4/+11
| * | | | | | | | | | | | | | | | | | Add tooltip to menu icon in tx-viewWhymarrh Whitby2018-07-122-9/+19
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-12125-775/+5145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction confirmatio...Alexander Tseung2018-07-124-4/+20
| * | | | | | | | | | | | | | | | | Merge pull request #4764 from MetaMask/i4404-confirm-refactor-with-e2e-upgradesDan J Miller2018-07-1215-154/+585
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Wait for an element with a .tx-list-pending-item-container to be rendered bef...Dan2018-07-121-0/+2
| | * | | | | | | | | | | | | | | | | Reattempt to find network selector; wait for network selector dropdown to con...Dan2018-07-121-3/+6
| | * | | | | | | | | | | | | | | | | Wait for submitted tx list item amounts to match the expected before clicking...Dan2018-07-121-5/+6
| | * | | | | | | | | | | | | | | | | Fix bug in test mock signature request methods.Dan2018-07-125-3/+42
| | * | | | | | | | | | | | | | | | | Fix send integration tests for compatability with confirm refactor.Dan2018-07-114-7/+61
| | * | | | | | | | | | | | | | | | | Fix signature request tests for compatability with confirm refactor.Dan2018-07-112-12/+37
| | * | | | | | | | | | | | | | | | | Update e2e beta tests to cover confirm refactor changes.Dan2018-07-113-4/+155
| | * | | | | | | | | | | | | | | | | Fix existing e2e testsDan2018-07-111-11/+26
| | * | | | | | | | | | | | | | | | | Handles window indeterminancy issues for external dapps in e2e beta tests.Dan2018-07-114-114/+255
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Fix multiple signature requests showing an infinite spinnerAlexander Tseung2018-07-111-2/+11
| * | | | | | | | | | | | | | | | | Add unit tests for confirmTransaction duck and utilAlexander Tseung2018-07-102-0/+812
| * | | | | | | | | | | | | | | | | Fix existing unit testsAlexander Tseung2018-07-084-71/+70
| * | | | | | | | | | | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-0716-23515/+335
| * | | | | | | | | | | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-0712-36/+20002
| * | | | | | | | | | | | | | | | | Display newest transactionAlexander Tseung2018-07-074-6/+6
| * | | | | | | | | | | | | | | | | Refactor data flow, signature request routingAlexander Tseung2018-07-079-117/+185
| * | | | | | | | | | | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-07105-558/+6807
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4769 from MetaMask/i4517-submit-passwordAlexander Tseung2018-07-123-38/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Prevent users from submitting password multiple times on the unlock screenAlexander Tseung2018-07-113-38/+40
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4667 from MetaMask/i#3896Frankie2018-07-116-6/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | test - check that #setTxStatusRejected removes transaction from historyfrankiebee2018-07-111-0/+9
| * | | | | | | | | | | | | | | | test - fix for lintfrankiebee2018-07-111-5/+5
| * | | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-11214-33187/+34936
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4765 from MetaMask/bmd/readme-linkWhymarrh Whitby2018-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fix readme documentation linkBobby Dresser2018-07-111-1/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4743 from MetaMask/circle-ci-node-modules-caching-fixBruno Barbieri2018-07-073-37/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Added missing stepBruno Barbieri2018-07-071-0/+2
| * | | | | | | | | | | | | | | | dont cache what's already cachedBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Firefox tests fixBruno Barbieri2018-07-071-0/+2
| * | | | | | | | | | | | | | | | Update firefox versionBruno Barbieri2018-07-071-2/+2
| * | | | | | | | | | | | | | | | lets cache firefox 61Bruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Forgot this is linux bashBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Update config.ymlBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Update config.ymlBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Update firefox-download.shBruno Barbieri2018-07-071-2/+3
| * | | | | | | | | | | | | | | | Fix indentationBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Firefox cache working properlyBruno Barbieri2018-07-071-2/+2
| * | | | | | | | | | | | | | | | oopsBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | tmp commit to force firefox updateBruno Barbieri2018-07-071-13/+8
| * | | | | | | | | | | | | | | | Update firefox-download.shBruno Barbieri2018-07-071-4/+3
| * | | | | | | | | | | | | | | | Add firefox binary to cache pathBruno Barbieri2018-07-071-0/+1
| * | | | | | | | | | | | | | | | Allow firefox binary to be cachedBruno Barbieri2018-07-071-4/+11
| * | | | | | | | | | | | | | | | Update config.yml to allow firefox download cachingBruno Barbieri2018-07-071-6/+8
| * | | | | | | | | | | | | | | | Final approachBruno Barbieri2018-07-071-6/+2
| * | | | | | | | | | | | | | | | Fix indentation againBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Fix indentationBruno Barbieri2018-07-071-1/+1
| * | | | | | | | | | | | | | | | Run npm install only when neededBruno Barbieri2018-07-071-1/+4
| * | | | | | | | | | | | | | | | simpler approachBruno Barbieri2018-07-071-9/+2
| * | | | | | | | | | | | | | | | Fallback to using the latest cache if no exact match is foundBruno Barbieri2018-07-071-1/+4
| * | | | | | | | | | | | | | | | Check for changes on package-lock.json and exit with errorBruno Barbieri2018-07-071-0/+5
| * | | | | | | | | | | | | | | | try npm install instead of npm ciBruno Barbieri2018-07-061-1/+1
| * | | | | | | | | | | | | | | | Update config.ymlBruno Barbieri2018-07-061-1/+1
| * | | | | | | | | | | | | | | | Fix indentationBruno Barbieri2018-07-061-4/+4
| * | | | | | | | | | | | | | | | Update config.ymlBruno Barbieri2018-07-061-2/+6
| * | | | | | | | | | | | | | | | Update config.ymlBruno Barbieri2018-07-061-3/+0
| * | | | | | | | | | | | | | | | Update config.ymlBruno Barbieri2018-07-061-1/+1
| * | | | | | | | | | | | | | | | use sudo to install npmBruno Barbieri2018-07-061-1/+1
| * | | | | | | | | | | | | | | | Another updateBruno Barbieri2018-07-061-23/+22
| * | | | | | | | | | | | | | | | use package-lock only for the initial restoreBruno Barbieri2018-07-061-17/+21
| * | | | | | | | | | | | | | | | Proper caching of node_modulesBruno Barbieri2018-07-061-22/+18
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4738 from MetaMask/bmd/contrib-guidelinesDan Finlay2018-07-061-18/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | update contributing.mdBobby Dresser2018-07-061-18/+13
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-065-155/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Delete old restore vault file.Dan2018-07-063-341/+163
| * | | | | | | | | | | | | | | | Update import from seed screen on new ui.Dan2018-07-055-4/+214
* | | | | | | | | | | | | | | | | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-uiDan J Miller2018-07-0618-17/+320
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Improve send token error ux.Dan2018-07-0518-17/+320
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warningsWhymarrh Whitby2018-07-063-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Don't update token balances after tracker is stoppedWhymarrh Whitby2018-07-053-0/+10
| * | | | | | | | | | | | | | | | | Remove TokenTracker listeners when unmounting componentWhymarrh Whitby2018-07-052-0/+4
* | | | | | | | | | | | | | | | | | Merge pull request #4734 from whymarrh/txlistitem-setstate-warningWhymarrh Whitby2018-07-061-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Prevent calling setState in TxListItem after unmountWhymarrh Whitby2018-07-051-0/+9
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #4617 from TrejGun/fix-new-lineDan J Miller2018-07-061-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix white spaces in signaturetrejgun2018-06-201-0/+1
* | | | | | | | | | | | | | | | | | | Merge pull request #4735 from whymarrh/restore-vault-focusDan J Miller2018-07-061-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Don't persist the seed phrase in the old UI restore flowWhymarrh Whitby2018-07-051-3/+0
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #4686 from MetaMask/tweak-token-list-amount-styleDan J Miller2018-07-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Ensures token list amount is in its own row.Dan2018-07-051-0/+1
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-053-26/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Improve error and promise resolution handling in action.js updateGasData().Dan2018-07-051-13/+14
| * | | | | | | | | | | | | | | | | Update new-ui-send integration tests to always explicitly set gas price. (e2e...Dan2018-07-051-12/+1
| * | | | | | | | | | | | | | | | | Remove unnecessary anonymous function call in actions.js gas estimation.Dan2018-07-041-7/+6
| * | | | | | | | | | | | | | | | | Use background gas price estimation method in new ui.Dan2018-06-292-8/+15
* | | | | | | | | | | | | | | | | | Merge pull request #4721 from MetaMask/i4666-gasLimitDan J Miller2018-07-052-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fixes 4666Sara Reynolds2018-07-041-2/+5
| * | | | | | | | | | | | | | | | | | :qwSara Reynolds2018-07-041-10/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #4405 from PortalNetwork/portal-metamaskDan Finlay2018-07-0521-7/+473
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #4 from brunobar79/portal-metamask-lint-fixPhyrexTsai2018-07-04352-34570/+42735
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | fix lint errorsbrunobar792018-07-045-25/+81
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into HEADbrunobar792018-07-04349-34563/+42672
| |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Update to support pathnames on IPFS hashPhyrexTsai2018-06-291-4/+8
| * | | | | | | | | | | | | | | | | | Update 404.htmlPhyrexTsai2018-06-021-1/+2
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into portal-metamaskPhyrexTsai2018-06-0170-393/+2060
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update 404Yung chieh Tsai2018-06-011-1/+0
| * | | | | | | | | | | | | | | | | | | Update ipfs to infuraYung chieh Tsai2018-06-011-2/+2
| * | | | | | | | | | | | | | | | | | | Update manifest.jsonYung chieh Tsai2018-06-011-4/+3
| * | | | | | | | | | | | | | | | | | | Update appYung chieh Tsai2018-05-301-7/+0
| * | | | | | | | | | | | | | | | | | | Update default providerYung chieh Tsai2018-05-301-1/+1
| * | | | | | | | | | | | | | | | | | | Update libYung chieh Tsai2018-05-293-23/+71
| * | | | | | | | | | | | | | | | | | | Rename filesYung chieh Tsai2018-05-2910-1912/+119
| * | | | | | | | | | | | | | | | | | | Update manifest.jsonYung chieh Tsai2018-05-291-4/+0
| * | | | | | | | | | | | | | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-292-1/+5
| * | | | | | | | | | | | | | | | | | | setTimeout bug fixMikeCheng12082018-05-291-2/+5
| * | | | | | | | | | | | | | | | | | | Intergrate ENS with IPFSMikeCheng12082018-05-2921-6/+2157
* | | | | | | | | | | | | | | | | | | | Merge pull request #4719 from MetaMask/kumavis-patch-3kumavis2018-07-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update .eslintignorekumavis2018-07-041-0/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerabilityBruno Barbieri2018-07-042-14/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | ignore lodash vulnerabilitybrunobar792018-07-042-14/+9
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-042-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fixes 4663Sara Reynolds2018-07-042-0/+2
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #4717 from MetaMask/chrome-promise-bugfixDan Finlay2018-07-041-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Conditionally use Promise-based extension API when creating windowsbitpshr2018-07-041-4/+4
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #4654 from TrejGun/bignumberDan J Miller2018-07-042-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | linttrejgun2018-06-291-1/+1
| * | | | | | | | | | | | | | | | | change numberstrejgun2018-06-241-7/+6
| * | | | | | | | | | | | | | | | | remove .onlytrejgun2018-06-241-1/+1
| * | | | | | | | | | | | | | | | | fixes #4307 BigNumber casting issuetrejgun2018-06-242-1/+24
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errorsAlexander Tseung2018-07-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Check that error is defined in import-account error catch.Dan2018-06-292-2/+2
| * | | | | | | | | | | | | | | | | Show all errors on account creation screen.Dan2018-06-292-2/+2
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4699 from TrejGun/removeLeadingZeroesDan J Miller2018-07-043-4/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | move removeLeadingZeroes to utils, add testtrejgun2018-07-023-4/+36
| | | | | | * | | | | | | | | | | tests - fix cancle transaction test to better fit new behaviorfrankiebee2018-06-272-13/+10
| | | | | | * | | | | | | | | | | woops - remove .onlyfrankiebee2018-06-261-1/+1
| | | | | | * | | | | | | | | | | add to CHANGELOG.mdfrankiebee2018-06-261-0/+2
| | | | | | * | | | | | | | | | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-262-0/+20
| | | | | | * | | | | | | | | | | migration 27 - remove rejected transactions from statefrankiebee2018-06-262-0/+85
| | | | | | |/ / / / / / / / / /
| | | | | | | | | | | | | | | * fix detection on submit passwordEsteban MIno2018-07-213-14/+37
| | | | | | | | | | | | | | | * add changelogEsteban MIno2018-07-211-0/+2
| | | | | | | | | | | | | | | * keyring unlocked detect and unit testsEsteban MIno2018-07-203-25/+57
generated by cgit (git 2.34.1) at 2024-10-17 00:23:19 +0800