| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #4895 from MetaMask/fix-confirm | Alexander Tseung | 2018-07-28 | 4 | -6/+30 |
| |\ | | | | | Add rounding to large exponential numbers. Fix overflows | ||||
| | * | 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 |
| |\ \ | | | | | | | EIP-712: deprecation message | ||||
| | * | | Add deprecation message for eth_signTypedData | bitpshr | 2018-07-28 | 2 | -6/+20 |
| | | | | |||||
| * | | | Merge pull request #4893 from kelvintyb/develop | Thomas Huang | 2018-07-28 | 4 | -3/+65 |
| |\ \ \ | |/ / |/| | | Move phishing warning to the extension | ||||
| | * | | 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 | ||||
| | * | | 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 on our language list | ||||
| | * | | Update Chinese naming | Kevin Serrano | 2018-07-24 | 1 | -2/+2 |
| | | | | | | | | | | I sincerely hope this is a non-controversial change. | ||||
| * | | | Merge pull request #4802 from 03-26/develop | kumavis | 2018-07-27 | 1 | -4/+29 |
| |\ \ \ | |_|/ |/| | | Update translation 🇯🇵 | ||||
| | * | | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | Only show retry button on the earliest pending tx | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add tests for Confirm Detail Row | ||||
| | * | | | | | | 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 | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | add current release to the README | ||||
| | * | | | | | | | | 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 | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Do not inject on ani.gamer.com.tw | ||||
| | * \ \ \ \ \ \ | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #4799 | ||||
| * | | | | | | | | | Merge pull request #4820 from MetaMask/codeowners | William Morriss | 2018-07-25 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added codeowners file | ||||
| | * | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | Add ButtonGroup component | ||||
| | * | | | | | | | | | 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 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | network.js: convert rpc protocol to lower case (#4855) | pinkiebell | 2018-07-25 | 2 | -0/+4 |
| | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | Fixes #4253 | ||||
| * | | | | | | | | | Merge pull request #4865 from MetaMask/i4829-close-notifications-from-ui | Alexander Tseung | 2018-07-25 | 7 | -18/+111 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Close notifications from UI actions | ||||
| | * | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple send. | ||||
| | * | | | | | | | | | 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 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-alert | Dan Finlay | 2018-07-24 | 1 | -4/+11 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix trezor "Hardware wallet connected" alert | ||||
| | * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix Banner flash on load | ||||
| | * | | | | | | | | | 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 | ||||
| | * | | | | | | | | 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 token amount | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Enforce usage of node 8.11.3 and npm 6.1.0 | ||||
| | * | | | | | | 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 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Detect token feature | ||||
| | * | | | | | 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 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Transaction notifications | ||||
| | * \ \ \ \ \ | 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 | ||||
| | * | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-link | Dan Finlay | 2018-07-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix link to TREZOR emulator docs in README | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Initial trezor support | ||||
| | * | | | | | | 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 ↵ | brunobar79 | 2018-07-18 | 5 | -33/+47 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | * | | | | | | | 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 ↵ | brunobar79 | 2018-07-14 | 8 | -67/+49 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | * | | | | | | | | | 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 ↵ | brunobar79 | 2018-07-13 | 134 | -814/+5293 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | * | | | | | | | | | | 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 ↵ | brunobar79 | 2018-07-07 | 60 | -275/+1091 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| | * | | | | | | | | | | | 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 ↵ | Bruno | 2018-06-13 | 12 | -6576/+6595 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of https://github.com/brunobar79/metamask-extension ↵ | Bruno | 2018-06-13 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for .test ENS domains | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | sentry - add detection for Brave Browser | ||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | Do not inject on blueskybooking.com | Dan Finlay | 2018-07-17 | 1 | -0/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per zendesk 2312. | ||||
| * | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Add hex data input to send screen | ||||
| | * | | | | | | | | | | | | | | | | | | | Don't set txData to an empty string | Whymarrh Whitby | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Inline single-use vars in send-footer.utils | Whymarrh Whitby | 2018-07-18 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Send data along with other tx params | Whymarrh Whitby | 2018-07-18 | 7 | -16/+66 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Hook up send component w/ UPDATE_SEND_HEX_DATA action | Whymarrh Whitby | 2018-07-18 | 3 | -5/+28 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Add updateSendHexData action | Whymarrh Whitby | 2018-07-18 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Add hex data row to send screen | Whymarrh Whitby | 2018-07-18 | 5 | -2/+43 |
| |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4800 from MetaMask/i4785-confirm-screen-fixes | Alexander Tseung | 2018-07-18 | 26 | -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 Tseung | 2018-07-18 | 3 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message | ||||
| | * | | | | | | | | | | | | | | | | | | Merge develop | Alexander Tseung | 2018-07-18 | 3 | -1746/+0 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fix tests | Alexander Tseung | 2018-07-18 | 4 | -76/+13 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵ | Alexander Tseung | 2018-07-18 | 17 | -104/+322 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates | ||||
| | * | | | | | | | | | | | | | | | | | | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 4 | -299/+23 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retry | Alexander Tseung | 2018-07-18 | 3 | -22/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | ||||
| | * | | | | | | | | | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | Alexander Tseung | 2018-07-17 | 3 | -22/+16 |
| | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4777 from MetaMask/i4661-currencyConversionBug | Whymarrh Whitby | 2018-07-18 | 2 | -11/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Fixes conversion status for tokens without conversion rates (#4661) | ||||
| | * | | | | | | | | | | | | | | | | | lint fix | Sara Reynolds | 2018-07-17 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix edge cases and add translation compatibility | Sara Reynolds | 2018-07-17 | 2 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Update onlyRenderConversions function to method and account for edge cases | Sara Reynolds | 2018-07-17 | 1 | -26/+24 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fixes conversion status for tokens without conversion rates | Sara Reynolds | 2018-07-17 | 1 | -14/+29 |
| |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #4621 from MetaMask/one-send-directory | Whymarrh Whitby | 2018-07-17 | 129 | -55/+173 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 'send_/' directory; revert to just having send | ||||
| | * | | | | | | | | | | | | | | | | | Fix send import paths in confirm tx components | Whymarrh Whitby | 2018-07-16 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix send import path in customize gas modal | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix send import path in ToAutoComplete | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix lint warnings in the send/ directory. | Dan | 2018-07-16 | 4 | -32/+28 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Remove send_ directory, revert to just having send | Dan | 2018-07-16 | 124 | -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-link | Whymarrh Whitby | 2018-07-16 | 5 | -6/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | fix tos link | ||||
| | * | | | | | | | | | | | | | | | | fix tos link; | Bobby Dresser | 2018-07-13 | 5 | -6/+5 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocomplete | Dan J Miller | 2018-07-14 | 3 | -121/+142 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #4664 | ||||
| | * | | | | | | | | | | | | | | | | | fix classname | TrejGun | 2018-07-05 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into to-autocomplete | Анна | 2018-07-05 | 157 | -33248/+33516 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | fixes #4664 | trejgun | 2018-07-03 | 3 | -121/+139 |
| | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypes | Dan J Miller | 2018-07-14 | 14 | -60/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | convert contextType to static prop for refactored components | ||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into contextTypes | TrejGun | 2018-07-05 | 157 | -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 components | trejgun | 2018-07-05 | 14 | -60/+57 |
| | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #4787 from MetaMask/stop-inject-harbourair | Thomas Huang | 2018-07-13 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Add harbourair.com to injection block list | ||||
| | * | | | | | | | | | | | | | | | | Add harbourair.com to injection block list | Dan Finlay | 2018-07-13 | 1 | -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/removeNonceTrackerFunction | Thomas Huang | 2018-07-13 | 1 | -13/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unsued nonce tracker function | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into removeNonceTrackerFunction | Thomas | 2018-07-11 | 214 | -33189/+34938 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Remove unsued nonce tracker function | tmashuang | 2018-06-26 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4766 from whymarrh/null-translations | Whymarrh Whitby | 2018-07-13 | 4 | -41/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework i18n-helper getMessage function | ||||
| | * | | | | | | | | | | | | | | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 2 | -28/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fallback to English and then the key for I18nProvider#t | Whymarrh Whitby | 2018-07-12 | 2 | -11/+16 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Inline locale variable in fetchLocale fn | Whymarrh Whitby | 2018-07-12 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4779 from whymarrh/tx-view-tooltips | Whymarrh Whitby | 2018-07-13 | 2 | -13/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | Add Tooltips to Balance View in Extension | ||||
| | * | | | | | | | | | | | | | | | | | | Add tooltip to new tab icon in tx-view | Whymarrh Whitby | 2018-07-12 | 2 | -4/+11 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Add tooltip to menu icon in tx-view | Whymarrh Whitby | 2018-07-12 | 2 | -9/+19 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 125 | -775/+5145 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Refactor and redesign confirm transaction views | ||||
| | * | | | | | | | | | | | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵ | Alexander Tseung | 2018-07-12 | 4 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data | ||||
| | * | | | | | | | | | | | | | | | | | Merge pull request #4764 from MetaMask/i4404-confirm-refactor-with-e2e-upgrades | Dan J Miller | 2018-07-12 | 15 | -154/+585 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2e beta test upgrades for confirm refactor | ||||
| | | * | | | | | | | | | | | | | | | | | Wait for an element with a .tx-list-pending-item-container to be rendered ↵ | Dan | 2018-07-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before attempting to select the tx-list-item. (e2e beta tests) | ||||
| | | * | | | | | | | | | | | | | | | | | Reattempt to find network selector; wait for network selector dropdown to ↵ | Dan | 2018-07-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contain localhost before attempting to click. (e2e beta tests) | ||||
| | | * | | | | | | | | | | | | | | | | | Wait for submitted tx list item amounts to match the expected before ↵ | Dan | 2018-07-12 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicking through. (e2e beta tests) | ||||
| | | * | | | | | | | | | | | | | | | | | Fix bug in test mock signature request methods. | Dan | 2018-07-12 | 5 | -3/+42 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Fix send integration tests for compatability with confirm refactor. | Dan | 2018-07-11 | 4 | -7/+61 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Fix signature request tests for compatability with confirm refactor. | Dan | 2018-07-11 | 2 | -12/+37 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Update e2e beta tests to cover confirm refactor changes. | Dan | 2018-07-11 | 3 | -4/+155 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Fix existing e2e tests | Dan | 2018-07-11 | 1 | -11/+26 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | Handles window indeterminancy issues for external dapps in e2e beta tests. | Dan | 2018-07-11 | 4 | -114/+255 |
| | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | Fix multiple signature requests showing an infinite spinner | Alexander Tseung | 2018-07-11 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Add unit tests for confirmTransaction duck and util | Alexander Tseung | 2018-07-10 | 2 | -0/+812 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 4 | -71/+70 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 16 | -23515/+335 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 12 | -36/+20002 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 4 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 9 | -117/+185 |
| | | | | | | | | | | | | | | | | | | | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |