| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | 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 | |
| * | | | | | | | | | | | | | change watchAsset to new spec for type ERC20 | Esteban MIno | 2018-08-16 | 1 | -15/+27 | |
| * | | | | | | | | | | | | | add suggested tokens objects in metamask state | Esteban MIno | 2018-08-16 | 1 | -6/+16 | |
| * | | | | | | | | | | | | | watchToken to watchAsset | Esteban MIno | 2018-08-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | add support for images base64 and urls on new ui | Esteban MIno | 2018-08-15 | 1 | -6/+7 | |
| * | | | | | | | | | | | | | update method to metamask_watchToken | Esteban MIno | 2018-08-15 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | refactor unused code | Esteban MIno | 2018-08-08 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | fix merge | Esteban MIno | 2018-08-08 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban Miño | 2018-08-08 | 7 | -41/+151 | |
| |\| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 3 | -23/+34 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Show invalid seed phrase error when importing new account | Whymarrh Whitby | 2018-08-07 | 1 | -0/+3 | |
| | | * | | | | | | | | | | | Update Phishing Html | Thomas | 2018-07-28 | 1 | -23/+26 | |
| | | |/ / / / / / / / / / | ||||||
| | * | | | | | | | | | | | fix doc tag | Esteban MIno | 2018-08-01 | 1 | -1/+1 | |
| | * | | | | | | | | | | | tokens related functions refactor | Esteban MIno | 2018-08-01 | 1 | -15/+22 | |
| | * | | | | | | | | | | | fix undefined for tokens on tests | Esteban MIno | 2018-08-01 | 1 | -1/+3 | |
| | * | | | | | | | | | | | improve comments | Esteban MIno | 2018-07-31 | 1 | -1/+1 | |
| | * | | | | | | | | | | | fix double state update when account changed | Esteban MIno | 2018-07-31 | 1 | -5/+3 | |
| | * | | | | | | | | | | | create tokens storage when setadresses | Esteban MIno | 2018-07-31 | 1 | -2/+4 | |
| | * | | | | | | | | | | | isolation of tokens related methods in preferences | Esteban MIno | 2018-07-31 | 1 | -43/+42 | |
| | * | | | | | | | | | | | passing tokens to all accounts in migration | Esteban MIno | 2018-07-30 | 1 | -3/+6 | |
| | * | | | | | | | | | | | fix migration for preferences controller tokens | Esteban MIno | 2018-07-28 | 1 | -1/+1 | |
| | * | | | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban Miño | 2018-07-28 | 8 | -16/+101 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | refactor to accountTokens | Esteban MIno | 2018-07-28 | 2 | -54/+48 | |
| | * | | | | | | | | | | | | migration for preferences controller tokens | Esteban MIno | 2018-07-28 | 2 | -0/+38 | |
| | * | | | | | | | | | | | | add & delete tokens per network | Esteban MIno | 2018-07-27 | 1 | -10/+8 | |
| | * | | | | | | | | | | | | tokens per network for individual account | Esteban MIno | 2018-07-27 | 2 | -15/+52 | |
| | * | | | | | | | | | | | | preferences test fixes for tokens per account | Esteban MIno | 2018-07-26 | 1 | -9/+16 | |
| | * | | | | | | | | | | | | add & delete tokens per account | Esteban MIno | 2018-07-26 | 2 | -8/+27 | |
| * | | | | | | | | | | | | | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 1 | -0/+3 | |
| * | | | | | | | | | | | | | add suggested token params validation | Esteban MIno | 2018-08-07 | 1 | -4/+25 | |
| * | | | | | | | | | | | | | eth_watchToken working | Esteban MIno | 2018-08-04 | 2 | -0/+8 | |
| * | | | | | | | | | | | | | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 1 | -5/+4 | |
| * | | | | | | | | | | | | | merge develop | Esteban MIno | 2018-08-04 | 66 | -100/+1409 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Merge pull request #4905 from MetaMask/eip-712-deprecation | Dan Finlay | 2018-07-28 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Add deprecation message for eth_signTypedData | bitpshr | 2018-07-28 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | Merge pull request #4893 from kelvintyb/develop | Thomas Huang | 2018-07-28 | 4 | -3/+65 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | add phishing html page, and redirect to bundled page in-window | Kelvin Tan | 2018-07-27 | 4 | -3/+65 | |
| | * | | | | | | | | | | | | Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional | kumavis | 2018-07-27 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | Update Chinese naming | Kevin Serrano | 2018-07-24 | 1 | -2/+2 | |
| | * | | | | | | | | | | | | | Merge pull request #4802 from 03-26/develop | kumavis | 2018-07-27 | 1 | -4/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into develop | Akihiro | 2018-07-21 | 2 | -6/+13 | |
| | | |\| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into develop | Akihiro | 2018-07-21 | 16 | -46/+725 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Update | 03-26 | 2018-07-15 | 1 | -4/+29 | |
| | * | | | | | | | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gas | Frankie | 2018-07-26 | 1 | -7/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | tx-gas-utils - catch all errors from gas estimation | Jenny Pollack | 2018-07-25 | 1 | -7/+3 | |
| | * | | | | | | | | | | | | | | migrations - fix to include 27 | frankiebee | 2018-07-26 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | Merge pull request #4825 from MetaMask/no-inject-ani-gamer | William Morriss | 2018-07-25 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Merge branch 'develop' into no-inject-ani-gamer | Kevin Serrano | 2018-07-25 | 17 | -47/+729 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | Do not inject on ani.gamer.com.tw | Dan Finlay | 2018-07-19 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | | | network.js: convert rpc protocol to lower case (#4855) | pinkiebell | 2018-07-25 | 1 | -0/+3 | |
| | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | 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 | |
| | * | | | | | | | | | | | | | | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 2 | -4/+10 | |
| | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | run linter | brunobar79 | 2018-07-22 | 2 | -2/+2 | |
| | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | fix merge | Esteban MIno | 2018-07-21 | 1 | -1/+0 | |
| | * | | | | | | | | | | | | Merge branch 'develop' into detectTokenFeature | Esteban Miño | 2018-07-21 | 38 | -30/+1103 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | Merge branch 'develop' into transaction-notifications | Csaba S | 2018-07-21 | 10 | -5/+598 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | Auto-detect tokens #3034 (#4683) | Esteban Miño | 2018-07-21 | 2 | -1/+134 | |
| | | | * | | | | | | | | | | | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 9 | -4/+464 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | last css fixes | brunobar79 | 2018-07-19 | 1 | -0/+3 | |
| | | | | * | | | | | | | | | | | design done | brunobar79 | 2018-07-19 | 4 | -4/+207 | |
| | | | | * | | | | | | | | | | | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | added some e2e tests | brunobar79 | 2018-07-18 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-18 | 1 | -0/+3 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | updated account list based on new designs | brunobar79 | 2018-07-18 | 1 | -0/+6 | |
| | | | | * | | | | | | | | | | | | added tests for removeAccount | brunobar79 | 2018-07-17 | 1 | -2/+0 | |
| | | | | * | | | | | | | | | | | | added more unit tests | brunobar79 | 2018-07-17 | 1 | -4/+3 | |
| | | | | * | | | | | | | | | | | | added unit tests for metamaskcontroller | brunobar79 | 2018-07-17 | 1 | -3/+17 | |
| | | | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-14 | 3 | -13/+7 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | update label | brunobar79 | 2018-07-14 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 1 | -0/+3 | |
| | | | | * | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-13 | 7 | -1/+118 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | added tooltip | brunobar79 | 2018-07-12 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 2 | -1/+39 | |
| | | | | * | | | | | | | | | | | | | update to temp dependencies | brunobar79 | 2018-07-12 | 1 | -1/+6 | |
| | | | | * | | | | | | | | | | | | | account removal is working | brunobar79 | 2018-07-11 | 2 | -1/+39 | |
| | | | | * | | | | | | | | | | | | | finish warning modal UI | brunobar79 | 2018-07-11 | 1 | -0/+9 | |
| | | | | * | | | | | | | | | | | | | added ui to remove accounts | brunobar79 | 2018-07-10 | 1 | -0/+3 | |
| | | | | * | | | | | | | | | | | | | 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 | 1 | -1/+3 | |
| | | | | * | | | | | | | | | | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 1 | -4/+15 | |
| | | | | * | | | | | | | | | | | | | copy updated | brunobar79 | 2018-07-07 | 1 | -1/+1 | |
| | | | | * | | | | | | | | | | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 1 | -0/+9 | |
| | | | | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial... | brunobar79 | 2018-07-07 | 20 | -2/+412 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | UI refactor | brunobar79 | 2018-07-06 | 1 | -2/+4 | |
| | | | | * | | | | | | | | | | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 1 | -0/+9 | |
| | | | | * | | | | | | | | | | | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -2/+2 | |
| | | | | * | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -4/+4 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 26 | -50/+50 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | move hardcoded strings to localization file | brunobar79 | 2018-07-03 | 1 | -0/+15 | |
| | | | | * | | | | | | | | | | | | | | | 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 | |
| | | | | * | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 14 | -60/+172 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | | | | fixes | brunobar79 | 2018-06-23 | 1 | -3/+3 | |
| | | | | * | | | | | | | | | | | | | | | clean up | Bruno | 2018-06-13 | 1 | -16/+19 | |
| | | | | * | | | | | | | | | | | | | | | fix merge conflicts | Bruno | 2018-06-13 | 6 | -104/+65 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 3 | -1379/+3 | |
| | | | | * | | | | | | | | | | | | | | | | 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 | 2 | -4/+4 | |
| | | | | * | | | | | | | | | | | | | | | | 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 | 5 | -1/+1475 | |
| | | * | | | | | | | | | | | | | | | | | | 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 #4656 from MetaMask/portal-metamask-ens-test | Dan Finlay | 2018-07-20 | 4 | -37/+47 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | Update variable name | bitpshr | 2018-07-19 | 1 | -2/+2 | |
| | | | * | | | | | | | | | | | | | | | | | 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 | 3 | -3/+9 | |
| | | * | | | | | | | | | | | | | | | | | | Merge pull request #4833 from MetaMask/brave-flag-sentry | Jenny Pollack | 2018-07-19 | 2 | -4/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | remove local tests | Jenny Pollack | 2018-07-19 | 2 | -3/+0 | |
| | | | * | | | | | | | | | | | | | | | | | sentry - add detection for Brave Browser | Jenny Pollack | 2018-07-19 | 2 | -4/+11 | |
| | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | Merge pull request #4813 from MetaMask/no-inject-blueskybooking | Dan Finlay | 2018-07-19 | 1 | -0/+1 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | Do not inject on blueskybooking.com | Dan Finlay | 2018-07-17 | 1 | -0/+1 | |
| | | | | |_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Use Number constructor for number conversion. Use existing noConversionRateAv... | Alexander Tseung | 2018-07-18 | 1 | -3/+0 | |
| | | * | | | | | | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ... | Alexander Tseung | 2018-07-18 | 1 | -0/+9 | |
| | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | Fix edge cases and add translation compatibility | Sara Reynolds | 2018-07-17 | 1 | -0/+3 | |
| | | |/ / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | Add harbourair.com to injection block list | Dan Finlay | 2018-07-13 | 1 | -0/+1 | |
| | | * | | | | | | | | | | | | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunction | Thomas Huang | 2018-07-13 | 1 | -13/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into removeNonceTrackerFunction | Thomas | 2018-07-11 | 46 | -59/+471 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | Remove unsued nonce tracker function | tmashuang | 2018-06-26 | 1 | -13/+0 | |
| | | * | | | | | | | | | | | | | | | Add tooltip to new tab icon in tx-view | Whymarrh Whitby | 2018-07-12 | 1 | -0/+3 | |
| | | * | | | | | | | | | | | | | | | Add tooltip to menu icon in tx-view | Whymarrh Whitby | 2018-07-12 | 1 | -0/+3 | |
| | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 5 | -1/+77 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 1 | -10/+12 | |
| | | | * | | | | | | | | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 2 | -1/+4 | |
| | | | * | | | | | | | | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 1 | -1/+1 | |
| | | | * | | | | | | | | | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 6 | -13/+84 | |
| | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into... | frankiebee | 2018-07-11 | 46 | -59/+471 | |
| | | |\| | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 1 | -0/+9 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 1 | -0/+9 | |
| | | | | | |_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui | Dan J Miller | 2018-07-05 | 1 | -0/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | Use background gas price estimation method in new ui. | Dan | 2018-06-29 | 1 | -0/+1 | |
| | | | | | |_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | fix lint errors | brunobar79 | 2018-07-04 | 4 | -8/+7 | |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |