| Commit message (Expand) | Author | Age | Files | Lines |
* | Version 5.3.4 RC1v5.3.4 | Dan Finlay | 2019-02-01 | 2 | -1/+5 |
* | fix - migration 30 undefinds (#6079) | Frankie | 2019-02-01 | 1 | -16/+18 |
* | Merge pull request #6076 from MetaMask/Version-5.3.3 | Thomas Huang | 2019-01-31 | 2 | -1/+8 |
|\ |
|
| * | Version 5.3.3 RC1v5.3.3 | Dan Finlay | 2019-01-31 | 2 | -1/+8 |
|/ |
|
* | EIP-1102 updates (#6006) | Paul Bouchon | 2019-01-31 | 8 | -42/+49 |
* | Remove unused InitializeMenuScreen component (#6075) | Whymarrh Whitby | 2019-01-31 | 1 | -224/+0 |
* | Improved Spanish translations (#6072) | Pedro Gutiérrez | 2019-01-31 | 1 | -13/+13 |
* | Merge pull request #6074 from MetaMask/ui-codeowners | Whymarrh Whitby | 2019-01-30 | 1 | -1/+1 |
|\ |
|
| * | Update UI codeowners | Whymarrh Whitby | 2019-01-30 | 1 | -1/+1 |
|/ |
|
* | e2e: Use close instead of save for gas modal (#6066) | Thomas Huang | 2019-01-30 | 1 | -1/+2 |
* | Add visual indicator when displaying a cached balance (#5854) | Dan J Miller | 2019-01-30 | 22 | -31/+161 |
* | I#5956 fix2 dont overwrite existing rpc settings (#6044) | Frankie | 2019-01-30 | 7 | -9/+85 |
* | Version 5.3.2 RC1 (#6069) | Dan Finlay | 2019-01-29 | 2 | -1/+10 |
* | Merge pull request #6021 from MetaMask/i5943-shapeshift-tx | Dan J Miller | 2019-01-26 | 4 | -50/+1028 |
|\ |
|
| * | Fix bugs in e2e tests related to gas customization inputs. | Dan Miller | 2019-01-25 | 1 | -14/+17 |
| * | Add integration test for ordering of shapeshift txs in history list. | Dan Miller | 2019-01-25 | 2 | -8/+227 |
| * | Fix integration tests | Alexander Tseung | 2019-01-25 | 2 | -20/+756 |
| * | Order shapeshift transactions by time within the transactions list | Alexander Tseung | 2019-01-25 | 1 | -12/+32 |
* | | add source for header in create infura client (#6023) | Jenny Pollack | 2019-01-25 | 2 | -679/+266 |
|/ |
|
* | Prevent send to token warning (#6058) | Esteban Miño | 2019-01-24 | 28 | -15/+256 |
* | Refactor first time flow, remove seed phrase from state (#5994) | Alexander Tseung | 2019-01-23 | 114 | -3002/+2722 |
* | Updated Spanish translations (#6046) | oliver renwick | 2019-01-23 | 1 | -3/+577 |
* | Prevent send to token (#6051) | Esteban Miño | 2019-01-23 | 9 | -3/+66 |
* | fix asset detection (#6049) | Bruno Barbieri | 2019-01-23 | 3 | -7/+45 |
* | Use Parity on-chain registry only when is needed (#6052) | Esteban Miño | 2019-01-23 | 7 | -6/+61 |
* | Refactor BalanceComponent to jsx (#6048) | Alexander Tseung | 2019-01-21 | 6 | -250/+121 |
* | I#5956 fix 1 (#6026) | Frankie | 2019-01-18 | 5 | -1/+93 |
* | Fix grammar error in Current Conversion (#6029) | Alexander Tseung | 2019-01-17 | 2 | -3/+3 |
* | Merge pull request #6027 from MetaMask/Version-5.3.1 | Thomas Huang | 2019-01-17 | 2 | -1/+14 |
|\ |
|
| * | Merge branch 'develop' into Version-5.3.1v5.3.1 | Dan Finlay | 2019-01-17 | 1 | -18/+18 |
| |\ |
|
| * | | Version 5.3.1 RC2 | Dan Finlay | 2019-01-17 | 2 | -1/+14 |
* | | | Disable account dropdown on signing screens (#6024) | Alexander Tseung | 2019-01-17 | 5 | -85/+195 |
| |/
|/| |
|
* | | Skip drizzle tests unit issue with ci is determined (#5982) | Thomas Huang | 2019-01-17 | 1 | -18/+18 |
|/ |
|
* | Merge pull request #5966 from filips123/patch-1 | Thomas Huang | 2019-01-11 | 1 | -3/+180 |
|\ |
|
| * | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into... | Filip Š | 2019-01-10 | 17 | -278/+445 |
| |\ |
|
| * | | Update Slovenian translation | Filip Š | 2018-12-26 | 1 | -3/+180 |
* | | | Set auto conversion off for token/eth conversion (#6005) | Thomas Huang | 2019-01-11 | 1 | -1/+1 |
* | | | Fix confirm screen for sending ether tx with hex data (#6008) | Alexander Tseung | 2019-01-11 | 1 | -0/+6 |
| |/
|/| |
|
* | | Merge pull request #5999 from MetaMask/app-description | Thomas Huang | 2019-01-06 | 1 | -1/+1 |
|\ \ |
|
| * | | Refine app description | Dan Finlay | 2019-01-06 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #5997 from whymarrh/drizzle-script | Thomas Huang | 2019-01-05 | 1 | -9/+24 |
|\ \ |
|
| * | | Clean up drizzle test runner script | Whymarrh Whitby | 2019-01-04 | 1 | -10/+21 |
| * | | Revert "remove error flags from drizzle setup" | Whymarrh Whitby | 2019-01-04 | 1 | -0/+4 |
|/ / |
|
* | | Fix ERC20 token value decoding (#5995) | Hsuan Lee | 2019-01-04 | 1 | -1/+1 |
* | | Merge pull request #5970 from Wathis/develop | Vincent | 2019-01-04 | 1 | -6/+6 |
|\ \ |
|
| * | | Wrong french translation | Wathis | 2019-01-04 | 1 | -6/+6 |
|/ / |
|
* | | Fix Component#componentDidUpdate usage (#5977) | Bowen | 2019-01-04 | 1 | -3/+3 |
* | | Merge pull request #5987 from MetaMask/Version-5.3.0 | Thomas Huang | 2019-01-04 | 2 | -1/+10 |
|\ \ |
|
| * | | Version 5.3.0 RC1v5.3.0 | Dan Finlay | 2019-01-03 | 2 | -1/+10 |
* | | | Merge pull request #5992 from MetaMask/i5140-accounts | Thomas Huang | 2019-01-04 | 8 | -255/+398 |
|\ \ \ |
|
| * | | | Add scrolling button to account list | Alexander Tseung | 2019-01-04 | 8 | -255/+398 |
| |/ / |
|
* | | | Merge pull request #5989 from smiled0g/develop | Thomas Huang | 2019-01-04 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | fix typo in phishing.html title | Paul Chonpimai | 2019-01-03 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #5986 from MetaMask/fix-etherscan-again | Thomas Huang | 2019-01-03 | 1 | -1/+1 |
|\ \ |
|
| * | | fix extension link | brunobar79 | 2019-01-03 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #5978 from MetaMask/fix-etherscan-link-notifications | Bruno Barbieri | 2019-01-03 | 1 | -1/+1 |
|\ \ |
|
| * \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into fix-eth... | brunobar79 | 2019-01-03 | 1 | -3/+3 |
| |\ \
| |/ /
|/| | |
|
* | | | Merge pull request #5980 from MetaMask/fix-drizzle-tests | Thomas Huang | 2019-01-03 | 1 | -3/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | remove --unsafe-perm | Bruno Barbieri | 2019-01-03 | 1 | -1/+1 |
| * | | no globals | Bruno Barbieri | 2019-01-03 | 1 | -3/+3 |
| * | | Use sudo consistently | Bruno Barbieri | 2019-01-03 | 1 | -2/+2 |
| * | | --unsafe-perm ? | Bruno Barbieri | 2019-01-03 | 1 | -1/+1 |
| * | | Dont use sudo to install truffle | Bruno Barbieri | 2019-01-01 | 1 | -1/+1 |
|/ / |
|
| * | Fix etherscan links on notifications | Bruno Barbieri | 2018-12-29 | 1 | -1/+1 |
|/ |
|
* | Prevent users from changing the From field in the send screen (#5922) | Alexander Tseung | 2018-12-14 | 26 | -464/+1306 |
* | Fix displayed time and date in the activity log. Remove vreme library, add lu... | Alexander Tseung | 2018-12-14 | 7 | -205/+192 |
* | Disallow loading as metamaskNetworkId (#5924) | Frankie | 2018-12-14 | 2 | -3/+14 |
* | Merge pull request #5893 from MetaMask/loading-network-screen | Dan J Miller | 2018-12-14 | 15 | -38/+341 |
|\ |
|
| * | Clean up for the loading-network-screen | Dan Miller | 2018-12-13 | 4 | -33/+30 |
| * | Improve styling of loading retry / error screen | Dan Miller | 2018-12-13 | 1 | -0/+6 |
| * | Adds network loading retry / error screen. | Dan Miller | 2018-12-13 | 11 | -4/+268 |
| * | Add identifier of private network to the network loading screen message. | Dan Miller | 2018-12-13 | 4 | -7/+23 |
| * | Add spinner and dropdown arrow to network indicator on custom network loading. | Dan Miller | 2018-12-13 | 2 | -27/+47 |
* | | Merge pull request #5926 from MetaMask/Version-5.2.2 | Thomas Huang | 2018-12-13 | 2 | -1/+7 |
|\ \ |
|
| * | | Version 5.2.2 RC1v5.2.2 | Dan Finlay | 2018-12-13 | 2 | -1/+7 |
|/ / |
|
* | | Fix speed up button not showing for transactions with the lowest nonce (#5925) | Alexander Tseung | 2018-12-13 | 1 | -3/+3 |
* | | Merge pull request #5923 from MetaMask/phishing-text-link | Thomas Huang | 2018-12-13 | 1 | -2/+1 |
|\ \ |
|
| * | | Update the Phishing Warning notice text to not use inline URLs | Whymarrh Whitby | 2018-12-13 | 1 | -2/+1 |
| |/ |
|
* / | Make docs links consistent (#5920) | Dan Finlay | 2018-12-13 | 2 | -22/+14 |
|/ |
|
* | Merge pull request #5919 from MetaMask/gas-customization-fixes | Dan J Miller | 2018-12-13 | 10 | -26/+60 |
|\ |
|
| * | Show transaction fee instead of total fee in top left of gas customization mo... | Dan Miller | 2018-12-13 | 4 | -9/+9 |
| * | Fix width of gas customization model in notification view | Dan Miller | 2018-12-13 | 2 | -3/+4 |
| * | Add missing translation to the gas customization component. | Dan Miller | 2018-12-13 | 6 | -14/+47 |
* | | Version 5.2.1 RC1 (#5918)v5.2.1 | Dan J Miller | 2018-12-13 | 2 | -1/+5 |
|/ |
|
* | Merge pull request #5917 from MetaMask/correct-gas-limit-from-external-tx | Dan J Miller | 2018-12-12 | 6 | -11/+23 |
|\ |
|
| * | Ensures that advanced tab gas limit reflects tx gas limit | Dan Miller | 2018-12-12 | 6 | -11/+23 |
|/ |
|
* | Add submitDisabled prop to Modals. Disable submit button when creating a canc... | Alexander Tseung | 2018-12-12 | 4 | -2/+44 |
* | Merge pull request #5902 from MetaMask/i5846-ProviderCrashes | Thomas Huang | 2018-12-12 | 4 | -468/+1057 |
|\ |
|
| * | Merge pull request #5908 from MetaMask/i5846-ProviderCrashes-changelog | Thomas Huang | 2018-12-12 | 2 | -2/+9 |
| |\ |
|
| | * | Changelog and version bump for 5.2.0 | Dan Miller | 2018-12-12 | 2 | -2/+9 |
| |/ |
|
| * | Merge branch 'develop' into i5846-ProviderCrashes | Dan Finlay | 2018-12-11 | 15 | -68/+395 |
| |\ |
|
| * | | Bump package lock, mostly to https links | Dan Finlay | 2018-12-11 | 1 | -465/+1047 |
| * | | Bump json-rpc-engine to v4.0.0 | Dan Finlay | 2018-12-11 | 1 | -1/+1 |
* | | | Show Failed transaction in the browser notification for on-chain failures (#5... | Alexander Tseung | 2018-12-11 | 1 | -4/+7 |
| |/
|/| |
|
* | | Improve ux for low gas price set (#5862) | Dan J Miller | 2018-12-11 | 15 | -68/+395 |
|/ |
|
* | fix formatting of 32-byte strings in personal_sign (#5878) | Noah Zinsmeister | 2018-12-10 | 2 | -1/+2 |
* | Group transactions by nonce (#5886) | Alexander Tseung | 2018-12-10 | 47 | -373/+1208 |
* | Merge pull request #5892 from MetaMask/fix-net-version-race-condition | Thomas Huang | 2018-12-08 | 1 | -4/+10 |
|\ |
|
| * | Fix race condition in network controller lookup() method. | Dan Miller | 2018-12-07 | 1 | -4/+10 |
* | | Merge pull request #5890 from whymarrh/pl-i18n | Whymarrh Whitby | 2018-12-08 | 1 | -0/+9 |
|\ \ |
|
| * | | Fill in more Polish message translations | Whymarrh Whitby | 2018-12-06 | 1 | -0/+9 |
* | | | Merge pull request #5891 from whymarrh/npm-audit | Whymarrh Whitby | 2018-12-07 | 5 | -2552/+2542 |
|\ \ \
| |/ /
|/| | |
|
| * | | Deduplicate package.json file | Whymarrh Whitby | 2018-12-07 | 2 | -322/+1042 |
| * | | Update ganache-core to mitigate vuln | Whymarrh Whitby | 2018-12-07 | 2 | -1262/+1092 |
| * | | npm uninstall open | Whymarrh Whitby | 2018-12-07 | 2 | -7/+0 |
| * | | Remove beefy dependency and its usages | Whymarrh Whitby | 2018-12-07 | 3 | -504/+14 |
| * | | circleci: Replace nsp with npm audit | Whymarrh Whitby | 2018-12-07 | 4 | -579/+253 |
| * | | npm audit fix | Whymarrh Whitby | 2018-12-06 | 2 | -452/+392 |
| * | | circleci: Disable npm audit when installing packages | Whymarrh Whitby | 2018-12-06 | 1 | -1/+1 |
| * | | Update lockfile to fix errors | Whymarrh Whitby | 2018-12-06 | 1 | -11/+334 |
|/ / |
|
* | | Merge pull request #5882 from whymarrh/fix-main-container-wrapper-height | Whymarrh Whitby | 2018-12-06 | 1 | -1/+2 |
|\ \
| |/
|/| |
|
| * | Replace height: 100% rule with workaround for flexbox quirks | Whymarrh Whitby | 2018-12-06 | 1 | -1/+2 |
|/ |
|
* | Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-d | Dan J Miller | 2018-12-05 | 104 | -264/+7147 |
|\ |
|
| * | Fix styling of send screen in extension view when hex data on. | Dan Miller | 2018-12-04 | 4 | -12/+17 |
| * | Final gas customization fixes | Dan Miller | 2018-12-04 | 18 | -104/+198 |
| * | Clear custom gas data on hiding of gas customization modal. | Dan Miller | 2018-12-04 | 1 | -4/+12 |
| * | Modify results of API data to better fit gas chart: remove outliers, pad data | Dan Miller | 2018-12-04 | 5 | -44/+126 |
| * | Add loading spinners when waiting for APIs in the gas customization modal | Dan Miller | 2018-12-04 | 9 | -6/+61 |
| * | Uses more reliable api on main send screen; caches basic api results in modal | Dan Miller | 2018-12-04 | 21 | -140/+309 |
| * | Fix "fastest" translation message; change to sentence case | Dan Miller | 2018-12-04 | 1 | -1/+1 |
| * | Improve responsiveness of customize speed up slider. | Dan Miller | 2018-12-04 | 3 | -6/+76 |
| * | Make gas customization modal responsive. | Dan Miller | 2018-12-04 | 7 | -1/+32 |
| * | Add c3 and d3 to the separate dependencies bundle. | Dan Miller | 2018-12-04 | 1 | -0/+2 |
| * | Add gas data to integration test json data set. | Dan Miller | 2018-12-04 | 3 | -3/+633 |
| * | Remove gas customization integration tests (in favour of e2e tests) | Dan Miller | 2018-12-04 | 3 | -36/+317 |
| * | Fixes for components that break e2e gas customization tests, plus unit test u... | Dan Miller | 2018-12-04 | 9 | -21/+102 |
| * | Update e2e tests for new gas customization modal. | Dan Miller | 2018-12-04 | 5 | -21/+62 |
| * | Connect gas price chart to gas station api. | Dan Miller | 2018-12-04 | 3 | -41/+204 |
| * | Adds speed up slide-in gas customization sidebar | Dan Miller | 2018-12-04 | 19 | -58/+306 |
| * | Adds createSpeedUpTransaction to txController | Dan Miller | 2018-12-04 | 3 | -0/+97 |
| * | Redesign of gas customization basic tab. | Dan Miller | 2018-12-04 | 8 | -10/+134 |
| * | Clean up for mmui-i11-custom-gas-price-chart branch | Dan Miller | 2018-12-04 | 4 | -33/+25 |
| * | Improve data management and tests for gas-modal-page-container price estimates. | Dan Miller | 2018-12-04 | 4 | -20/+67 |
| * | Update tests, plus some lint fixes, for gas-price-chart | Dan Miller | 2018-12-04 | 3 | -53/+204 |
| * | Clean up gas chart code. | Dan Miller | 2018-12-04 | 3 | -362/+373 |
| * | Add control arrows to advanced gas tab inputs. | Dan Miller | 2018-12-04 | 3 | -1/+63 |
| * | Complete integration of gas chart with redux. | Dan Miller | 2018-12-04 | 9 | -14/+148 |
| * | Read only connection of gas price chart to redux | Dan Miller | 2018-12-04 | 13 | -28/+245 |
| * | Gas price chart improvements, redesign, bug fixes, and set up to receive exte... | Dan Miller | 2018-12-04 | 5 | -88/+300 |
| * | Adds not yet functional gas price chart. | Dan Miller | 2018-12-04 | 11 | -20/+290 |
| * | Lint and unit test fixes. | Dan Miller | 2018-12-04 | 3 | -5/+4 |
| * | Clean up for advanced gas tab customization changes. | Dan Miller | 2018-12-04 | 3 | -19/+16 |
| * | Adds redesign for the customize gas advanced tab. | Dan Miller | 2018-12-04 | 19 | -152/+332 |
| * | Test updates and additions for button integration with send screen. | Dan Miller | 2018-12-04 | 19 | -64/+465 |
| * | Integrate gas buttons with the send screen. | Dan Miller | 2018-12-04 | 14 | -41/+301 |
| * | Connects remained of the gas customization component to redux. | Dan Miller | 2018-12-04 | 22 | -194/+497 |
| * | Adds gas-duck.test.js tests. | Dan Miller | 2018-12-04 | 1 | -0/+300 |
| * | Styling fixes for gas customization advanced tab content. | Dan Miller | 2018-12-04 | 4 | -3/+2 |
| * | Improvements to propdefaults in button-group.component and basic-tab-content.... | Dan Miller | 2018-12-04 | 2 | -2/+3 |
| * | Connect the gas-button-group component to redux and a live api. | Dan Miller | 2018-12-04 | 15 | -111/+573 |
| * | Adds basic tab content to gas customizer, with styled button group (static, f... | Dan Miller | 2018-12-04 | 16 | -15/+615 |
| * | Improve styling of advanced-tab-content gasInput row | Dan Miller | 2018-12-04 | 3 | -5/+11 |
| * | Add tests for advanced-tab-component.js and subcomponents. | Dan Miller | 2018-12-04 | 5 | -18/+282 |
| * | Remove gas slider from advance-tab-content.component | Dan Miller | 2018-12-04 | 3 | -19/+2 |
| * | Split advanced-tab-content.component.js render() method into smaller pieces;... | Dan Miller | 2018-12-04 | 3 | -31/+63 |
| * | Adds the content of the advanced tab - w/o chart or dynamic content - to gas ... | Dan Miller | 2018-12-04 | 21 | -63/+538 |
| * | Use BEM for css in gas-modal-page-container | Dan Miller | 2018-12-04 | 3 | -26/+28 |
| * | Use correct message key in gas-modal-page-container.component.js | Dan Miller | 2018-12-04 | 1 | -1/+1 |
| * | Adds new gas customization modal container (without content) | Dan Miller | 2018-12-04 | 11 | -29/+371 |
|/ |
|
* | Merge pull request #5876 from MetaMask/Version-5.1.0v5.1.0 | Thomas Huang | 2018-12-04 | 2 | -1/+8 |
|\ |
|
| * | Version 5.1.0: East Bay | Dan Finlay | 2018-12-04 | 2 | -1/+8 |
|/ |
|
* | Merge pull request #5875 from MetaMask/UpdatePhishingWarning | Thomas Huang | 2018-12-04 | 1 | -5/+4 |
|\ |
|
| * | Update phishing warning copy | Dan Finlay | 2018-12-04 | 1 | -5/+4 |
* | | Add docs link (#5870) | Dan Finlay | 2018-12-04 | 1 | -1/+3 |
|/ |
|
* | Hide link for phishing-detect page (#5864) | Michael - Blurpesec | 2018-12-02 | 1 | -1/+1 |
* | Merge pull request #5865 from MetaMask/mmc-fix | Bruno Barbieri | 2018-12-01 | 1 | -1/+0 |
|\ |
|
| * | fix visibility | Bruno Barbieri | 2018-12-01 | 1 | -1/+0 |
|/ |
|
* | Save recent network balances in local storage (#5843) | Dan J Miller | 2018-12-01 | 15 | -28/+290 |
* | bugfix: normalize contract addresss when fetching exchange rates (#5863) | Paul Bouchon | 2018-12-01 | 1 | -1/+3 |
* | Fixed Vivek's bug (#5860) | Dan Finlay | 2018-11-30 | 1 | -2/+10 |
* | Version 5.0.4 RC1 (#5859)v5.0.4 | Dan Finlay | 2018-11-30 | 2 | -2/+24 |
* | transactions/tx-gas-utils - add the acctual response for eth_getCode for NO_C... | Frankie | 2018-11-30 | 1 | -0/+9 |
* | Merge pull request #5848 from MetaMask/Less-Certain-Language | Whymarrh Whitby | 2018-11-29 | 1 | -1/+1 |
|\ |
|
| * | Soften accusatory language on phishing warning | Dan Finlay | 2018-11-29 | 1 | -1/+1 |
* | | Merge pull request #5835 from MetaMask/revert-5412-after-install-steps | Whymarrh Whitby | 2018-11-27 | 5 | -9/+53 |
|\ \
| |/
|/| |
|
| * | Update e2e tests to handle any post-install window creation | Whymarrh Whitby | 2018-11-27 | 3 | -9/+38 |
| * | Add JSDoc to closeAllWindowHandlesExcept e2e helper fn | Whymarrh Whitby | 2018-11-27 | 1 | -0/+7 |
| * | Open full-screen UI on install | Whymarrh Whitby | 2018-11-27 | 1 | -5/+4 |
| * | Revert "Don't open MetaMask website after install" | Whymarrh Whitby | 2018-11-27 | 1 | -0/+9 |
|/ |
|
* | Pin two module versions to avoid flatmap-stream hack (#5839) | Dan Finlay | 2018-11-27 | 1 | -2/+2 |
* | Hide app-header when provider request pending (#5831) | Whymarrh Whitby | 2018-11-27 | 2 | -5/+19 |
* | Autofill gasPrice for retry attempts with either the recommended gasprice or ... | Frankie | 2018-11-27 | 2 | -1/+13 |
* | transactions - ensure err is defined when setting tx failed (#5801) | Frankie | 2018-11-27 | 1 | -4/+6 |
* | Merge pull request #5792 from MetaMask/signed-type-data-error-hw-wallet | Bruno Barbieri | 2018-11-27 | 1 | -9/+16 |
|\ |
|
| * | Use Array.includes | Bruno Barbieri | 2018-11-27 | 1 | -4/+4 |
| * | remove extra semicolon | brunobar79 | 2018-11-21 | 1 | -1/+1 |
| * | consider hw wallets | brunobar79 | 2018-11-21 | 1 | -9/+16 |
* | | Show disabled cursor in .network-disabled state (#5829) | Whymarrh Whitby | 2018-11-27 | 1 | -1/+1 |
* | | Trim whitespace from seed phrase during import (#5827) | Whymarrh Whitby | 2018-11-27 | 1 | -2/+4 |
* | | Merge pull request #5832 from whymarrh/connect-request-notifs | Whymarrh Whitby | 2018-11-27 | 2 | -4/+8 |
|\ \ |
|
| * | | Show Connect Requests count in extension badge | Whymarrh Whitby | 2018-11-26 | 1 | -1/+3 |
| * | | Use initState to avoid type-checking providerRequests in state | Whymarrh Whitby | 2018-11-26 | 1 | -3/+5 |
|/ / |
|
* | | Merge pull request #5816 from MetaMask/issue-5815 | Thomas Huang | 2018-11-25 | 21 | -44/+44 |
|\ \ |
|
| * | | Increase Token Symbol length to twelve | Thomas Huang | 2018-11-23 | 21 | -44/+44 |
* | | | change wording of phishing notice, due to EIP 1102 (#5819) | Christopher Elwell | 2018-11-24 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #5810 from whymarrh/bump-nvmrc | Whymarrh Whitby | 2018-11-22 | 2 | -9/+10 |
|\ \ |
|
| * | | Update local build instructions | Whymarrh Whitby | 2018-11-22 | 1 | -8/+9 |
| * | | nvm: Bump Node version to 8.13 | Whymarrh Whitby | 2018-11-22 | 1 | -1/+1 |
* | | | Merge pull request #5797 from MetaMask/trezor-v6 | Bruno Barbieri | 2018-11-22 | 12 | -45/+167 |
|\ \ \
| |/ /
|/| | |
|
| * | | bump eth-trezor-keyring | brunobar79 | 2018-11-22 | 2 | -7288/+7352 |
| * | | update package-lock | brunobar79 | 2018-11-21 | 1 | -7313/+7277 |
| * | | trezor v6 | brunobar79 | 2018-11-21 | 3 | -7419/+7441 |
| * | | fix merge conflicts | brunobar79 | 2018-11-21 | 72 | -8609/+8076 |
| |\ \ |
|
| * | | | clean up | brunobar79 | 2018-11-15 | 2 | -3/+2 |
| * | | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezo... | brunobar79 | 2018-11-15 | 2 | -8/+19 |
| |\ \ \ |
|
| | * | | | test | brunobar79 | 2018-11-15 | 1 | -4/+0 |
| | * | | | test | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | * | | | test | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | * | | | try with custom box | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | * | | | package-lock.json | brunobar79 | 2018-11-15 | 1 | -20/+41 |
| * | | | | update package-lock.json | brunobar79 | 2018-11-15 | 1 | -17/+27 |
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 7 | -10/+45 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 3 | -1/+40 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'develop' into trezor-v5 | brunobar79 | 2018-11-14 | 46 | -479/+4603 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-11-07 | 191 | -3748/+6145 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-10-21 | 104 | -8896/+12489 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | fix conflicts | brunobar79 | 2018-10-17 | 298 | -12054/+28334 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -95/+167 |
| * | | | | | | | | | fix merge conflicts | brunobar79 | 2018-09-11 | 4 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -49/+126 |
| * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 173 | -2562/+4615 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | add port names blacklist | brunobar79 | 2018-08-23 | 1 | -0/+8 |
| * | | | | | | | | | | | handle onDisconnect | brunobar79 | 2018-08-23 | 1 | -0/+4 |
| * | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-23 | 11 | -5776/+1605 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | update package-lock | brunobar79 | 2018-08-22 | 1 | -6/+14 |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-08-22 |