| Commit message (Expand) | Author | Age | Files | Lines |
* | Extract Add Token button into its own component | Whymarrh Whitby | 2018-10-18 | 1 | -0/+6 |
* | Adds toggle for primary currency (#5421) | Alexander Tseung | 2018-10-17 | 4 | -1/+55 |
* | Fix wording of private key warning shown during export | Whymarrh Whitby | 2018-10-17 | 1 | -1/+1 |
* | Update wording on export privkey modal | Whymarrh Whitby | 2018-10-17 | 1 | -1/+1 |
* | Fix document extension check when injecting web3 | Whymarrh Whitby | 2018-10-16 | 1 | -7/+12 |
* | Improve Korean translations (#5515) | Noel Yoo | 2018-10-16 | 1 | -7/+85 |
* | Fixed wrong Spanish translation of `key` (#5517) | Pedro Gutiérrez | 2018-10-16 | 1 | -7/+7 |
* | Add txReceipt data to transaction details (#5513) | Alexander Tseung | 2018-10-16 | 3 | -1/+42 |
* | Update Italian translations (#5502) | matteopey | 2018-10-16 | 1 | -5/+480 |
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into develop | kumavis | 2018-10-12 | 1 | -1/+1 |
|\ |
|
| * | Version 4.13.0v4.13.0 | Dan Finlay | 2018-09-28 | 1 | -2/+2 |
* | | Correct 4.14.0 version | Dan Finlay | 2018-10-12 | 1 | -1/+1 |
* | | Merge pull request #5505 from MetaMask/Version-4.14.0 | Thomas Huang | 2018-10-12 | 1 | -1/+1 |
|\ \ |
|
| * | | Version 4.14.0v4.14.0 | Dan Finlay | 2018-10-12 | 1 | -1/+1 |
* | | | Fix en, ko locales (#5483) | Noel Yoo | 2018-10-11 | 2 | -49/+49 |
* | | | Ensure that new transactions added are using the selected address | Whymarrh Whitby | 2018-10-11 | 1 | -0/+4 |
* | | | Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5... | Whymarrh Whitby | 2018-10-11 | 1 | -23/+1 |
* | | | Merge pull request #5480 from noelyoo/typo | kumavis | 2018-10-10 | 2 | -236/+236 |
|\ \ \ |
|
| * | | | Alphabetize ko locale json keys | noelyoo | 2018-10-10 | 1 | -224/+224 |
| * | | | Alphabetize en locale json keys | noelyoo | 2018-10-10 | 1 | -12/+12 |
| |/ / |
|
* / / | transactions - add txReceipt to the txMeta body for confirmed txs (#5375) | Frankie | 2018-10-10 | 1 | -1/+23 |
|/ / |
|
* | | Fix formatting of locale files (#5479) | Noel Yoo | 2018-10-10 | 15 | -956/+956 |
* | | tests - integration - Add Drizzle tests (#5467) | Bruno Barbieri | 2018-10-10 | 1 | -1/+1 |
* | | i18n - fr - improvements | Vincent | 2018-10-10 | 1 | -4/+4 |
* | | Added account options on home screen | Santiago Gonzalez Toral | 2018-10-10 | 5 | -0/+64 |
* | | Fix Korean typos (#5472) | Noel Yoo | 2018-10-10 | 1 | -7/+7 |
* | | Merge pull request #5458 from MetaMask/provider-subs | Bruno Barbieri | 2018-10-10 | 5 | -15/+36 |
|\ \ |
|
| * | | workaround - fix for drizzle | kumavis | 2018-10-09 | 1 | -2/+11 |
| * | | provider - network - restore block-ref-rewrite middleware references | kumavis | 2018-10-09 | 2 | -4/+4 |
| * | | provider - enable subscription support (newHeads, logs) | kumavis | 2018-10-08 | 2 | -9/+21 |
* | | | 100% French locale, reordering of English locale, fixes #5457 (#5470) | Vincent | 2018-10-09 | 2 | -123/+802 |
* | | | Refactor buffer constructor (#5468) | Noel Yoo | 2018-10-09 | 2 | -2/+2 |
* | | | Added webRequest.RequestFilter to filter main_frame .eth requests | Eduardo Antuña Díez | 2018-10-09 | 1 | -1/+1 |
* | | | Merge branch 'develop' into update-balance-on-unlock | Dan Finlay | 2018-10-06 | 2 | -0/+2 |
|\ \ \ |
|
| * | | | Fix updating of pending transactions | Dan Finlay | 2018-10-06 | 2 | -0/+2 |
* | | | | Update all balances on password unlock | Dan Finlay | 2018-10-06 | 1 | -0/+1 |
|/ / / |
|
* | | | Merge pull request #5432 from alextsg/i5362-fix-translate | Dan Finlay | 2018-10-06 | 1 | -0/+3 |
|\ \ \ |
|
| * | | | Translate method names in the transaction list only when applicable | Alexander Tseung | 2018-10-05 | 1 | -0/+3 |
* | | | | Merge pull request #5427 from alextsg/i5371-update-cancel-copy | Alexander Tseung | 2018-10-05 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Update "cancel" copy | Alexander Tseung | 2018-10-05 | 1 | -1/+1 |
| |/ / / |
|
* / / / | Increase suggested gas percentile to 65 (#5359) | Dan Finlay | 2018-10-05 | 1 | -1/+1 |
|/ / / |
|
* | | | Merge pull request #5412 from whymarrh/after-install-steps | Whymarrh Whitby | 2018-10-04 | 1 | -9/+0 |
|\ \ \ |
|
| * | | | Don't open metamask.io after install anymore | Whymarrh Whitby | 2018-10-02 | 1 | -9/+0 |
* | | | | Remove "Copy Contract Address" from token options | Whymarrh Whitby | 2018-10-04 | 4 | -14/+2 |
| |/ /
|/| | |
|
* | | | Style links on phishing page with an underline | Whymarrh Whitby | 2018-10-02 | 1 | -0/+1 |
* | | | Style links on phishing page with cursor: pointer; | Whymarrh Whitby | 2018-10-02 | 1 | -0/+1 |
* | | | Hook MetaMaskController up with phishing detection page | Whymarrh Whitby | 2018-10-02 | 2 | -2/+60 |
* | | | Add domain whitelist method to MetaMaskController | Whymarrh Whitby | 2018-10-02 | 1 | -0/+11 |
* | | | Add ability to whitelist a blacklisted domain at runtime | Whymarrh Whitby | 2018-10-02 | 1 | -0/+22 |
* | | | Update title and copy of phishing warning page | Whymarrh Whitby | 2018-10-02 | 1 | -2/+6 |
|/ / |
|
* | | Reword batch reject confirm as "Reject All" | Whymarrh Whitby | 2018-10-02 | 1 | -0/+3 |
* | | Confirm rejecting multiple transactions with modal | Whymarrh Whitby | 2018-10-02 | 1 | -0/+3 |
* | | s/Cancel/Reject/ on confirm screen for clarity | Whymarrh Whitby | 2018-10-02 | 1 | -0/+6 |
* | | Add "Cancel All" button to confirm footer | Whymarrh Whitby | 2018-10-02 | 1 | -0/+3 |
* | | support editable customRPC (#5267) | HackyMiner | 2018-09-29 | 2 | -7/+15 |
* | | Merge pull request #5271 from farahbrunache/develop | kumavis | 2018-09-28 | 2 | -0/+1241 |
|\ \ |
|
| * | | i18n - ht - fix json formatting | kumavis | 2018-09-28 | 1 | -4/+1 |
| * | | i18n - index - fix whitespace | kumavis | 2018-09-28 | 1 | -21/+21 |
| * | | fixed quotes in line 749 | Farah Brunache | 2018-09-21 | 1 | -1/+1 |
| * | | fixed some grammatical errors | Farah Brunache | 2018-09-17 | 1 | -15/+13 |
| * | | added Haitian Creole translations | Farah Brunache | 2018-09-16 | 2 | -20/+1266 |
* | | | Version 4.12.0 | Dan Finlay | 2018-09-28 | 1 | -2/+2 |
* | | | Merge remote-tracking branch 'origin/master' into Version-4.12.0 | Dan Finlay | 2018-09-28 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' into v4.11.1 | Bruno Barbieri | 2018-09-25 | 1 | -1/+1 |
| |\ \ |
|
| | * | | Version 4.11.0 | Dan Finlay | 2018-09-22 | 1 | -2/+2 |
| * | | | 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 | 4 | -94/+84 |
| |\ \ \
| | |/ /
| |/| | |
|
* | | | | 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 | 3 | -3/+9 |
|\ \ \ \ |
|
| * | | | | additional lint-test fix | hahnmichaelf | 2018-08-14 | 1 | -1/+1 |
| * | | | | fix for lint-test | hahnmichaelf | 2018-08-14 | 2 | -3/+3 |
| * | | | | fixed names | hahnmichaelf | 2018-08-14 | 1 | -1/+1 |
| * | | | | Re-added GA script | hahnmichaelf | 2018-08-14 | 1 | -0/+19 |
| * | | | | change name | hahnmichaelf | 2018-08-14 | 2 | -1/+1 |
| * | | | | base - working. fixes #4774 | hahnmichaelf | 2018-08-13 | 3 | -21/+8 |
* | | | | | 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 |
* | | | | | | EIP-1102: Add deprecation message (#5353) | Paul Bouchon | 2018-09-26 | 2 | -6/+6 |
* | | | | | | bugfix: update eth_signTypedData_v3 parameter order | bitpshr | 2018-09-26 | 1 | -4/+4 |
|/ / / / / |
|
* | | | | | Fix MetaMask web3 version (#5352) | Esteban Miño | 2018-09-26 | 1 | -0/+1 |
* | | | | | Merge pull request #5282 from MetaMask/tx-cancel-ui | Alexander Tseung | 2018-09-25 | 2 | -2/+21 |
|\ \ \ \ \ |
|
| * | | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa... | Alexander Tseung | 2018-09-21 | 1 | -1/+1 |
| * | | | | | Add TransactionDetails modal | Alexander Tseung | 2018-09-20 | 1 | -0/+3 |
| * | | | | | Switch existing modals from using Notification to Modal. Remove Notification ... | Alexander Tseung | 2018-09-20 | 2 | -2/+18 |
* | | | | | | 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 | 1 | -0/+12 |
|\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | | |
|
| * | | | | | | Fix translation casing | Alexander Tseung | 2018-09-21 | 1 | -2/+2 |
| * | | | | | | Add Current Conversion Updated string to translations | Alexander Tseung | 2018-09-20 | 1 | -0/+3 |
| * | | | | | | Refactor settings page to use JSX and follow component file folder structure | Alexander Tseung | 2018-09-20 | 1 | -0/+9 |
| |/ / / / / |
|
* | | | | | | 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 |
|/ / / / / |
|
* | | | | | Version 4.10.0 | tmashuang | 2018-09-18 | 1 | -1/+1 |
* | | | | | Merge branch 'develop' into eip-712 | Paul Bouchon | 2018-09-18 | 1 | -0/+19 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | EIP-1102: Transitionary API (#5256) | Paul Bouchon | 2018-09-15 | 1 | -0/+19 |
* | | | | | Update new method namespace from v2 to v3 | bitpshr | 2018-09-14 | 2 | -3/+3 |
* | | | | | Update error message for chainId mis-match | bitpshr | 2018-09-14 | 1 | -1/+1 |
* | | | | | Implement latest EIP-712 protocol | bitpshr | 2018-09-14 | 2 | -39/+112 |
|/ / / / |
|
* | | | | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo... | Alexander Tseung | 2018-09-13 | 1 | -5/+8 |
* | | | | Add TransactionListItemDetails component | Alexander Tseung | 2018-09-13 | 1 | -0/+3 |
* | | | | Add tests for TransactionActivityLog. Make changes to rendering events | Alexander Tseung | 2018-09-13 | 1 | -0/+24 |
* | | | | Add ActivityLog component | Alexander Tseung | 2018-09-13 | 1 | -0/+3 |
* | | | | 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 |
* | | | | | Default NoticeController ctor opts to empty obj | Whymarrh Whitby | 2018-09-12 | 1 | -1/+1 |
* | | | | | Delete ConfigManager, replacing its usages with PreferencesController | Whymarrh Whitby | 2018-09-12 | 4 | -341/+27 |
|/ / / / |
|
* | | | | Merge pull request #5216 from MetaMask/tx-cancel | Frankie | 2018-09-11 | 3 | -2/+73 |
|\ \ \ \ |
|
| * | | | | Add createCancelTransaction method | Alexander Tseung | 2018-09-11 | 3 | -2/+73 |
* | | | | | Merge pull request #5223 from whymarrh/tx-error-tooltips | Frankie | 2018-09-11 | 1 | -0/+1 |
|\ \ \ \ \ |
|
| * | | | | | Attach the RPC error value to txMeta | Whymarrh Whitby | 2018-09-09 | 1 | -0/+1 |
| |/ / / / |
|
* / / / / | Upgrade obs-store and fix memory leaks | Connor Christie | 2018-09-10 | 1 | -3/+7 |
|/ / / / |
|
* | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data | Dan J Miller | 2018-09-04 | 1 | -0/+6 |
|\ \ \ \ |
|
| * | | | | Adds feature flag toggle for the hex data row on the send screen. | Dan Miller | 2018-08-27 | 1 | -0/+6 |
* | | | | | 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 |
* | | | | | | fix conflicts | Esteban MIno | 2018-08-29 | 13 | -153/+798 |
|\ \ \ \ \ \ |
|
| * \ \ \ \ \ | Merge pull request #4919 from MetaMask/refactor-tx-list | Dan Finlay | 2018-08-28 | 1 | -1/+22 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | Fix naming, add eth.getCode check for actions, fix translations for statuses | Alexander Tseung | 2018-08-24 | 1 | -0/+3 |
| | * | | | | | Change "Outgoing" to "Sent Ether" or "Sent Token" | Alexander Tseung | 2018-08-24 | 1 | -0/+6 |
| | * | | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 1 | -0/+3 |
| | * | | | | | Use css grid for TransactionListItem for responsive layout | Alexander Tseung | 2018-08-24 | 1 | -6/+6 |
| | * | | | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 1 | -1/+10 |
| * | | | | | | 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 |
| * | | | | | updated docs, small improvement of recent RPC rendering | Evgeniy Filatov | 2018-08-23 | 1 | -1/+1 |
| * | | | | | implemented improvements to RPC history | Evgeniy Filatov | 2018-08-23 | 1 | -1/+1 |
| * | | | | | 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 #5066 from whymarrh/fix-key-export | Whymarrh Whitby | 2018-08-23 | 1 | -13/+29 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Update unlock logic to not overwrite existing selected address | Whymarrh Whitby | 2018-08-23 | 1 | -13/+29 |
| | |/ / / / / |
|
| * / / / / / | Add new variant for SenderToRecipient component | Alexander Tseung | 2018-08-23 | 7 | -9/+9 |
| |/ / / / / |
|
* | | | | | | watchAsset small changes | Esteban MIno | 2018-08-28 | 1 | -1/+1 |
* | | | | | | delete web3.metamassk.watchAsset | Esteban MIno | 2018-08-24 | 1 | -17/+0 |
* | | | | | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 1 | -6/+6 |
* | | | | | | expose web3.metamask.watchAsset | Esteban MIno | 2018-08-23 | 1 | -0/+17 |
* | | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-22 | 9 | -279/+10 |
|\| | | | | |
|
| * | | | | | Merge pull request #5109 from MetaMask/MoveOutInpageProvider | Dan Finlay | 2018-08-22 | 7 | -276/+4 |
| |\ \ \ \ \ |
|
| | * | | | | | Move inpage-provider and port-stream outside | Dan Finlay | 2018-08-21 | 7 | -276/+4 |
| * | | | | | | Merge pull request #5118 from MetaMask/provider2-bugfix | Dan Finlay | 2018-08-22 | 1 | -1/+1 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | | | | |
|
| | * | | | | | bugfix - prevents old blocktracker from getting internal hooks migrated | kumavis | 2018-08-22 | 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 |
| |/ / / / |
|
* | | | | | returning error in watchAsset | Esteban MIno | 2018-08-22 | 1 | -4/+12 |
* | | | | | refactor watchToken related functions | Esteban MIno | 2018-08-21 | 1 | -37/+36 |
* | | | | | 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 | 46 | -501/+864 |
|\| | | | |
|
| * | | | | Update logo wordmark | Alexander Tseung | 2018-08-19 | 2 | -0/+115 |
| * | | | | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-18 | 1 | -2/+47 |
| |\ \ \ \ |
|
| | * | | | | Restores accounts until one with a zero balance is found | Dan Matthews | 2018-08-17 | 1 | -2/+47 |
| | * | | | | Merge pull request #4279 from MetaMask/network-remove-provider-engine | Dan Finlay | 2018-08-16 | 21 | -369/+489 |
| | |\ \ \ \
| | | |_|/ /
| | |/| | | |
|
| | | * | | | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-08-15 | 28 | -54/+251 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into... | frankiebee | 2018-08-07 | 2 | -23/+29 |
| | | |\ \ \ \ |
|
| | | * \ \ \ \ | Merge branch 'network-remove-provider-engine' into network-remove-provider-en... | frankiebee | 2018-08-07 | 1 | -1/+1 |
| | | |\ \ \ \ \ |
|
| | | | * | | | | | network - fix blockTracker reference to return the blockTrackerProxy instead ... | frankiebee | 2018-08-07 | 1 | -1/+1 |
| | | * | | | | | | Merge branch 'develop' into network-remove-provider-engine-tests | Thomas Huang | 2018-08-02 | 8 | -16/+104 |
| | | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-07-26 | 40 | -28/+1242 |
| | | |\ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-07-04 | 25 | -51/+50 |
| | | |\ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-07-03 | 16 | -83/+154 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | lint - fix lint for network | kumavis | 2018-06-13 | 3 | -3/+0 |
| | | * | | | | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi... | kumavis | 2018-06-13 | 3 | -37/+4 |
| | | * | | | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on error | kumavis | 2018-06-13 | 1 | -22/+28 |
| | | * | | | | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST... | kumavis | 2018-06-12 | 1 | -1/+2 |
| | | * | | | | | | | | | test - e2e - inject metamask config to point at localhost | kumavis | 2018-06-12 | 1 | -1/+3 |
| | | * | | | | | | | | | lint - controllers - whitepace fix | kumavis | 2018-06-12 | 1 | -5/+5 |
| | | * | | | | | | | | | network - provider - infura - use block-reemit middleware | kumavis | 2018-06-08 | 1 | -2/+2 |
| | | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-06-08 | 3 | -0/+22 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-06-07 | 6 | -4/+86 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | lint - remove unused require | kumavis | 2018-06-07 | 1 | -1/+0 |
| | | * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-06-07 | 14 | -28/+305 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | controllers - transactions - fix tx status update on boot | kumavis | 2018-05-29 | 2 | -2/+13 |
| | | * | | | | | | | | | | | | controllers - transactions - fix tx confirmation | kumavis | 2018-05-29 | 2 | -3/+3 |
| | | * | | | | | | | | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | metamask-controller - update preferences controller addresses after import ac... | kumavis | 2018-05-29 | 1 | -10/+10 |
| | | * | | | | | | | | | | | | controllers - transaction - pending-tx-tracker - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | controllers - transactions - merge @frankiebee's work with mine | kumavis | 2018-05-29 | 4 | -96/+69 |
| | | * | | | | | | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc... | kumavis | 2018-05-26 | 1 | -1/+10 |
| | | * | | | | | | | | | | | | tx-gas-utils - query for block without tx bodies | kumavis | 2018-05-26 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware... | kumavis | 2018-05-25 | 1 | -1/+13 |
| | | * | | | | | | | | | | | | provider - update wallet hooks for new wallet middleware | kumavis | 2018-05-25 | 4 | -64/+110 |
| | | * | | | | | | | | | | | | metamask-controller - fix account lookup hook | kumavis | 2018-05-25 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | account-tracker - guard against empty block | kumavis | 2018-05-25 | 1 | -1/+2 |
| | | * | | | | | | | | | | | | controllers - recent-blocks - guard against empty block | kumavis | 2018-05-25 | 1 | -3/+3 |
| | | * | | | | | | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catch | kumavis | 2018-05-24 | 1 | -1/+7 |
| | | * | | | | | | | | | | | | Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask... | kumavis | 2018-05-24 | 2 | -9/+24 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker | kumavis | 2018-05-24 | 2 | -9/+24 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/... | frankiebee | 2018-05-23 | 14 | -67/+215 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | | * | | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block tracker | frankiebee | 2018-05-23 | 1 | -7/+18 |
| | | | | * | | | | | | | | | | | | | remove dependance on the even tx:confirmed | frankiebee | 2018-05-23 | 1 | -2/+6 |
| | | * | | | | | | | | | | | | | | | sentry - setupRaven - ensure message is truthy | kumavis | 2018-05-24 | 1 | -2/+2 |
| | | * | | | | | | | | | | | | | | | controllers - recent-blocks - ensure full blocks | kumavis | 2018-05-24 | 1 | -2/+2 |
| | | |/ / / / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | | | controllers - account-tracker - refactor + update for eth-block-tracker@4 | kumavis | 2018-05-24 | 1 | -67/+56 |
| | | * | | | | | | | | | | | | | | controllers - recent-blocks - doc update | kumavis | 2018-05-24 | 1 | -4/+4 |
| | | | |/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-23 | 1 | -15/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-23 | 13 | -52/+208 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|/ / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | recent-blocks - fix backfill blockNumber tracking | kumavis | 2018-05-17 | 1 | -3/+2 |
| | | * | | | | | | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout args | kumavis | 2018-05-17 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | deps - fix incorrect dep paths and versions | kumavis | 2018-05-17 | 4 | -4/+4 |
| | | * | | | | | | | | | | | | | | controllers - balance - update for eth-block-tracker@4 | kumavis | 2018-05-17 | 1 | -3/+3 |
| | | * | | | | | | | | | | | | | | recent-blocks - update for eth-block-tracker@4 | kumavis | 2018-05-17 | 1 | -27/+14 |
| | | * | | | | | | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxy | kumavis | 2018-05-17 | 2 | -43/+0 |
| | | * | | | | | | | | | | | | | | lint fix | kumavis | 2018-05-17 | 5 | -13/+18 |
| | | * | | | | | | | | | | | | | | network - create provider and block-tracker via json-rpc-engine | kumavis | 2018-05-17 | 8 | -70/+217 |
| | * | | | | | | | | | | | | | | | v4.9.3v4.9.3 | Thomas | 2018-08-16 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | Merge pull request #5037 from MetaMask/master | Dan Finlay | 2018-08-16 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | v4.9.2 | Thomas | 2018-08-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-18 | 22 | -370/+490 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | ui ready | brunobar79 | 2018-08-17 | 1 | -2/+5 |
| * | | | | | | | | | | | | | | | connect screen ready | brunobar79 | 2018-08-17 | 3 | -5/+7 |
| * | | | | | | | | | | | | | | | change Metamask for MetaMask | brunobar79 | 2018-08-15 | 1 | -7/+1 |
| * | | | | | | | | | | | | | | | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-15 | 14 | -26/+32 |
| |\| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages | Whymarrh Whitby | 2018-08-14 | 9 | -11/+11 |
| | * | | | | | | | | | | | | | | Fix casing of MetaMask in all localized messages | Whymarrh Whitby | 2018-08-14 | 11 | -16/+16 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/
| | |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | remove console logs | brunobar79 | 2018-08-15 | 1 | -7/+1 |
| * | | | | | | | | | | | | | | fixed unit tests | brunobar79 | 2018-08-15 | 1 | -0/+6 |
| * | | | | | | | | | | | | | | ui fixes | brunobar79 | 2018-08-15 | 1 | -11/+8 |
| * | | | | | | | | | | | | | | fix tx tests | brunobar79 | 2018-08-14 | 2 | -5/+5 |
| * | | | | | | | | | | | | | | legacy and new hd path working | brunobar79 | 2018-08-14 | 2 | -1/+8 |
| * | | | | | | | | | | | | | | good progress adding paths | brunobar79 | 2018-08-14 | 1 | -8/+11 |
| * | | | | | | | | | | | | | | clean up | brunobar79 | 2018-08-12 | 4 | -43/+4 |
| * | | | | | | | | | | | | | | this should be ready to go | brunobar79 | 2018-08-12 | 2 | -323/+3 |
| * | | | | | | | | | | | | | | clean up | brunobar79 | 2018-08-12 | 1 | -45/+36 |
| * | | | | | | | | | | | | | | message signing works | brunobar79 | 2018-08-12 | 2 | -6/+18 |
| * | | | | | | | | | | | | | | working | brunobar79 | 2018-08-12 | 2 | -24/+14 |
| * | | | | | | | | | | | | | | tx signature is valid | brunobar79 | 2018-08-12 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | tx signing should work | brunobar79 | 2018-08-12 | 1 | -10/+39 |
| * | | | | | | | | | | | | | | rename keyring | brunobar79 | 2018-08-11 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | able to add accounts | brunobar79 | 2018-08-11 | 2 | -37/+104 |
| * | | | | | | | | | | | | | | iframe communication working | brunobar79 | 2018-08-11 | 7 | -66/+209 |
| * | | | | | | | | | | | | | | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 4 | -76/+180 |
| |/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 6 | -2/+95 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | code review changes | brunobar79 | 2018-08-08 | 3 | -0/+43 |
| | * | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-08 | 7 | -41/+151 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | design complete | brunobar79 | 2018-08-04 | 2 | -2/+26 |
| | * | | | | | | | | | | | | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 1 | -0/+6 |
| | * | | | | | | | | | | | | | send to fullscreen if no permission from popup | brunobar79 | 2018-07-31 | 2 | -1/+9 |
| | * | | | | | | | | | | | | | copy | brunobar79 | 2018-07-31 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | use existing modals | brunobar79 | 2018-07-31 | 2 | -1/+13 |
| | | |_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | | Merge pull request #5020 from MetaMask/FixMigration28v4.9.2v4.9.1 | Dan Finlay | 2018-08-10 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | fix migration 28 | Esteban MIno | 2018-08-10 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | sentry - change releaseVersion to release | Jenny Pollack | 2018-08-10 | 2 | -4/+4 |
| |/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | v4.9.1 | Thomas | 2018-08-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Merge branch 'master' into develop | Thomas | 2018-08-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Avoid overwriting a domain that can be resolved by DNS | Eduardo Antuña Díez | 2018-08-09 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Fixed ENS to IPFS functionality in Firefox | Eduardo Antuña Díez | 2018-08-09 | 1 | -1/+1 |
| | |/ / / / / / / / / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | delete according image when token added with watchToken deleted | Esteban MIno | 2018-08-17 | 1 | -13/+14 |
* | | | | | | | | | | | | | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 1 | -1/+1 |
* | | | | | | | | | | | | | show watch asset image from hide token modal | Esteban MIno | 2018-08-16 | 1 | -1/+1 |