| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4988 from MetaMask/remove-engine-restrictions | Bruno Barbieri | 2018-08-09 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | remove engine restrictions | brunobar79 | 2018-08-08 | 1 | -1/+0 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4982 from MetaMask/sig-version-fix | Dan Finlay | 2018-08-08 | 2 | -1458/+5519 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Reestablish old versions of eth-keyring-controller and eth-hd-keyring | bitpshr | 2018-08-08 | 2 | -1458/+5519 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Fixing translations in first-time init menu (#4969) | Justin Kat | 2018-08-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4884 from MetaMask/TokensPerAccountBasis | Dan Finlay | 2018-08-08 | 9 | -37/+287 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | CHANGELOG | Esteban MIno | 2018-08-08 | 1 | -0/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 1 | -0/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4965 from MetaMask/4.9.0v4.9.0 | Dan Finlay | 2018-08-08 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Update CHANGELOG.md | Kevin Serrano | 2018-08-08 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 34 | -1259/+1149 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4960 from whymarrh/import-account-error | Whymarrh Whitby | 2018-08-07 | 2 | -2/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Show invalid seed phrase error when importing new account | Whymarrh Whitby | 2018-08-07 | 2 | -2/+10 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4951 from whymarrh/update-pkgs | Whymarrh Whitby | 2018-08-07 | 3 | -547/+124 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Update chromedriver pkg | Whymarrh Whitby | 2018-08-07 | 2 | -20/+23 | |
| | * | | | | | | | | | | | | | | | | | | | | Switch superstatic for static-server pkg | Whymarrh Whitby | 2018-08-07 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | Add static-server devDependency | Whymarrh Whitby | 2018-08-07 | 2 | -7/+88 | |
| | * | | | | | | | | | | | | | | | | | | | | Remove superstatic package | Whymarrh Whitby | 2018-08-07 | 2 | -524/+26 | |
| | * | | | | | | | | | | | | | | | | | | | | Refresh package-lock.json file with npm@6.3.0 | Whymarrh Whitby | 2018-08-07 | 1 | -15/+6 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4868 from MetaMask/further-e2e-improvements | Dan J Miller | 2018-08-07 | 5 | -64/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Fix seed word confirmation step of e2e beta tests. | Dan Miller | 2018-08-06 | 2 | -60/+29 | |
| | * | | | | | | | | | | | | | | | | | | | Use unmodified constant for test delay in from-import-beta-spec. | Dan Miller | 2018-08-06 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | Improve waits for new tx-list-items after first contract method call in e2e b... | Dan Miller | 2018-08-06 | 3 | -3/+17 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 3 | -5/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 3 | -5/+0 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4947 from MetaMask/i4532-disable-confirm-onsubmit | Alexander Tseung | 2018-08-04 | 2 | -6/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple times | Alexander Tseung | 2018-08-04 | 2 | -6/+21 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4906 from MetaMask/updatePhishingPage | Kevin Serrano | 2018-08-03 | 1 | -23/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Update Phishing Html | Thomas | 2018-07-28 | 1 | -23/+26 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4926 from MetaMask/update-logic-for-retry-button | Dan J Miller | 2018-08-01 | 2 | -8/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Show the retry button on latest tx of earliest nonce. | Dan Miller | 2018-08-01 | 2 | -8/+8 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4888 from whymarrh/suggest-new-ui | Whymarrh Whitby | 2018-08-01 | 12 | -591/+861 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Remove the development notice from UI onboarding | Whymarrh Whitby | 2018-07-28 | 1 | -20/+0 | |
| | * | | | | | | | | | | | | | | | | | | | Open UI in browser post-new-UI-switch | Whymarrh Whitby | 2018-07-28 | 2 | -0/+2 | |
| | * | | | | | | | | | | | | | | | | | | | Don't show an additional beta UI notification | Whymarrh Whitby | 2018-07-28 | 4 | -12/+2 | |
| | * | | | | | | | | | | | | | | | | | | | New ui e2e tests switch to localhost provider (needed after new ui selection ... | Dan Miller | 2018-07-28 | 2 | -0/+20 | |
| | * | | | | | | | | | | | | | | | | | | | Fix integration tests to accomodate new ui suggestion screen changes. | Dan Miller | 2018-07-28 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | | | | | | | | Fix e2e tests to accomodate new ui suggestion screen changes. | Dan Miller | 2018-07-28 | 3 | -57/+83 | |
| | * | | | | | | | | | | | | | | | | | | | Rewrite AccountQrScreen to use flexbox | Whymarrh Whitby | 2018-07-28 | 4 | -108/+92 | |
| | * | | | | | | | | | | | | | | | | | | | Remove suggestion from bottom of old UI onboarding | Whymarrh Whitby | 2018-07-28 | 1 | -16/+0 | |
| | * | | | | | | | | | | | | | | | | | | | Add NewUiAnnouncement component | Whymarrh Whitby | 2018-07-28 | 4 | -9/+216 | |
| | * | | | | | | | | | | | | | | | | | | | Add banner suggesting new UI | Whymarrh Whitby | 2018-07-28 | 2 | -2/+64 | |
| | * | | | | | | | | | | | | | | | | | | | Move the old UI's AppBar into its own component | Whymarrh Whitby | 2018-07-28 | 3 | -384/+394 | |
| | | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4908 from MetaMask/npm-install | William Morriss | 2018-07-31 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Select not Update | William Morriss | 2018-07-31 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | reduce npm install to one line | William Morriss | 2018-07-28 | 1 | -4/+1 | |
| | * | | | | | | | | | | | | | | | | | | restore npm install instructions | William Morriss | 2018-07-28 | 1 | -1/+5 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4895 from MetaMask/fix-confirm | Alexander Tseung | 2018-07-28 | 4 | -6/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Round large exponential numbers | Alexander Tseung | 2018-07-28 | 3 | -6/+23 | |
| | * | | | | | | | | | | | | | | | | | Fix overflow for long total strings in confirm string | Alexander Tseung | 2018-07-26 | 1 | -0/+7 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecation | Dan Finlay | 2018-07-28 | 2 | -6/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Add deprecation message for eth_signTypedData | bitpshr | 2018-07-28 | 2 | -6/+20 | |
| | | | * | | | | | | | | | | | | | | | | fix doc tag | Esteban MIno | 2018-08-01 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | tokens related functions refactor | Esteban MIno | 2018-08-01 | 1 | -15/+22 | |
| | | | * | | | | | | | | | | | | | | | | fix undefined for tokens on tests | Esteban MIno | 2018-08-01 | 1 | -1/+3 | |
| | | | * | | | | | | | | | | | | | | | | improve comments | Esteban MIno | 2018-07-31 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | fix double state update when account changed | Esteban MIno | 2018-07-31 | 1 | -5/+3 | |
| | | | * | | | | | | | | | | | | | | | | create tokens storage when setadresses | Esteban MIno | 2018-07-31 | 2 | -2/+29 | |
| | | | * | | | | | | | | | | | | | | | | isolation of tokens related methods in preferences | Esteban MIno | 2018-07-31 | 1 | -43/+42 | |
| | | | * | | | | | | | | | | | | | | | | passing tokens to all accounts in migration | Esteban MIno | 2018-07-30 | 1 | -3/+6 | |
| | | | * | | | | | | | | | | | | | | | | unit tests for tokens per account and network | Esteban MIno | 2018-07-28 | 1 | -0/+128 | |
| | | | * | | | | | | | | | | | | | | | | fix migration for preferences controller tokens | Esteban MIno | 2018-07-28 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban Miño | 2018-07-28 | 18 | -18/+439 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4893 from kelvintyb/develop | Thomas Huang | 2018-07-28 | 4 | -3/+65 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | revert package-lock.json | Kelvin Tan | 2018-07-27 | 1 | -19/+36 | |
| | * | | | | | | | | | | | | | | | | | | add phishing html page, and redirect to bundled page in-window | Kelvin Tan | 2018-07-27 | 5 | -39/+84 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4901 from MetaMask/readme-update | Bruno Barbieri | 2018-07-28 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | remove Web Store warning | bobby dresser | 2018-07-28 | 1 | -2/+0 | |
| |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional | kumavis | 2018-07-27 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Update Chinese naming | Kevin Serrano | 2018-07-24 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #4802 from 03-26/develop | kumavis | 2018-07-27 | 1 | -4/+29 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into develop | Akihiro | 2018-07-21 | 3 | -12/+40 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into develop | Akihiro | 2018-07-21 | 209 | -2684/+3377 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Update | 03-26 | 2018-07-15 | 1 | -4/+29 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx | Dan J Miller | 2018-07-26 | 2 | -2/+20 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | earliest tx by submittedTime | Esteban MIno | 2018-07-26 | 2 | -10/+16 | |
| | * | | | | | | | | | | | | | | | | | | | | only show retry button on earliest pending tx | Esteban MIno | 2018-07-26 | 2 | -2/+14 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4876 from MetaMask/i4835-unitTestConfirmDetailRow | Dan J Miller | 2018-07-26 | 1 | -0/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | lint fix | Sara Reynolds | 2018-07-26 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | | Update prop names | Sara Reynolds | 2018-07-26 | 1 | -7/+7 | |
| | * | | | | | | | | | | | | | | | | | | | | | Add tests for Confirm Detail Row | Sara Reynolds | 2018-07-26 | 1 | -0/+64 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gas | Frankie | 2018-07-26 | 1 | -7/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | tx-gas-utils - catch all errors from gas estimation | Jenny Pollack | 2018-07-25 | 1 | -7/+3 | |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4875 from MetaMask/bmd/readme-release | Dan Finlay | 2018-07-26 | 1 | -0/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | remove current version | bobby dresser | 2018-07-26 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | fix link bracket | bobby dresser | 2018-07-26 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | add current release to the README | bobby dresser | 2018-07-26 | 1 | -0/+2 | |
| | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4880 from MetaMask/migration-27 | Thomas Huang | 2018-07-26 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | migrations - fix to include 27 | frankiebee | 2018-07-26 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamer | William Morriss | 2018-07-25 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into no-inject-ani-gamer | Kevin Serrano | 2018-07-25 | 58 | -437/+2919 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Do not inject on ani.gamer.com.tw | Dan Finlay | 2018-07-19 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4820 from MetaMask/codeowners | William Morriss | 2018-07-25 | 1 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Added codeowners file | Dan Finlay | 2018-07-18 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4845 from MetaMask/button-group | Dan J Miller | 2018-07-25 | 6 | -0/+248 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Adds tests for button group component. | Dan Miller | 2018-07-24 | 1 | -0/+97 | |
| | * | | | | | | | | | | | | | | | | | | | | | | Add ButtonGroup component | Alexander Tseung | 2018-07-24 | 5 | -0/+151 | |
| | | | | | | | | | | * | | | | | | | | | | | | | refactor to accountTokens | Esteban MIno | 2018-07-28 | 2 | -54/+48 | |
| | | | | | | | | | | * | | | | | | | | | | | | | migration for preferences controller tokens | Esteban MIno | 2018-07-28 | 2 | -0/+38 | |
| | | | | | | | | | | * | | | | | | | | | | | | | modify tests according to tokens by network | Esteban MIno | 2018-07-27 | 2 | -18/+8 | |
| | | | | | | | | | | * | | | | | | | | | | | | | add & delete tokens per network | Esteban MIno | 2018-07-27 | 2 | -11/+10 | |
| | | | | | | | | | | * | | | | | | | | | | | | | tokens per network for individual account | Esteban MIno | 2018-07-27 | 2 | -15/+52 | |
| | | | | | | | | | | * | | | | | | | | | | | | | preferences test fixes for tokens per account | Esteban MIno | 2018-07-26 | 1 | -9/+16 | |
| | | | | | | | | | | * | | | | | | | | | | | | | add & delete tokens per account | Esteban MIno | 2018-07-26 | 2 | -8/+27 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | network.js: convert rpc protocol to lower case (#4855) | pinkiebell | 2018-07-25 | 2 | -0/+4 | |
| | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4865 from MetaMask/i4829-close-notifications-from-ui | Alexander Tseung | 2018-07-25 | 7 | -18/+111 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Remove unneeded code from i4829-close-notifications-from-ui branch. | Dan Miller | 2018-07-25 | 2 | -2/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | Uncomment closePopupIfOpen code. | Dan Miller | 2018-07-24 | 1 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | Updates e2e beta tests to ensure that popup window closes after confirming a ... | Dan Miller | 2018-07-24 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 5 | -31/+108 | |
| | * | | | | | | | | | | | | | | | | | | | | | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 3 | -8/+25 | |
| | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * / | | | | | | | | | | | | | | | | | | | | Update Babel to Current Standard "babel-preset-env" (#4812) | Antoine Nauleau | 2018-07-25 | 3 | -25/+43 | |
| |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4851 from MetaMask/fix-trezor-alert | Dan Finlay | 2018-07-24 | 1 | -4/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 | |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4848 from MetaMask/fix-alert-flash | Dan Finlay | 2018-07-24 | 3 | -8/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | run linter | brunobar79 | 2018-07-22 | 2 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | | refactor Alert component to work properly | brunobar79 | 2018-07-22 | 1 | -6/+46 | |
| | | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4842 from wjmelements/vimignore | Dan Finlay | 2018-07-24 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | ignore vim files | William Morriss | 2018-07-21 | 1 | -0/+4 | |
| | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4852 from keyiiiii/fix-token-amount | Dan J Miller | 2018-07-23 | 1 | -3/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | fix type | 板橋 清信 | 2018-07-23 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | fix token amount | 板橋 清信 | 2018-07-23 | 1 | -3/+2 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4847 from MetaMask/node-version-check | Bruno Barbieri | 2018-07-22 | 5 | -49/+39 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | test npm i --no-save | brunobar79 | 2018-07-22 | 1 | -2/+1 | |
| | * | | | | | | | | | | | | | | | | | | test npm ci | brunobar79 | 2018-07-22 | 1 | -12/+2 | |
| | * | | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-07-22 | 1 | -17/+7 | |
| | * | | | | | | | | | | | | | | | | | | bump cache version | brunobar79 | 2018-07-22 | 1 | -26/+26 | |
| | * | | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-07-22 | 1 | -7/+17 | |
| | * | | | | | | | | | | | | | | | | | | added node version requirements | brunobar79 | 2018-07-22 | 5 | -47/+48 | |
| |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4844 from MetaMask/detectTokenFeature | Dan Finlay | 2018-07-21 | 3 | -12/+40 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | fix merge | Esteban MIno | 2018-07-21 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into detectTokenFeature | Esteban Miño | 2018-07-21 | 347 | -3739/+9536 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4840 from scsaba/transaction-notifications | Dan Finlay | 2018-07-21 | 4 | -1/+64 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into transaction-notifications | Csaba S | 2018-07-21 | 39 | -303/+2514 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | adding changelog entry | Csaba Solya | 2018-07-21 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | | | | | remove dropped handler | Csaba Solya | 2018-07-21 | 2 | -11/+1 | |
| | * | | | | | | | | | | | | | | | | | | | add notifications | Csaba Solya | 2018-07-20 | 4 | -30/+71 | |
| | * | | | | | | | | | | | | | | | | | | | initial test | Csaba Solya | 2018-07-20 | 3 | -1/+32 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #4841 from MetaMask/i4836-new-contract | Alexander Tseung | 2018-07-21 | 3 | -10/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Add fallback options for displaying recipient name in the Confirm screen | Alexander Tseung | 2018-07-21 | 3 | -10/+24 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Auto-detect tokens #3034 (#4683) | Esteban Miño | 2018-07-21 | 4 | -1/+255 | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4838 from MetaMask/fix-link | Dan Finlay | 2018-07-20 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | Fix link to TREZOR emulator docs in README | Whymarrh Whitby | 2018-07-20 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 37 | -301/+2258 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | last css fixes | brunobar79 | 2018-07-19 | 4 | -10/+45 | |
| | * | | | | | | | | | | | | | | | | | | added new global alert | brunobar79 | 2018-07-19 | 6 | -8/+126 | |
| | * | | | | | | | | | | | | | | | | | | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | fix unsupported browser view | brunobar79 | 2018-07-19 | 2 | -2/+6 | |
| | * | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | scroll smooth | brunobar79 | 2018-07-19 | 2 | -3/+12 | |
| | * | | | | | | | | | | | | | | | | | | design done | brunobar79 | 2018-07-19 | 7 | -48/+385 | |
| | * | | | | | | | | | | | | | | | | | | fix browser not supported screen | brunobar79 | 2018-07-18 | 3 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | | added some e2e tests | brunobar79 | 2018-07-18 | 2 | -1/+48 | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-18 | 5 | -33/+47 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | updated account list based on new designs | brunobar79 | 2018-07-18 | 5 | -25/+91 | |
| | * | | | | | | | | | | | | | | | | | | | added tests for removeAccount | brunobar79 | 2018-07-17 | 2 | -2/+33 | |
| | * | | | | | | | | | | | | | | | | | | | added more unit tests | brunobar79 | 2018-07-17 | 2 | -6/+58 | |
| | * | | | | | | | | | | | | | | | | | | | added unit tests for metamaskcontroller | brunobar79 | 2018-07-17 | 2 | -3/+87 | |
| | * | | | | | | | | | | | | | | | | | | | added test for preferences controller | brunobar79 | 2018-07-17 | 2 | -1/+26 | |
| | * | | | | | | | | | | | | | | | | | | | use latest keyring packages | brunobar79 | 2018-07-17 | 2 | -32/+97 | |
| | * | | | | | | | | | | | | | | | | | | | restore circleci config | brunobar79 | 2018-07-17 | 1 | -1/+6 | |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 134 | -121/+256 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | clear circleci cache | brunobar79 | 2018-07-14 | 1 | -5/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-14 | 8 | -67/+49 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | added TREZOR simulator instructions | brunobar79 | 2018-07-14 | 2 | -0/+26 | |
| | * | | | | | | | | | | | | | | | | | | | | | restore circleci config | brunobar79 | 2018-07-14 | 1 | -19/+19 | |
| | * | | | | | | | | | | | | | | | | | | | | | remove trezor script | brunobar79 | 2018-07-14 | 1 | -10/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | | add changelog | brunobar79 | 2018-07-14 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | cache circleci | brunobar79 | 2018-07-14 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | update label | brunobar79 | 2018-07-14 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | fix account selection | brunobar79 | 2018-07-14 | 2 | -3/+11 | |
| | * | | | | | | | | | | | | | | | | | | | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 3 | -0/+25 | |
| | * | | | | | | | | | | | | | | | | | | | | | detect ability to open popup instead of browser | brunobar79 | 2018-07-13 | 2 | -6/+13 | |
| | * | | | | | | | | | | | | | | | | | | | | | test ci | brunobar79 | 2018-07-13 | 1 | -19/+19 | |
| | * | | | | | | | | | | | | | | | | | | | | | avoid fallback cache | brunobar79 | 2018-07-13 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-07-13 | 1 | -45/+25 | |
| | * | | | | | | | | | | | | | | | | | | | | | fix account balance bug | brunobar79 | 2018-07-13 | 2 | -10/+16 | |
| | * | | | | | | | | | | | | | | | | | | | | | remove account modal updated | brunobar79 | 2018-07-13 | 3 | -17/+57 | |
| | * | | | | | | | | | | | | | | | | | | | | | catching up with develop | brunobar79 | 2018-07-13 | 5 | -27/+80 | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-13 | 134 | -814/+5293 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | added tooltip | brunobar79 | 2018-07-12 | 4 | -6/+17 | |
| | * | | | | | | | | | | | | | | | | | | | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 6 | -2/+134 | |
| | * | | | | | | | | | | | | | | | | | | | | | | update to temp dependencies | brunobar79 | 2018-07-12 | 3 | -16/+18 | |
| | * | | | | | | | | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-07-11 | 3 | -6/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | | account removal is working | brunobar79 | 2018-07-11 | 6 | -15/+79 | |
| | * | | | | | | | | | | | | | | | | | | | | | | finish warning modal UI | brunobar79 | 2018-07-11 | 9 | -3/+120 | |
| | * | | | | | | | | | | | | | | | | | | | | | | added ui to remove accounts | brunobar79 | 2018-07-10 | 3 | -4/+50 | |
| | * | | | | | | | | | | | | | | | | | | | | | | fix trezor label | brunobar79 | 2018-07-10 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | added label for trezor accounts | brunobar79 | 2018-07-10 | 1 | -1/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | | fix account duplication | brunobar79 | 2018-07-10 | 2 | -7/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 3 | -17/+42 | |
| | * | | | | | | | | | | | | | | | | | | | | | | copy updated | brunobar79 | 2018-07-07 | 3 | -3/+6 | |
| | * | | | | | | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-07-07 | 2 | -242/+50 | |
| | * | | | | | | | | | | | | | | | | | | | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 3 | -9/+34 | |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-07 | 60 | -275/+1091 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | UI refactor | brunobar79 | 2018-07-06 | 4 | -99/+110 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Refactor UI | brunobar79 | 2018-07-06 | 4 | -266/+328 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 2 | -11/+21 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | added message for non-chrome browsers | brunobar79 | 2018-07-06 | 2 | -1/+39 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | package.json updated and tests passing | brunobar79 | 2018-07-04 | 2 | -0/+58 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | tests are passing | brunobar79 | 2018-07-04 | 2 | -39263/+30830 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-04 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | package-lock update | brunobar79 | 2018-07-04 | 1 | -27/+10 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | lint fix | brunobar79 | 2018-07-04 | 2 | -3/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 9 | -864/+13539 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 125 | -739/+710 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-07-03 | 4 | -9747/+6185 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-03 | 5 | -3655/+2782 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | move hardcoded strings to localization file | brunobar79 | 2018-07-03 | 2 | -17/+22 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | always open connect hardware in full screen mode | brunobar79 | 2018-07-03 | 1 | -1/+9 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | allow to open specific route in fullscreen mode | brunobar79 | 2018-07-03 | 1 | -2/+5 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix environment detection regex | brunobar79 | 2018-07-03 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | use latest eth-keyring-controller | brunobar79 | 2018-07-02 | 2 | -3/+4 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 95 | -7184/+8625 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | use latest eth-trezor-keyring | brunobar79 | 2018-06-26 | 2 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fixes | brunobar79 | 2018-06-23 | 3 | -6552/+6543 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | point to new version of eth-trezor-keyring | brunobar79 | 2018-06-23 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | clean up | Bruno | 2018-06-13 | 1 | -16/+19 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | fix merge conflicts | Bruno | 2018-06-13 | 12 | -125/+146 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of git://github.com/Metamask/metamask-extension into d... | Bruno | 2018-06-13 | 12 | -6576/+6595 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of https://github.com/brunobar79/metamask-extension in... | Bruno | 2018-06-13 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into develop | Bruno | 2018-06-06 | 67 | -317/+841 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into develop | Bruno | 2018-05-31 | 149 | -17174/+5990 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into develop | Bruno | 2018-05-17 | 97 | -3419/+8695 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrade eth-trezor-keyring | Bruno | 2018-06-13 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 6 | -1383/+53 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added support for signPersonalMessage | Bruno | 2018-06-13 | 1 | -28/+45 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up | Bruno | 2018-06-11 | 1 | -92/+21 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sign transactions is pretty close | Bruno | 2018-06-11 | 1 | -49/+77 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | balances working | Bruno | 2018-06-11 | 3 | -6/+22 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add account working | Bruno | 2018-06-11 | 2 | -8/+13 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up | Bruno | 2018-06-11 | 2 | -8/+15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial trezor support | Bruno | 2018-06-10 | 14 | -6478/+8369 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4656 from MetaMask/portal-metamask-ens-test | Dan Finlay | 2018-07-20 | 5 | -38/+48 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert package-lock changes | bitpshr | 2018-07-19 | 3 | -28311/+32814 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version Circle cache keys for easy flushing | bitpshr | 2018-07-19 | 1 | -13/+13 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update variable name | bitpshr | 2018-07-19 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pin @material-ui/core@1.2.0 to maintain React 15 compat | bitpshr | 2018-07-19 | 2 | -7/+15 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates for linting | bitpshr | 2018-07-19 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates | bitpshr | 2018-07-19 | 1 | -33/+37 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for .test Ropsten ENS domains | bitpshr | 2018-07-19 | 4 | -32802/+28297 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4833 from MetaMask/brave-flag-sentry | Jenny Pollack | 2018-07-19 | 2 | -4/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove local tests | Jenny Pollack | 2018-07-19 | 2 | -3/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sentry - add detection for Brave Browser | Jenny Pollack | 2018-07-19 | 2 | -4/+11 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4813 from MetaMask/no-inject-blueskybooking | Dan Finlay | 2018-07-19 | 1 | -0/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not inject on blueskybooking.com | Dan Finlay | 2018-07-17 | 1 | -0/+1 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-address | Whymarrh Whitby | 2018-07-19 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x in wallet | Whymarrh Whitby | 2018-07-18 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x in tx list | Whymarrh Whitby | 2018-07-18 | 1 | -2/+2 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4814 from whymarrh/send-data | Whymarrh Whitby | 2018-07-19 | 14 | -21/+150 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |