Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 4.12.0 | Dan Finlay | 2018-09-28 | 2 | -2/+6 |
* | Merge remote-tracking branch 'origin/master' into Version-4.12.0 | Dan Finlay | 2018-09-28 | 3 | -5/+38 |
|\ | |||||
| * | Merge pull request #5349 from MetaMask/v4.11.1 | Kevin Serrano | 2018-09-26 | 2 | -6505/+6523 |
| |\ | |||||
| | * | remove comment about etherdelta | bobby dresser | 2018-09-26 | 1 | -1/+0 |
| | * | Version 4.11.1 | Dan Finlay | 2018-09-26 | 2 | -6505/+6524 |
| |/ | |||||
| * | Merge pull request #5346 from MetaMask/v4.11.1 | Dan Finlay | 2018-09-26 | 19 | -6626/+6956 |
| |\ | |||||
| | * | update package-lock.json | brunobar79 | 2018-09-26 | 1 | -6450/+6442 |
| | * | Merge branch 'master' into v4.11.1 | Bruno Barbieri | 2018-09-25 | 2 | -1/+5 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #5313 from MetaMask/Version-4.11.0v4.11.0 | Thomas Huang | 2018-09-25 | 2 | -2/+6 |
| |\ \ | |||||
| | * | | Version 4.11.0 | Dan Finlay | 2018-09-22 | 2 | -2/+6 |
| * | | | Merge pull request #5079 from MetaMask/v4.9.3 | kumavis | 2018-08-17 | 53 | -76/+774 |
| |\| | | |||||
| | | * | bump to v4.11.1 | brunobar79 | 2018-09-25 | 1 | -1/+1 |
| | | * | Merge pull request #5084 from MetaMask/ledger-support-without-provider | Dan Finlay | 2018-08-21 | 18 | -194/+532 |
| | |/| | |||||
* | | | | Update extension badge with correct signTypedData count | Whymarrh Whitby | 2018-09-27 | 1 | -0/+1 |
* | | | | fix tld bug (#5250) | Phyrex Tsai | 2018-09-27 | 1 | -0/+2 |
* | | | | Merge pull request #5053 from hahnmichaelf/esdb-support | Thomas Huang | 2018-09-27 | 4 | -3/+10 |
|\ \ \ \ | |||||
| * | | | | additional lint-test fix | hahnmichaelf | 2018-08-14 | 1 | -1/+1 |
| * | | | | fix for lint-test | hahnmichaelf | 2018-08-14 | 3 | -4/+4 |
| * | | | | fixed names | hahnmichaelf | 2018-08-14 | 2 | -2/+2 |
| * | | | | Re-added GA script | hahnmichaelf | 2018-08-14 | 2 | -1/+20 |
| * | | | | change name | hahnmichaelf | 2018-08-14 | 2 | -1/+1 |
| * | | | | base - working. fixes #4774 | hahnmichaelf | 2018-08-13 | 4 | -21/+9 |
* | | | | | Close transaction details modal when clicking speed up | Alexander Tseung | 2018-09-27 | 2 | -4/+10 |
* | | | | | Merge pull request #5367 from dasilvarosa/patch-1 | Whymarrh Whitby | 2018-09-27 | 1 | -1/+33 |
|\ \ \ \ \ | |||||
| * | | | | | Update ledger-logo.svg | David da Silva Rosa | 2018-09-26 | 1 | -1/+33 |
* | | | | | | bugfix: bump version of inpage provider | bitpshr | 2018-09-27 | 2 | -27/+5 |
* | | | | | | EIP-1102: Add deprecation message (#5353) | Paul Bouchon | 2018-09-26 | 2 | -6/+6 |
* | | | | | | Merge pull request #5368 from MetaMask/bugfix-sign-typed-data | kumavis | 2018-09-26 | 2 | -178/+164 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | bugfix: update eth_signTypedData_v3 parameter order | bitpshr | 2018-09-26 | 2 | -178/+164 |
|/ / / / / | |||||
* | | | | | deps - eth-block-tracker@4.0.2 for safe-eventemitter (#5363) | kumavis | 2018-09-26 | 2 | -44/+17 |
* | | | | | Merge pull request #5332 from MetaMask/ui-unit-tests | Thomas Huang | 2018-09-26 | 18 | -24/+2123 |
|\ \ \ \ \ | |||||
| * | | | | | Some Ui tests | tmashuang | 2018-09-25 | 18 | -24/+2123 |
* | | | | | | Bugfix: Upgrade json-rpc-engine (#5348) | Paul Bouchon | 2018-09-26 | 3 | -31/+246 |
* | | | | | | Merge pull request #5361 from MetaMask/firefox-fixes | kumavis | 2018-09-26 | 4 | -61/+2681 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add mozilla lint job | brunobar79 | 2018-09-26 | 3 | -29/+27 |
| * | | | | | | remove css sourcemaps in prod builds | brunobar79 | 2018-09-26 | 1 | -1/+9 |
| * | | | | | | Add build step to mozilla-lint | Dan Finlay | 2018-09-26 | 1 | -3/+3 |
| * | | | | | | Add mozilla linter to dist script instead of main test | Dan Finlay | 2018-09-26 | 1 | -2/+2 |
| * | | | | | | Add mozilla addon linter to test suite | Dan Finlay | 2018-09-26 | 2 | -58/+2672 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5351 from MetaMask/fix-gh-pages-job | Bruno Barbieri | 2018-09-26 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix gh-pages job | Bruno Barbieri | 2018-09-26 | 1 | -2/+2 |
* | | | | | | | Fix MetaMask web3 version (#5352) | Esteban MiƱo | 2018-09-26 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5340 from whymarrh/fix-first-time-flow-2 | Whymarrh Whitby | 2018-09-25 | 1 | -1/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix height of first-time-flow container, again but different | Whymarrh Whitby | 2018-09-25 | 1 | -1/+6 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5337 from whymarrh/eslint-ignore-coverage | Whymarrh Whitby | 2018-09-25 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | eslintignore: Add test coverage dir to eslintignore | Whymarrh Whitby | 2018-09-25 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #5282 from MetaMask/tx-cancel-ui | Alexander Tseung | 2018-09-25 | 69 | -372/+1218 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa... | Alexander Tseung | 2018-09-21 | 10 | -58/+41 |
| * | | | | | | Add unit tests | Alexander Tseung | 2018-09-20 | 9 | -15/+342 |
| * | | | | | | Fix integration tests | Alexander Tseung | 2018-09-20 | 1 | -1/+1 |
| * | | | | | | Fix unit tests | Alexander Tseung | 2018-09-20 | 1 | -5/+4 |
| * | | | | | | Add transition effect to TransactionListItemDetails expander | Alexander Tseung | 2018-09-20 | 2 | -13/+29 |
| * | | | | | | Add TransactionDetails modal | Alexander Tseung | 2018-09-20 | 10 | -9/+125 |
| * | | | | | | Switch existing modals from using Notification to Modal. Remove Notification ... | Alexander Tseung | 2018-09-20 | 38 | -323/+518 |
| * | | | | | | Add withModalProps HOC | Alexander Tseung | 2018-09-20 | 2 | -0/+22 |
| * | | | | | | Fix Transaction view styles | Alexander Tseung | 2018-09-20 | 3 | -3/+9 |
| * | | | | | | Add Modal component | Alexander Tseung | 2018-09-20 | 7 | -0/+186 |
| * | | | | | | Refactor ConfirmPageContainerError to ErrorMessage | Alexander Tseung | 2018-09-20 | 8 | -18/+14 |
* | | | | | | | Merge pull request #5328 from whymarrh/fix-first-time-flow | Whymarrh Whitby | 2018-09-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix height of first-time-flow container | Whymarrh Whitby | 2018-09-24 | 1 | -0/+1 |
* | | | | | | | Merge pull request #5310 from MetaMask/getPendingNonce-hotfix | Thomas Huang | 2018-09-24 | 2 | -1/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Adds getPendingNonce method to provider initialization options in metamask-co... | Dan Miller | 2018-09-22 | 2 | -1/+15 |
* | | | | | | | Merge pull request #5241 from MetaMask/refactor-settings | Alexander Tseung | 2018-09-21 | 18 | -810/+814 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix translation casing | Alexander Tseung | 2018-09-21 | 2 | -6/+2 |
| * | | | | | | Add Current Conversion Updated string to translations | Alexander Tseung | 2018-09-20 | 2 | -1/+4 |
| * | | | | | | Refactor settings page to use JSX and follow component file folder structure | Alexander Tseung | 2018-09-20 | 18 | -810/+815 |
| |/ / / / / | |||||
* | | | | | | Remove EAL google analytics link. (#5081) | Dan Finlay | 2018-09-20 | 1 | -1/+1 |
* | | | | | | Update messages.json (#5280) | Kevin Serrano | 2018-09-20 | 1 | -0/+9 |
* | | | | | | Merge pull request #5298 from whymarrh/fix-tx-spinner | Whymarrh Whitby | 2018-09-20 | 5 | -24/+23 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Move main-container wrapper div into its own class | Whymarrh Whitby | 2018-09-20 | 4 | -2/+13 |
| * | | | | | Prevent loading screen from overlaying the app bar | Whymarrh Whitby | 2018-09-20 | 3 | -7/+11 |
| * | | | | | Make the LoadingScreen component 100% as tall as its container | Whymarrh Whitby | 2018-09-20 | 1 | -10/+1 |
| * | | | | | Remove unused loading-overlay--full-screen CSS styles | Whymarrh Whitby | 2018-09-20 | 1 | -7/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #5290 from MetaMask/i5289-gettokendata | Dan Finlay | 2018-09-19 | 2 | -2/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Fix exception thrown on getTokenData | Alexander Tseung | 2018-09-19 | 2 | -2/+24 |
|/ / / / / | |||||
* | | | | | Merge pull request #5268 from lastblocklabs/issue-5231v4.10.0 | Dan Finlay | 2018-09-18 | 1 | -3/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Improvement: Allow enter to submit password form | Sean Rabaut | 2018-09-15 | 1 | -3/+5 |
* | | | | | | Merge pull request #5281 from MetaMask/4.10.0 | Dan Finlay | 2018-09-18 | 2 | -2/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Version 4.10.0 | tmashuang | 2018-09-18 | 1 | -1/+1 |
| * | | | | | | Bump Changelog | tmashuang | 2018-09-18 | 1 | -1/+10 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4803 from MetaMask/eip-712 | Dan Finlay | 2018-09-18 | 10 | -179/+582 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' into eip-712 | Paul Bouchon | 2018-09-18 | 9 | -18/+74 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | compute and display checksummed hash in selected-account component (#5255) | Chad Grimaldi | 2018-09-16 | 2 | -3/+20 |
* | | | | | | | Improvement: Increase click area for arrows (#5264) | Sean | 2018-09-16 | 2 | -6/+18 |
* | | | | | | | Merge pull request #5270 from MetaMask/fix-retry | Alexander Tseung | 2018-09-16 | 2 | -5/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix speed up functionality | Alexander Tseung | 2018-09-15 | 2 | -5/+12 |
|/ / / / / / / | |||||
* | / / / / / | EIP-1102: Transitionary API (#5256) | Paul Bouchon | 2018-09-15 | 2 | -0/+20 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #5261 from lastblocklabs/style-fix-5242 | Whymarrh Whitby | 2018-09-15 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | follow up style fix to #5242 | chadmg | 2018-09-14 | 1 | -3/+3 |
* | | | | | | | Merge pull request #5262 from lastblocklabs/issue-5183-jsonimport | Alexander Tseung | 2018-09-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Bug Fix: #5183 history not defined | Sean Rabaut | 2018-09-14 | 1 | -1/+1 |
|/ / / / / / | |||||
| * | | | | | Update new method namespace from v2 to v3 | bitpshr | 2018-09-14 | 4 | -9/+9 |
| * | | | | | Update error message for chainId mis-match | bitpshr | 2018-09-14 | 1 | -1/+1 |
| * | | | | | Implement latest EIP-712 protocol | bitpshr | 2018-09-14 | 10 | -179/+582 |
|/ / / / / | |||||
* | | | | | Merge pull request #5247 from MetaMask/AddDocs | Dan Finlay | 2018-09-14 | 3 | -46/+60 |
|\ \ \ \ \ | |||||
| * | | | | | Add jsdoc gh-pages script | Dan Finlay | 2018-09-13 | 3 | -46/+60 |
* | | | | | | Merge pull request #5182 from MetaMask/tx-activity | Alexander Tseung | 2018-09-13 | 69 | -328/+1449 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo... | Alexander Tseung | 2018-09-13 | 9 | -18/+47 |
| * | | | | | | Fix tests. Add className to Identicon ethLogos. | Alexander Tseung | 2018-09-13 | 5 | -10/+13 |
| * | | | | | | Add WEI to getEthConversionFromWeiHex | Alexander Tseung | 2018-09-13 | 1 | -1/+1 |
| * | | | | | | Add transaction details to TransactionListItem component | Alexander Tseung | 2018-09-13 | 3 | -37/+46 |
| * | | | | | | Add TransactionListItemDetails component | Alexander Tseung | 2018-09-13 | 6 | -0/+203 |
| * | | | | | | Add TransactionBreakdown component | Alexander Tseung | 2018-09-13 | 9 | -0/+240 |
| * | | | | | | Add tests for TransactionActivityLog. Make changes to rendering events | Alexander Tseung | 2018-09-13 | 10 | -42/+349 |
| * | | | | | | Edit styling of cards variant of SenderToRecipient component | Alexander Tseung | 2018-09-13 | 1 | -1/+1 |
| * | | | | | | Add HexToDecimal component | Alexander Tseung | 2018-09-13 | 4 | -161/+48 |
| * | | | | | | Add tests for Card component | Alexander Tseung | 2018-09-13 | 2 | -1/+26 |
| * | | | | | | Allow denominations in CurrencyDisplay component | Alexander Tseung | 2018-09-13 | 6 | -16/+85 |
| * | | | | | | Allow more than 2 variable substitutions in the translation function | Alexander Tseung | 2018-09-13 | 1 | -4/+4 |
| * | | | | | | Add raised type buttons to Button component. Refactor all buttons within app ... | Alexander Tseung | 2018-09-13 | 18 | -94/+180 |
| * | | | | | | Add ActivityLog component | Alexander Tseung | 2018-09-13 | 10 | -1/+264 |
| |/ / / / / | |||||
* / / / / / | increase z-index of send-to input to allow for right-click (#5242) | Chad Grimaldi | 2018-09-13 | 1 | -0/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #5240 from MetaMask/i5238-account-balance-update | Dan Finlay | 2018-09-12 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Ensure account-tracker currentBlockNumber is set on first block update. | Dan Miller | 2018-09-11 | 1 | -0/+3 |
* | | | | | | Merge pull request #5237 from whymarrh/update-fx | Dan Finlay | 2018-09-12 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update Firefox version for e2e tests | Whymarrh Whitby | 2018-09-12 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5236 from whymarrh/excise-config-manager | Dan Finlay | 2018-09-12 | 13 | -490/+76 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Default NoticeController ctor opts to empty obj | Whymarrh Whitby | 2018-09-12 | 2 | -2/+2 |
| * | | | | | Add html reporter to test coverage output | Whymarrh Whitby | 2018-09-12 | 2 | -1/+2 |
| * | | | | | Delete ConfigManager, replacing its usages with PreferencesController | Whymarrh Whitby | 2018-09-12 | 10 | -488/+73 |
|/ / / / / | |||||
* | | | | | Merge pull request #5216 from MetaMask/tx-cancel | Frankie | 2018-09-11 | 4 | -2/+98 |
|\ \ \ \ \ | |||||
| * | | | | | Add createCancelTransaction method | Alexander Tseung | 2018-09-11 | 4 | -2/+98 |
* | | | | | | Merge pull request #5223 from whymarrh/tx-error-tooltips | Frankie | 2018-09-11 | 6 | -31/+78 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Show failed tx txMeta.err in tooltips | Whymarrh Whitby | 2018-09-09 | 1 | -1/+1 |
| * | | | | | | Show failed tx RPC error messages in tooltips | Whymarrh Whitby | 2018-09-09 | 2 | -2/+15 |
| * | | | | | | Don't render tooltips without titles | Whymarrh Whitby | 2018-09-09 | 1 | -0/+8 |
| * | | | | | | Rewrite Tooltip component as ES6 | Whymarrh Whitby | 2018-09-09 | 3 | -30/+55 |
| * | | | | | | Attach the RPC error value to txMeta | Whymarrh Whitby | 2018-09-09 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5229 from whymarrh/fix-confirm-seed-words | Dan Finlay | 2018-09-11 | 1 | -2/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clear old seed words when importing new seed words | Whymarrh Whitby | 2018-09-11 | 1 | -2/+8 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #5228 from ConnorChristie/memory-leaks | Dan Finlay | 2018-09-11 | 3 | -8/+12 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Upgrade obs-store and fix memory leaks | Connor Christie | 2018-09-10 | 3 | -8/+12 |
|/ / / / / | |||||
* | | | | | Merge pull request #5212 from whymarrh/yo-delete | Whymarrh Whitby | 2018-09-07 | 1 | -3/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove unused .yo-rc.json file | Whymarrh Whitby | 2018-09-06 | 1 | -3/+0 |
* | | | | | | Merge pull request #5213 from whymarrh/regen-lockfile | Whymarrh Whitby | 2018-09-07 | 1 | -48/+125 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Regenerate lockfile | Whymarrh Whitby | 2018-09-06 | 1 | -48/+125 |
|/ / / / / | |||||
* | | | | | Use correct loading message when connecting to Kovan (#5189) | Eugene Marinelli | 2018-09-06 | 2 | -1/+2 |
* | | | | | Merge pull request #5206 from whymarrh/fix-send-content-tests | Whymarrh Whitby | 2018-09-06 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix assertion of missing child component | Whymarrh Whitby | 2018-09-06 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #5188 from taobun/develop | Dan J Miller | 2018-09-05 | 3 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | fix check valid decimals code in new ui | bunoi | 2018-09-05 | 1 | -1/+1 |
| * | | | | | edit decimal check in old-ui/ | bunoi | 2018-09-03 | 2 | -2/+2 |
* | | | | | | Merge pull request #5167 from MetaMask/fix-watcAsset-images | Dan Finlay | 2018-09-05 | 16 | -11/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add assetImages to development states | Esteban MIno | 2018-08-31 | 3 | -0/+3 |
| * | | | | | | balance components using selectors | Esteban MIno | 2018-08-31 | 3 | -5/+5 |
| * | | | | | | fix integration test for asset images selectors | Esteban MIno | 2018-08-31 | 2 | -2/+2 |
| * | | | | | | fix watched tokens images showing in tx list | Esteban MIno | 2018-08-31 | 4 | -4/+16 |
| * | | | | | | fix watched asset image rendering on confirm transaction header | Esteban MIno | 2018-08-30 | 2 | -1/+5 |
| * | | | | | | fix images for watched tokens | Esteban MIno | 2018-08-30 | 8 | -4/+28 |
* | | | | | | | Merge pull request #5129 from MetaMask/add-sidebar-component | Dan J Miller | 2018-09-05 | 23 | -76/+267 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adds sidebar component and refactors slide in wallet view sidebar to use it. | Dan Miller | 2018-08-29 | 24 | -76/+290 |
* | | | | | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data | Dan J Miller | 2018-09-04 | 11 | -4/+77 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Adds feature flag toggle for the hex data row on the send screen. | Dan Miller | 2018-08-27 | 11 | -4/+77 |
* | | | | | | | | | Merge pull request #5115 from jdetychey/patch-1 | Dan J Miller | 2018-09-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Typo in "send" translation | Jerome de Tychey | 2018-08-22 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #5191 from eugeneiiim/patch-2 | Dan J Miller | 2018-09-04 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix CHANGELOG.md formatting | Eugene Marinelli | 2018-09-04 | 1 | -4/+4 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0 | Dan J Miller | 2018-09-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | chore(package): update enzyme-adapter-react-15 to version 1.0.6 | greenkeeper[bot] | 2018-08-25 | 1 | -1/+1 |
| * | | | | | | | | | chore(package): update enzyme to version 3.4.4 | greenkeeper[bot] | 2018-08-25 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #5176 from MetaMask/BumpTokenAbi | Dan Finlay | 2018-08-31 | 2 | -1/+24 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Bump human-standard-token-abi version for DAI support | Dan Finlay | 2018-08-31 | 2 | -1/+24 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinner | Alexander Tseung | 2018-08-29 | 4 | -7/+20 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix infinite spinner on failed transactions | Alexander Tseung | 2018-08-29 | 4 | -7/+20 |
* | | | | | | | | Merge pull request #4606 from MetaMask/WatchTokenFeature | Bruno Barbieri | 2018-08-29 | 24 | -6184/+6858 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix conflicts | Esteban MIno | 2018-08-29 | 123 | -2426/+3454 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #5121 from MetaMask/i5099-approve | Alexander Tseung | 2018-08-28 | 1 | -29/+87 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use eth-contract-metadata data if the token symbol or decimals fail on retrieval | Alexander Tseung | 2018-08-23 | 1 | -29/+87 |
* | | | | | | | | | Merge pull request #4919 from MetaMask/refactor-tx-list | Dan Finlay | 2018-08-28 | 92 | -8116/+8102 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ... | Dan Miller | 2018-08-28 | 2 | -2/+2 |
| * | | | | | | | | Fix tests | Alexander Tseung | 2018-08-24 | 6 | -15/+25 |
| * | | | | | | | | Fix naming, add eth.getCode check for actions, fix translations for statuses | Alexander Tseung | 2018-08-24 | 24 | -97/+85 |
| * | | | | | | | | Reduce large timeouts | Alexander Tseung | 2018-08-24 | 1 | -6/+6 |
| * | | | | | | | | Increase e2e timeouts for firefox | Alexander Tseung | 2018-08-24 | 1 | -7/+7 |
| * | | | | | | | | Change "Outgoing" to "Sent Ether" or "Sent Token" | Alexander Tseung | 2018-08-24 | 4 | -8/+14 |
| * | | | | | | | | Fix Firefox e2e tests | Alexander Tseung | 2018-08-24 | 1 | -2/+2 |
| * | | | | | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 1 | -1/+1 |
| * | | | | | | | | Update package-lock.json | Alexander Tseung | 2018-08-24 | 1 | -6126/+6121 |
| * | | | | | | | | Add CurrencyDisplay and TokenCurrencyDisplay components | Alexander Tseung | 2018-08-24 | 14 | -74/+425 |
| * | | | | | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 2 | -14/+6 |
| * | | | | | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 1 | -1/+1 |
| * | | | | | | | | Update retry transaction logic to use network nonce | Alexander Tseung | 2018-08-24 | 3 | -12/+46 |
| * | | | | | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 7 | -91/+108 |
| * | | | | | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 14 | -28/+47 |
| * | | | | | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 2 | -8/+8 |
| * | | | | | | | | Fix shapeshift transactions. Delete unused files | Alexander Tseung | 2018-08-24 | 9 | -689/+34 |
| * | | | | | | | | Show token amounts in TransactionListItem for token transfers | Alexander Tseung | 2018-08-24 | 10 | -79/+75 |
| * | | | | | | | | Fix tests | Alexander Tseung | 2018-08-24 | 1 | -10/+7 |
| * | | | | | | | | Add retry button to TransactionListItem | Alexander Tseung | 2018-08-24 | 11 | -50/+175 |
| * | | | | | | | | Code cleanup | Alexander Tseung | 2018-08-24 | 2 | -30/+14 |
| * | | | | | | | | Use css grid for TransactionListItem for responsive layout | Alexander Tseung | 2018-08-24 | 9 | -72/+94 |
| * | | | | | | | | Add tOrKey function to I18nProvider | Alexander Tseung | 2018-08-24 | 1 | -2/+9 |
| * | | | | | | | | Update package-lock.json | Alexander Tseung | 2018-08-24 | 1 | -11/+28 |
| * | | | | | | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 40 | -381/+936 |
| * | | | | | | | | Delete unused files | Alexander Tseung | 2018-08-24 | 3 | -189/+0 |
| * | | | | | | | | Add withMethodData HOC, add higher-order-component folder | Alexander Tseung | 2018-08-24 | 10 | -25/+75 |
| * | | | | | | | | Add TransactionStatus component | Alexander Tseung | 2018-08-24 | 3 | -0/+67 |
| * | | | | | | | | Add MenuBar component | Alexander Tseung | 2018-08-24 | 4 | -0/+97 |
| * | | | | | | | | Add react-media package to prevent rendering wallet-view twice in the popup view | Alexander Tseung | 2018-08-24 | 2 | -1/+6 |
| * | | | | | | | | Refactor home screen and remove unused files | Alexander Tseung | 2018-08-24 | 10 | -620/+116 |
* | | | | | | | | | Merge pull request #5136 from MetaMask/remove-test-ens | Dan Finlay | 2018-08-25 | 2 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Do not resolve .test domains using ENS | bitpshr | 2018-08-25 | 2 | -2/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | update Korean translation (#4630) | HackyMiner | 2018-08-24 | 1 | -124/+698 |
* | | | | | | | | Merge pull request #5096 from evgeniuz/develop | Dan J Miller | 2018-08-23 | 4 | -11/+76 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | updated docs, small improvement of recent RPC rendering | Evgeniy Filatov | 2018-08-23 | 3 | -4/+6 |
| * | | | | | | | | backported RPC improvements to oldui | Evgeniy Filatov | 2018-08-23 | 2 | -5/+6 |
| * | | | | | | | | implemented improvements to RPC history | Evgeniy Filatov | 2018-08-23 | 3 | -5/+67 |
| |/ / / / / / / | |||||
* / / / / / / / | Minimum Browsers Supported (#4873) | Antoine Nauleau | 2018-08-23 | 2 | -2/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5089 from MetaMask/i5085-ethcode | Alexander Tseung | 2018-08-23 | 5 | -37/+99 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use eth_getCode to sort transaction action type | Alexander Tseung | 2018-08-23 | 5 | -37/+99 |
* | | | | | | | | Merge pull request #4830 from MetaMask/page-container-tabs | Alexander Tseung | 2018-08-23 | 6 | -86/+125 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix code readability, use PureComponent over Component | Alexander Tseung | 2018-08-23 | 3 | -33/+23 |
| * | | | | | | | Add tabs support for PageContainer | Alexander Tseung | 2018-08-23 | 6 | -84/+133 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #5122 from MetaMask/lazy-account-tracker | Dan Finlay | 2018-08-23 | 2 | -2/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add todo to dedupe UI tracking in background | Dan Finlay | 2018-08-23 | 1 | -0/+1 |
| * | | | | | | | account-tracker - only track blocks when there are activeControllerConnections | kumavis | 2018-08-22 | 2 | -2/+24 |
| * | | | | | | | metamask controller - track active controller connections | kumavis | 2018-08-22 | 1 | -0/+12 |
* | | | | | | | | Merge pull request #5102 from whymarrh/fix-account-export-pw-bug | Whymarrh Whitby | 2018-08-23 | 2 | -5/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Clear warnings when exportAccount succeeds | Whymarrh Whitby | 2018-08-23 | 1 | -4/+19 |
| * | | | | | | | | Handle case where keyring is missing in AccountDetailsModal | Whymarrh Whitby | 2018-08-23 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #5066 from whymarrh/fix-key-export | Whymarrh Whitby | 2018-08-23 | 4 | -23/+119 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add test cases for MetaMaskController#_onKeyringControllerUpdate | Whymarrh Whitby | 2018-08-23 | 1 | -0/+71 |
| * | | | | | | | | Update unlock logic to not overwrite existing selected address | Whymarrh Whitby | 2018-08-23 | 1 | -13/+29 |
| * | | | | | | | | Don't re-render the export modal when the selected identity changes | Whymarrh Whitby | 2018-08-23 | 1 | -8/+17 |
| * | | | | | | | | Update AccountModalContainer to accept a selectedIdentity prop | Whymarrh Whitby | 2018-08-23 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #5111 from MetaMask/sender-to-recipient2 | Alexander Tseung | 2018-08-23 | 13 | -107/+210 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add new variant for SenderToRecipient component | Alexander Tseung | 2018-08-23 | 13 | -107/+210 |
|/ / / / / / / | |||||
| * | | | | | | watchAsset small changes | Esteban MIno | 2018-08-28 | 2 | -2/+2 |
| * | | | | | | add watchAsset CHANGELOG | Esteban MIno | 2018-08-24 | 1 | -0/+2 |
| * | | | | | | delete web3.metamassk.watchAsset | Esteban MIno | 2018-08-24 | 1 | -17/+0 |
| * | | | | | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 10 | -28/+28 |
| * | | | | | | expose web3.metamask.watchAsset | Esteban MIno | 2018-08-23 | 1 | -0/+17 |
| * | | | | | | fix integration tests on balance component with new watchAsset | Esteban MIno | 2018-08-22 | 1 | -3/+3 |
| * | | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-22 | 14 | -307/+100 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #5109 from MetaMask/MoveOutInpageProvider | Dan Finlay | 2018-08-22 | 9 | -276/+72 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move inpage-provider and port-stream outside | Dan Finlay | 2018-08-21 | 9 | -284/+87 |
* | | | | | | | | Merge pull request #5118 from MetaMask/provider2-bugfix | Dan Finlay | 2018-08-22 | 3 | -13/+20 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | bugfix - prevents old blocktracker from getting internal hooks migrated | kumavis | 2018-08-22 | 3 | -13/+20 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag | Dan J Miller | 2018-08-22 | 2 | -15/+2 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove unnecessary checks and user actions in metamask-beta-ui.spec | Dan Miller | 2018-08-22 | 2 | -15/+2 |
| * | | | | | | | Run ganache with a blocktime flag for npm:run:ganache:start. | Dan Miller | 2018-08-22 | 1 | -2/+2 |
* | | | | | | | | Merge pull request #5112 from MetaMask/hardware-wallet-fixes | Bruno Barbieri | 2018-08-21 | 2 | -3/+6 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix unit tests | brunobar79 | 2018-08-21 | 1 | -1/+1 |
| * | | | | | | | fix hardware wallets account name | brunobar79 | 2018-08-21 | 1 | -1/+3 |
| * | | | | | | | fix account removal | brunobar79 | 2018-08-21 | 1 | -1/+2 |
|/ / / / / / / | |||||
| | * | | | | | unit tests for watchAsset | Esteban MIno | 2018-08-22 | 2 | -2/+110 |
| | * | | | | | returning error in watchAsset | Esteban MIno | 2018-08-22 | 1 | -4/+12 |
| | * | | | | | refactor watchToken related functions | Esteban MIno | 2018-08-21 | 4 | -46/+45 |
| | * | | | | | watchAsset returns result wether token was added or not | Esteban MIno | 2018-08-21 | 3 | -10/+30 |
| | * | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-21 | 128 | -33151/+32991 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | |