aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix merge conflictsbrunobar792018-08-0921-32534/+32471
|
* clean upbrunobar792018-08-053-3/+3
|
* trezor v5 working on firefoxbrunobar792018-08-057-2/+15084
|
* Merge pull request #4948 from MetaMask/i4638-update-fontAlexander Tseung2018-08-043-5/+0
|\ | | | | Update Font in Account Selector
| * Update Font in Account SelectorAlexander Tseung2018-08-043-5/+0
| |
* | Merge pull request #4947 from MetaMask/i4532-disable-confirm-onsubmitAlexander Tseung2018-08-042-6/+21
|\ \ | |/ |/| Disable Confirm button on subsequent clicks to prevent confirming mul…
| * Disable Confirm button on subsequent clicks to prevent confirming multiple timesAlexander Tseung2018-08-042-6/+21
|/
* Merge pull request #4906 from MetaMask/updatePhishingPageKevin Serrano2018-08-031-23/+26
|\ | | | | Update Phishing HTML
| * Update Phishing HtmlThomas2018-07-281-23/+26
| |
* | Merge pull request #4926 from MetaMask/update-logic-for-retry-buttonDan J Miller2018-08-012-8/+8
|\ \ | | | | | | Show the retry button on latest tx of earliest nonce.
| * | Show the retry button on latest tx of earliest nonce.Dan Miller2018-08-012-8/+8
|/ /
* | Merge pull request #4888 from whymarrh/suggest-new-uiWhymarrh Whitby2018-08-0112-591/+861
|\ \ | | | | | | Add old UI component to suggest new UI
| * | Remove the development notice from UI onboardingWhymarrh Whitby2018-07-281-20/+0
| | |
| * | Open UI in browser post-new-UI-switchWhymarrh Whitby2018-07-282-0/+2
| | |
| * | Don't show an additional beta UI notificationWhymarrh Whitby2018-07-284-12/+2
| | | | | | | | | | | | | | | | | | When a user has opted-in to the new UI from the announcement, we don't need an additional notification letting the user know that they've switched.
| * | New ui e2e tests switch to localhost provider (needed after new ui selection ↵Dan Miller2018-07-282-0/+20
| | | | | | | | | | | | screen addition).
| * | Fix integration tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-281-0/+5
| | |
| * | Fix e2e tests to accomodate new ui suggestion screen changes.Dan Miller2018-07-283-57/+83
| | |
| * | Rewrite AccountQrScreen to use flexboxWhymarrh Whitby2018-07-284-108/+92
| | | | | | | | | | | | | | | | | | | | | | | | The old QR screen was absolutely positioning everything which broke when the app bar resized for the new UI announcement. This change, while futile*, makes the QR screen less bad. * futile because the old UI is being deprecated
| * | Remove suggestion from bottom of old UI onboardingWhymarrh Whitby2018-07-281-16/+0
| | |
| * | Add NewUiAnnouncement componentWhymarrh Whitby2018-07-284-9/+216
| | |
| * | Add banner suggesting new UIWhymarrh Whitby2018-07-282-2/+64
| | |
| * | Move the old UI's AppBar into its own componentWhymarrh Whitby2018-07-283-384/+394
| | |
* | | Merge pull request #4908 from MetaMask/npm-installWilliam Morriss2018-07-311-2/+3
|\ \ \ | |/ / |/| | Restore npm install instructions to README
| * | Select not UpdateWilliam Morriss2018-07-311-1/+1
| | |
| * | reduce npm install to one lineWilliam Morriss2018-07-281-4/+1
| | |
| * | restore npm install instructionsWilliam Morriss2018-07-281-1/+5
|/ /
* | Merge pull request #4895 from MetaMask/fix-confirmAlexander Tseung2018-07-284-6/+30
|\ \ | |/ |/| Add rounding to large exponential numbers. Fix overflows
| * Round large exponential numbersAlexander Tseung2018-07-283-6/+23
| |
| * Fix overflow for long total strings in confirm stringAlexander Tseung2018-07-261-0/+7
| |
* | Merge pull request #4905 from MetaMask/eip-712-deprecationDan Finlay2018-07-282-6/+20
|\ \ | | | | | | EIP-712: deprecation message
| * | Add deprecation message for eth_signTypedDatabitpshr2018-07-282-6/+20
| | |
* | | Merge pull request #4893 from kelvintyb/developThomas Huang2018-07-284-3/+65
|\ \ \ | |/ / |/| | Move phishing warning to the extension
| * | revert package-lock.jsonKelvin Tan2018-07-271-19/+36
| | |
| * | add phishing html page, and redirect to bundled page in-windowKelvin Tan2018-07-275-39/+84
| |/
* | Merge pull request #4901 from MetaMask/readme-updateBruno Barbieri2018-07-281-2/+0
|\ \ | | | | | | remove Web Store warning
| * | remove Web Store warningbobby dresser2018-07-281-2/+0
|/ /
* | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditionalkumavis2018-07-271-2/+2
|\ \ | | | | | | Update Chinese naming on our language list
| * | Update Chinese namingKevin Serrano2018-07-241-2/+2
| | | | | | | | | I sincerely hope this is a non-controversial change.
* | | Merge pull request #4802 from 03-26/developkumavis2018-07-271-4/+29
|\ \ \ | |_|/ |/| | Update translation 🇯🇵
| * | Merge remote-tracking branch 'upstream/develop' into developAkihiro2018-07-213-12/+40
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into developAkihiro2018-07-21209-2684/+3377
| |\ \ \
| * | | | Update03-262018-07-151-4/+29
| | | | |
* | | | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTxDan J Miller2018-07-262-2/+20
|\ \ \ \ \ | | | | | | | | | | | | Only show retry button on the earliest pending tx
| * | | | | earliest tx by submittedTimeEsteban MIno2018-07-262-10/+16
| | | | | |
| * | | | | only show retry button on earliest pending txEsteban MIno2018-07-262-2/+14
| | | | | |
* | | | | | Merge pull request #4876 from MetaMask/i4835-unitTestConfirmDetailRowDan J Miller2018-07-261-0/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add tests for Confirm Detail Row
| * | | | | | lint fixSara Reynolds2018-07-261-2/+2
| | | | | | |
| * | | | | | Update prop namesSara Reynolds2018-07-261-7/+7
| | | | | | |
| * | | | | | Add tests for Confirm Detail RowSara Reynolds2018-07-261-0/+64
| | | | | | |
* | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gasFrankie2018-07-261-7/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | tx-gas-utils - catch all errors from gas estimation
| * | | | | | | tx-gas-utils - catch all errors from gas estimationJenny Pollack2018-07-251-7/+3
| | | | | | | |
* | | | | | | | Merge pull request #4875 from MetaMask/bmd/readme-releaseDan Finlay2018-07-261-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add current release to the README
| * | | | | | | | remove current versionbobby dresser2018-07-261-1/+1
| | | | | | | | |
| * | | | | | | | fix link bracketbobby dresser2018-07-261-1/+1
| | | | | | | | |
| * | | | | | | | add current release to the READMEbobby dresser2018-07-261-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4880 from MetaMask/migration-27Thomas Huang2018-07-261-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | migrations - fix to include 27
| * | | | | | | migrations - fix to include 27frankiebee2018-07-261-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamerWilliam Morriss2018-07-251-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not inject on ani.gamer.com.tw
| * \ \ \ \ \ \ Merge branch 'develop' into no-inject-ani-gamerKevin Serrano2018-07-2558-437/+2919
| |\ \ \ \ \ \ \
| * | | | | | | | Do not inject on ani.gamer.com.twDan Finlay2018-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4799
* | | | | | | | | Merge pull request #4820 from MetaMask/codeownersWilliam Morriss2018-07-251-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Added codeowners file
| * | | | | | | | | Added codeowners fileDan Finlay2018-07-181-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge pull request #4845 from MetaMask/button-groupDan J Miller2018-07-256-0/+248
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | Add ButtonGroup component
| * | | | | | | | | Adds tests for button group component.Dan Miller2018-07-241-0/+97
| | | | | | | | | |
| * | | | | | | | | Add ButtonGroup componentAlexander Tseung2018-07-245-0/+151
| | | | | | | | | |
* | | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-252-0/+4
| |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | Fixes #4253
* | | | | | | | | Merge pull request #4865 from MetaMask/i4829-close-notifications-from-uiAlexander Tseung2018-07-257-18/+111
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Close notifications from UI actions
| * | | | | | | | | Remove unneeded code from i4829-close-notifications-from-ui branch.Dan Miller2018-07-252-2/+1
| | | | | | | | | |
| * | | | | | | | | Uncomment closePopupIfOpen code.Dan Miller2018-07-241-3/+3
| | | | | | | | | |
| * | | | | | | | | Updates e2e beta tests to ensure that popup window closes after confirming a ↵Dan Miller2018-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple send.
| * | | | | | | | | Add close window support to signature requests. Move logic to actionsAlexander Tseung2018-07-245-31/+108
| | | | | | | | | |
| * | | | | | | | | UI confirm screen closes confirmation window on submit or cancel of a txDan Miller2018-07-243-8/+25
| | |_|_|/ / / / / | |/| | | | | | |
* / | | | | | | | Update Babel to Current Standard "babel-preset-env" (#4812)Antoine Nauleau2018-07-253-25/+43
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update .babelrc and package.json to babel-preset-env standard * Install babel-preset-env babel-stage-0 * Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix * Resolve PR #4812 merge conflicts * Merge #4847 Solves previous cache issues with cirlce-ci
* | | | | | | | Merge pull request #4851 from MetaMask/fix-trezor-alertDan Finlay2018-07-241-4/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix trezor "Hardware wallet connected" alert
| * | | | | | | | show alert ONLY when device is connectedbrunobar792018-07-231-4/+11
| | | | | | | | |
* | | | | | | | | Merge pull request #4848 from MetaMask/fix-alert-flashDan Finlay2018-07-243-8/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix Banner flash on load
| * | | | | | | | | run linterbrunobar792018-07-222-2/+2
| | | | | | | | | |
| * | | | | | | | | refactor Alert component to work properlybrunobar792018-07-221-6/+46
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #4842 from wjmelements/vimignoreDan Finlay2018-07-241-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Ignore VIM files
| * | | | | | | | ignore vim filesWilliam Morriss2018-07-211-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4852 from keyiiiii/fix-token-amountDan J Miller2018-07-231-3/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix token amount
| * | | | | | | fix type板橋 清信2018-07-231-1/+1
| | | | | | | |
| * | | | | | | fix token amount板橋 清信2018-07-231-3/+2
|/ / / / / / /
* | | | | | | Merge pull request #4847 from MetaMask/node-version-checkBruno Barbieri2018-07-225-49/+39
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Enforce usage of node 8.11.3 and npm 6.1.0
| * | | | | | test npm i --no-savebrunobar792018-07-221-2/+1
| | | | | | |
| * | | | | | test npm cibrunobar792018-07-221-12/+2
| | | | | | |
| * | | | | | update package-lock.jsonbrunobar792018-07-221-17/+7
| | | | | | |
| * | | | | | bump cache versionbrunobar792018-07-221-26/+26
| | | | | | |
| * | | | | | update package-lock.jsonbrunobar792018-07-221-7/+17
| | | | | | |
| * | | | | | added node version requirementsbrunobar792018-07-225-47/+48
|/ / / / / /
* | | | | | Merge pull request #4844 from MetaMask/detectTokenFeatureDan Finlay2018-07-213-12/+40
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Detect token feature
| * | | | | fix mergeEsteban MIno2018-07-211-1/+0
| | | | | |
| * | | | | Merge branch 'develop' into detectTokenFeatureEsteban Miño2018-07-21347-3739/+9536
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #4840 from scsaba/transaction-notificationsDan Finlay2018-07-214-1/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | Transaction notifications
| * \ \ \ \ \ Merge branch 'develop' into transaction-notificationsCsaba S2018-07-2139-303/+2514
| |\ \ \ \ \ \
| * | | | | | | adding changelog entryCsaba Solya2018-07-211-0/+1
| | | | | | | |
| * | | | | | | remove dropped handlerCsaba Solya2018-07-212-11/+1
| | | | | | | |
| * | | | | | | add notificationsCsaba Solya2018-07-204-30/+71
| | | | | | | |
| * | | | | | | initial testCsaba Solya2018-07-203-1/+32
| | | | | | | |
* | | | | | | | Merge pull request #4841 from MetaMask/i4836-new-contractAlexander Tseung2018-07-213-10/+24
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Add fallback options for displaying recipient name in the Confirm screen
| * | | | | | | Add fallback options for displaying recipient name in the Confirm screenAlexander Tseung2018-07-213-10/+24
|/ / / / / / /
* | | | | | | Auto-detect tokens #3034 (#4683)Esteban Miño2018-07-214-1/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog
* | | | | | | Merge pull request #4838 from MetaMask/fix-linkDan Finlay2018-07-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix link to TREZOR emulator docs in README
| * | | | | | | Fix link to TREZOR emulator docs in READMEWhymarrh Whitby2018-07-201-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-2037-301/+2258
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Initial trezor support
| * | | | | | last css fixesbrunobar792018-07-194-10/+45
| | | | | | |
| * | | | | | added new global alertbrunobar792018-07-196-8/+126
| | | | | | |
| * | | | | | fix support linkbrunobar792018-07-191-1/+1
| | | | | | |
| * | | | | | fix unsupported browser viewbrunobar792018-07-192-2/+6
| | | | | | |
| * | | | | | lintbrunobar792018-07-191-1/+1
| | | | | | |
| * | | | | | scroll smoothbrunobar792018-07-192-3/+12
| | | | | | |
| * | | | | | design donebrunobar792018-07-197-48/+385
| | | | | | |
| * | | | | | fix browser not supported screenbrunobar792018-07-183-3/+3
| | | | | | |
| * | | | | | added some e2e testsbrunobar792018-07-182-1/+48
| | | | | | |
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-185-33/+47
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| * | | | | | | updated account list based on new designsbrunobar792018-07-185-25/+91
| | | | | | | |
| * | | | | | | added tests for removeAccountbrunobar792018-07-172-2/+33
| | | | | | | |
| * | | | | | | added more unit testsbrunobar792018-07-172-6/+58
| | | | | | | |
| * | | | | | | added unit tests for metamaskcontrollerbrunobar792018-07-172-3/+87
| | | | | | | |
| * | | | | | | added test for preferences controllerbrunobar792018-07-172-1/+26
| | | | | | | |
| * | | | | | | use latest keyring packagesbrunobar792018-07-172-32/+97
| | | | | | | |
| * | | | | | | restore circleci configbrunobar792018-07-171-1/+6
| | | | | | | |
| * | | | | | | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-17134-121/+256
| |\ \ \ \ \ \ \
| * | | | | | | | clear circleci cachebrunobar792018-07-141-5/+0
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-148-67/+49
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| * | | | | | | | | added TREZOR simulator instructionsbrunobar792018-07-142-0/+26
| | | | | | | | | |
| * | | | | | | | | restore circleci configbrunobar792018-07-141-19/+19
| | | | | | | | | |
| * | | | | | | | | remove trezor scriptbrunobar792018-07-141-10/+0
| | | | | | | | | |
| * | | | | | | | | add changelogbrunobar792018-07-141-1/+3
| | | | | | | | | |
| * | | | | | | | | cache circlecibrunobar792018-07-141-1/+1
| | | | | | | | | |
| * | | | | | | | | update labelbrunobar792018-07-141-1/+1
| | | | | | | | | |
| * | | | | | | | | fix account selectionbrunobar792018-07-142-3/+11
| | | | | | | | | |
| * | | | | | | | | added affiliate link to trezorbrunobar792018-07-143-0/+25
| | | | | | | | | |
| * | | | | | | | | detect ability to open popup instead of browserbrunobar792018-07-132-6/+13
| | | | | | | | | |
| * | | | | | | | | test cibrunobar792018-07-131-19/+19
| | | | | | | | | |
| * | | | | | | | | avoid fallback cachebrunobar792018-07-131-1/+1
| | | | | | | | | |
| * | | | | | | | | update package-lock.jsonbrunobar792018-07-131-45/+25
| | | | | | | | | |
| * | | | | | | | | fix account balance bugbrunobar792018-07-132-10/+16
| | | | | | | | | |
| * | | | | | | | | remove account modal updatedbrunobar792018-07-133-17/+57
| | | | | | | | | |
| * | | | | | | | | catching up with developbrunobar792018-07-135-27/+80
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-13134-814/+5293
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| * | | | | | | | | | 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 ↵brunobar792018-07-0760-275/+1091
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| * | | | | | | | | | | 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 ↵Bruno2018-06-1312-6576/+6595
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/brunobar79/metamask-extension ↵Bruno2018-06-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for .test ENS domains
| * | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | sentry - add detection for Brave Browser
| * | | | | | | | | | | | | | | | | | | | | 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.com
| * | | | | | | | | | | | | | | | | | | | Do not inject on blueskybooking.comDan Finlay2018-07-171-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per zendesk 2312.
* | | | | | | | | | | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-addressWhymarrh Whitby2018-07-192-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x
| * | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Add hex data input to send screen
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates
| * | | | | | | | | | | | | | | | | | Use Number constructor for number conversion. Use existing ↵Alexander Tseung2018-07-183-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message
| * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates
| * | | | | | | | | | | | | | | | | | 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 bar
| * | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fixes conversion status for tokens without conversion rates (#4661)
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'send_/' directory; revert to just having send
| * | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens.
* | | | | | | | | | | | | | | | | Merge pull request #4636 from MetaMask/bmd/tos-linkWhymarrh Whitby2018-07-165-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | fix tos link
| * | | | | | | | | | | | | | | | fix tos link;Bobby Dresser2018-07-135-6/+5
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocompleteDan J Miller2018-07-143-121/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4664
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | convert contextType to static prop for refactored components
| * | | | | | | | | | | | | | | | | Merge branch 'develop' into contextTypesTrejGun2018-07-05157-33248/+33516
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
| * | | | | | | | | | | | | | | | | 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 list
| * | | | | | | | | | | | | | | | Add harbourair.com to injection block listDan Finlay2018-07-131-0/+1
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This site was getting unexpected results when MetaMask was installed. https://consensys.zendesk.com/agent/tickets/2312
* | | | | | | | | | | | | | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unsued nonce tracker function
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-11214-33189/+34938
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 11:02:08 +0800