| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | ci: Use workspaces instead of caches for passing data downstream | Whymarrh Whitby | 2018-08-18 | 1 | -89/+47 |
| * | ci: Install any npm@6 | Whymarrh Whitby | 2018-08-18 | 1 | -1/+1 |
| * | ci: Use Firefox 61.0.2 | Whymarrh Whitby | 2018-08-18 | 1 | -1/+1 |
| * | ci: Disable Firefox updates | Whymarrh Whitby | 2018-08-18 | 2 | -1/+24 |
| * | ci: Don't cache Firefox install | Whymarrh Whitby | 2018-08-18 | 4 | -61/+28 |
| * | Merge pull request #5050 from MetaMask/ledger-support | Dan Finlay | 2018-08-18 | 18 | -198/+559 |
| |\ | |||||
| | * | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-18 | 3 | -2/+111 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #4898 from dmvt/multi-account-restore | Dan Finlay | 2018-08-18 | 3 | -2/+111 |
| |\ \ | |||||
| | * | | Restores accounts until one with a zero balance is found | Dan Matthews | 2018-08-17 | 3 | -2/+111 |
| |/ / | |||||
| | * | update package-lock.json | brunobar79 | 2018-08-18 | 0 | -0/+0 |
| | |\ | |/ |/| | |||||
| * | | info.js Remove width element to fix email layout (#4588) | Anatoli Babenia | 2018-08-16 | 1 | -1/+0 |
| * | | Merge pull request #4279 from MetaMask/network-remove-provider-engine | Dan Finlay | 2018-08-16 | 43 | -2918/+1285 |
| |\ \ | |||||
| | * | | Remove commented out code for detect-token-test | Thomas | 2018-08-15 | 1 | -10/+0 |
| | * | | Update eth-json-rpc-filters | Thomas | 2018-08-15 | 2 | -1971/+18 |
| | * | | E2E - Dont error on browser errors | Thomas | 2018-08-15 | 1 | -1/+2 |
| | * | | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-08-15 | 67 | -428/+1461 |
| | |\ \ | |||||
| | * | | | Confirms new contract token in the popup | Thomas | 2018-08-14 | 1 | -6/+6 |
| | * | | | Delay | Thomas | 2018-08-09 | 1 | -0/+1 |
| | * | | | confirms a deplay contract tx in the popup | Thomas | 2018-08-09 | 1 | -0/+9 |
| | * | | | Use develop e2e beta tests | Thomas | 2018-08-08 | 1 | -109/+34 |
| | * | | | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/... | frankiebee | 2018-08-08 | 1 | -32211/+32287 |
| | |\ \ \ | |||||
| | | * | | | deps - update package-lock | frankiebee | 2018-08-07 | 1 | -32211/+32287 |
| | * | | | | lint fixes | frankiebee | 2018-08-08 | 1 | -2/+2 |
| | |/ / / | |||||
| | * | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into... | frankiebee | 2018-08-07 | 18 | -598/+235 |
| | |\ \ \ | |||||
| | * \ \ \ | 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 | 29 | -695/+1203 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Lint | Thomas Huang | 2018-07-31 | 1 | -2/+2 |
| | * | | | | | | Set metamask controller network provider to localhost | Thomas Huang | 2018-07-31 | 3 | -2/+24 |
| | * | | | | | | Disallow netConnections other than localhosts | Thomas | 2018-07-30 | 1 | -0/+4 |
| | * | | | | | | Detect Tokens are weird | Thomas | 2018-07-30 | 1 | -26/+31 |
| | * | | | | | | Merge branch 'develop' into network-remove-provider-engine | Thomas | 2018-07-26 | 355 | -3796/+10262 |
| | |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | | test - unit - remove tests for obsolete methods | kumavis | 2018-07-04 | 1 | -52/+0 |
| | * | | | | | | deps - update lock | kumavis | 2018-07-04 | 1 | -2/+26 |
| | * | | | | | | test - run ganache rpc without vm errors | kumavis | 2018-07-04 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-07-04 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-07-04 | 134 | -773/+800 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | test - e2e - contract test - add logs | kumavis | 2018-07-04 | 1 | -7/+9 |
| | * | | | | | | | | test - e2e - fix missing import | kumavis | 2018-07-03 | 1 | -1/+1 |
| | * | | | | | | | | Merge branch 'develop' into network-remove-provider-engine | kumavis | 2018-07-03 | 2 | -3/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #4711 from alextsg/network-remove-provider-engine | kumavis | 2018-07-03 | 1 | -2/+15 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fix notice screen incorrectly disabling Accept button after multiple notices | Alexander Tseung | 2018-07-03 | 1 | -2/+15 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | test - e2e - move timings | kumavis | 2018-07-03 | 1 | -1/+1 |
| | * | | | | | | | | | test - e2e-beta - update some api calls | kumavis | 2018-07-03 | 1 | -6/+4 |
| | * | | | | | | | | | dep - automated package-lock fixes | kumavis | 2018-07-03 | 1 | -4/+42 |
| | * | | | | | | | | | deps - update package-lock | kumavis | 2018-07-03 | 1 | -190/+336 |
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-07-03 | 100 | -32518/+33751 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | lint - fix lint for network | kumavis | 2018-06-13 | 3 | -3/+0 |
| | * | | | | | | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi... | kumavis | 2018-06-13 | 5 | -41/+8 |
| | * | | | | | | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on error | kumavis | 2018-06-13 | 1 | -22/+28 |
| | * | | | | | | | | | | test - e2e - beta - from import - fix missing startup phase | kumavis | 2018-06-12 | 1 | -0/+3 |
| | * | | | | | | | | | | test - e2e - beta - dont select localhost as it is already set | kumavis | 2018-06-12 | 2 | -20/+1 |
| | * | | | | | | | | | | test - e2e - extensionUri should point to home.html | kumavis | 2018-06-12 | 1 | -2/+2 |
| | * | | | | | | | | | | test - e2e - remove usage of extensionId from tests | kumavis | 2018-06-12 | 4 | -28/+12 |
| | * | | | | | | | | | | test - e2e - fix incomplete setup phase | kumavis | 2018-06-12 | 2 | -2/+5 |
| | * | | | | | | | | | | test - e2e - properly export setupBrowserAndExtension | kumavis | 2018-06-12 | 1 | -0/+1 |
| | * | | | | | | | | | | test - e2e - more factoring of test setup | kumavis | 2018-06-12 | 5 | -64/+27 |
| | * | | | | | | | | | | test - e2e - use fs-extra instead of fs | kumavis | 2018-06-12 | 1 | -1/+1 |
| | * | | | | | | | | | | test - e2e - factor out setup phase + rename METAMASK_CONFIG to METAMASK_TEST... | kumavis | 2018-06-12 | 4 | -47/+51 |
| | * | | | | | | | | | | test - e2e - inject metamask config to point at localhost | kumavis | 2018-06-12 | 5 | -23/+61 |
| | * | | | | | | | | | | lint - controllers - whitepace fix | kumavis | 2018-06-12 | 1 | -5/+5 |
| | * | | | | | | | | | | test - e2e - reduce browser-specific code | kumavis | 2018-06-12 | 1 | -20/+13 |
| | * | | | | | | | | | | network - provider - infura - use block-reemit middleware | kumavis | 2018-06-08 | 3 | -28/+29 |
| | * | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-06-08 | 168 | -1486/+7741 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-06-07 | 30 | -85/+300 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 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 | 88 | -416/+1325 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | test - unit - tx-controller - fix blockTracker stub | kumavis | 2018-05-29 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-29 | 8 | -15/+1013 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | test - unit - pending-tx-tracker - update method name | kumavis | 2018-05-29 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | test - unit - nonce-tracker - fix blockTracker stub | kumavis | 2018-05-29 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | 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 | 7 | -153/+78 |
| | * | | | | | | | | | | | | | | 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 |
| | * | | | | | | | | | | | | | | test - unit - metamask-controller - remove log | kumavis | 2018-05-26 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | test - unit - code style nitpick | kumavis | 2018-05-25 | 1 | -1/+2 |
| | * | | | | | | | | | | | | | | test - unit - metamask-controller - fix many bugs in tests | kumavis | 2018-05-25 | 2 | -33/+61 |
| | * | | | | | | | | | | | | | | test - unit - run ganache-server in background | kumavis | 2018-05-25 | 1 | -0/+7 |
| | * | | | | | | | | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using in... | kumavis | 2018-05-25 | 1 | -31/+29 |
| | * | | | | | | | | | | | | | | test - unit - move fetch polyfill to helper | kumavis | 2018-05-25 | 3 | -6/+3 |
| | * | | | | | | | | | | | | | | test - unit - metamask-controller - polyfill global.fetch | kumavis | 2018-05-25 | 1 | -2/+4 |
| | * | | | | | | | | | | | | | | deps - bump eth-json-rpc-middleware for fetch bugfix | kumavis | 2018-05-25 | 2 | -4/+4 |
| | * | | | | | | | | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet middleware... | kumavis | 2018-05-25 | 1 | -1/+13 |
| | * | | | | | | | | | | | | | | test - remove .only from unit tests | kumavis | 2018-05-25 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | provider - update wallet hooks for new wallet middleware | kumavis | 2018-05-25 | 6 | -68/+114 |
| | * | | | | | | | | | | | | | | deps - bump json-rpc modules for bugfixes | kumavis | 2018-05-25 | 2 | -187/+403 |
| | * | | | | | | | | | | | | | | 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 | 3 | -40/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker | kumavis | 2018-05-24 | 3 | -40/+44 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/... | frankiebee | 2018-05-23 | 122 | -17010/+4318 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | transactions - update pending-tx-tracker to use the new block tracker | frankiebee | 2018-05-23 | 2 | -8/+19 |
| | | | * | | | | | | | | | | | | | | | remove dependance on the even tx:confirmed | frankiebee | 2018-05-23 | 1 | -2/+6 |
| | | | * | | | | | | | | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ... | frankiebee | 2018-05-23 | 1 | -32/+21 |
| | * | | | | | | | | | | | | | | | | | deps - bump eth-block-tracker for bugfix | kumavis | 2018-05-24 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | deps - eth-json-rpc-filters@2.0.0 | kumavis | 2018-05-23 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | deps - eth-block-tracker@4.0.1 | kumavis | 2018-05-23 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network... | kumavis | 2018-05-23 | 121 | -16993/+4309 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | recent-blocks - fix backfill blockNumber tracking | kumavis | 2018-05-17 | 1 | -3/+2 |
| | * | | | | | | | | | | | | | | | | test - unit - network - get providerProxy via public method | kumavis | 2018-05-17 | 1 | -4/+5 |
| | * | | | | | | | | | | | | | | | | deps - bump some bugfixes | kumavis | 2018-05-17 | 1 | -2/+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 | 5 | -7/+7 |
| | * | | | | | | | | | | | | | | | | docs - remove references to web3-provider-engine | kumavis | 2018-05-17 | 2 | -4/+1 |
| | * | | | | | | | | | | | | | | | | deps - remove web3-provider-engine | kumavis | 2018-05-17 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | | | 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 | 10 | -75/+224 |
| * | | | | | | | | | | | | | | | | | Merge pull request #5061 from MetaMask/greenkeeper/@zxing/library-0.8.0 | Bruno Barbieri | 2018-08-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | fix(package): update @zxing/library to version 0.8.0 | greenkeeper[bot] | 2018-08-14 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | Merge pull request #5076 from MetaMask/v4.9.3 | Dan Finlay | 2018-08-16 | 2 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | v4.9.3v4.9.3 | Thomas | 2018-08-16 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | Bump Changelog | Thomas | 2018-08-16 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #5037 from MetaMask/master | Dan Finlay | 2018-08-16 | 2 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1 | Dan Finlay | 2018-08-10 | 36 | -32551/+32635 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into v4.9.2 | Thomas Huang | 2018-08-10 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #4954 from MetaMask/v4.9.0 | Dan Finlay | 2018-08-08 | 487 | -36876/+44757 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | Bump Changelog | Thomas | 2018-08-07 | 1 | -1/+3 |
| | | * | | | | | | | | | | | | | | | | | | | v4.9.0 Release | Thomas | 2018-08-07 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | | | | | Update Changelog | Thomas | 2018-08-07 | 1 | -5/+10 |
| | | | * | | | | | | | | | | | | | | | | | | Bump Changelog | Thomas | 2018-08-10 | 1 | -0/+4 |
| | | | * | | | | | | | | | | | | | | | | | | v4.9.2 | Thomas | 2018-08-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #5059 from MetaMask/e2e-tests-more-reliable | Dan J Miller | 2018-08-15 | 5 | -20/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Remove unnecessary else in test/e2e/beta/contract-test/contract.js | Dan Miller | 2018-08-15 | 1 | -1/+2 |
| | * | | | | | | | | | | | | | | | | | | | | | Add explicit waits for submitted status for some txs initiated from test dapp. | Dan Miller | 2018-08-15 | 1 | -0/+7 |
| | * | | | | | | | | | | | | | | | | | | | | | Reload e2e beta test browser if initial screen doesn't load. | Dan Miller | 2018-08-15 | 2 | -2/+16 |
| | * | | | | | | | | | | | | | | | | | | | | | Increase timeout on wait for contract status update in metamask-beta-ui-spec | Dan Miller | 2018-08-15 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | Add missing awaits and/or missing wait timeouts in test/e2e/beta/metamask-bet... | Dan Miller | 2018-08-14 | 1 | -9/+9 |
| | * | | | | | | | | | | | | | | | | | | | | | Make deployment states in test/e2e/beta/contract-test/contract.js more explicit | Dan Miller | 2018-08-14 | 2 | -5/+6 |
| | * | | | | | | | | | | | | | | | | | | | | | Improve error handling in assertElementNotPresent of test/e2e/beta/helpers.js | Dan Miller | 2018-08-14 | 1 | -5/+7 |
| | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | | | | | | | | | * | fix merge conflicts | brunobar79 | 2018-08-18 | 49 | -2934/+1358 |
| | | | | | | | | | | | | | | | | | | | | * | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | * | fix e2e tests | brunobar79 | 2018-08-17 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | * | ui ready | brunobar79 | 2018-08-17 | 4 | -11/+42 |
| | | | | | | | | | | | | | | | | | | | | * | connect screen ready | brunobar79 | 2018-08-17 | 5 | -32/+131 |
| | | | | | | | | | | | | | | | | | | | | * | change Metamask for MetaMask | brunobar79 | 2018-08-15 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | * | update package-lock.json | brunobar79 | 2018-08-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | * | Merge branch 'ledger-support' of github.com:MetaMask/metamask-extension into ... | brunobar79 | 2018-08-15 | 20 | -33/+66 |
| | | | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | | | * | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-15 | 20 | -33/+66 |
| | | | | | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5060 from MetaMask/bignumber-string | Dan Finlay | 2018-08-15 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Cast arguments for new Bignumbers() to string. | Dan Miller | 2018-08-15 | 3 | -4/+4 |
| | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #5058 from whymarrh/fix-words | Whymarrh Whitby | 2018-08-14 | 14 | -26/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4961 from whymarrh/download-seed-phrase | Whymarrh Whitby | 2018-08-14 | 3 | -3/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Add link to download seed words in new UI | Whymarrh Whitby | 2018-08-14 | 2 | -0/+27 |
| | * | | | | | | | | | | | | | | | | | | | | Add exportAsFile optional type argument | Whymarrh Whitby | 2018-08-14 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | | Fix casing of 1Password | Whymarrh Whitby | 2018-08-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / / / / / / | |||||
| | | | | | | | | | | | | | | | | | | * / | use eth-ledger-bridge-keyring from npm | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |/ | |||||
| | | | | | | | | | | | | | | | | | | * | remove console logs | brunobar79 | 2018-08-15 | 2 | -8/+2 |
| | | | | | | | | | | | | | | | | | | * | fixed unit tests | brunobar79 | 2018-08-15 | 2 | -5/+15 |
| | | | | | | | | | | | | | | | | | | * | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | * | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | * | ui fixes | brunobar79 | 2018-08-15 | 5 | -34/+46 |
| | | | | | | | | | | | | | | | | | | * | fix tx tests | brunobar79 | 2018-08-14 | 4 | -14/+25 |
| | | | | | | | | | | | | | | | | | | * | legacy and new hd path working | brunobar79 | 2018-08-14 | 5 | -25/+53 |
| | | | | | | | | | | | | | | | | | | * | good progress adding paths | brunobar79 | 2018-08-14 | 8 | -67/+140 |
| | | | | | | | | | | | | | | | | | | * | remove ledger lib | brunobar79 | 2018-08-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | * | clean up | brunobar79 | 2018-08-12 | 4 | -43/+4 |
| | | | | | | | | | | | | | | | | | | * | this should be ready to go | brunobar79 | 2018-08-12 | 4 | -323/+60 |
| | | | | | | | | | | | | | | | | | | * | clean up | brunobar79 | 2018-08-12 | 1 | -45/+36 |
| | | | | | | | | | | | | | | | | | | * | message signing works | brunobar79 | 2018-08-12 | 3 | -6/+19 |
| | | | | | | | | | | | | | | | | | | * | 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 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | * | able to add accounts | brunobar79 | 2018-08-11 | 4 | -40/+107 |
| | | | | | | | | | | | | | | | | | | * | iframe communication working | brunobar79 | 2018-08-11 | 8 | -67/+209 |
| | | | | | | | | | | | | | | | | | | * | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 10 | -103/+247 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 27 | -22/+662 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | add comment | brunobar79 | 2018-08-09 | 1 | -0/+5 |
| | * | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-09 | 4 | -32063/+32154 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | add submit button type | brunobar79 | 2018-08-09 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-08 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-08-08 | 1 | -4/+21 |
| | * | | | | | | | | | | | | | | | | | | code review changes | brunobar79 | 2018-08-08 | 5 | -12/+63 |
| | * | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-08 | 39 | -1284/+1387 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | restore qr | brunobar79 | 2018-08-04 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-04 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | fixed issue with input | brunobar79 | 2018-08-04 | 3 | -2/+6 |
| | * | | | | | | | | | | | | | | | | | | | clear qr code data before scanning | brunobar79 | 2018-08-04 | 2 | -23/+25 |
| | * | | | | | | | | | | | | | | | | | | | design complete | brunobar79 | 2018-08-04 | 8 | -45/+166 |
| | * | | | | | | | | | | | | | | | | | | | fix | brunobar79 | 2018-08-01 | 1 | -1/+6 |
| | * | | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-01 | 1 | -15/+14 |
| | * | | | | | | | | | | | | | | | | | | | lint | brunobar79 | 2018-08-01 | 1 | -2/+0 |
| | * | | | | | | | | | | | | | | | | | | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 10 | -56/+179 |
| | * | | | | | | | | | | | | | | | | | | | send to fullscreen if no permission from popup | brunobar79 | 2018-07-31 | 5 | -29/+48 |
| | * | | | | | | | | | | | | | | | | | | | kill camera stream when unmouting | brunobar79 | 2018-07-31 | 1 | -1/+4 |
| | * | | | | | | | | | | | | | | | | | | | copy | brunobar79 | 2018-07-31 | 2 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | clean up css | brunobar79 | 2018-07-31 | 3 | -30/+58 |
| | * | | | | | | | | | | | | | | | | | | | use existing modals | brunobar79 | 2018-07-31 | 12 | -235/+177 |
| | * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code... | brunobar79 | 2018-07-31 | 10 | -11/+100 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | fix unit tests | brunobar79 | 2018-07-27 | 1 | -0/+2 |
| | * | | | | | | | | | | | | | | | | | | | | fix dependencies | brunobar79 | 2018-07-27 | 3 | -4/+5 |
| | * | | | | | | | | | | | | | | | | | | | | fix linting errors | brunobar79 | 2018-07-27 | 4 | -4/+4 |
| | * | | | | | | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-07-27 | 5 | -4/+2 |
| | * | | | | | | | | | | | | | | | | | | | | restore platform/extension.js | brunobar79 | 2018-07-27 | 1 | -5/+57 |
| | * | | | | | | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-27 | 28 | -55/+531 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | added webrtc-adapter for browser compat | brunobar79 | 2018-07-27 | 3 | -0/+24 |
| | * | | | | | | | | | | | | | | | | | | | | | fully working without tweaking ext. permission | brunobar79 | 2018-07-27 | 6 | -66/+7 |
| | * | | | | | | | | | | | | | | | | | | | | | working without permission issues | brunobar79 | 2018-07-27 | 4 | -44/+64 |
| | * | | | | | | | | | | | | | | | | | | | | | fix spinner and qr icon | brunobar79 | 2018-07-25 | 2 | -2/+6 |
| | * | | | | | | | | | | | | | | | | | | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 |
| | * | | | | | | | | | | | | | | | | | | | | | working without injection | brunobar79 | 2018-07-25 | 13 | -87/+231 |
| | * | | | | | | | | | | | | | | | | | | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 10 | -20/+29 |
| | * | | | | | | | | | | | | | | | | | | | | | camera working back and forth | brunobar79 | 2018-07-24 | 8 | -95/+116 |
| | * | | | | | | | | | | | | | | | | | | | | | fixes | brunobar79 | 2018-07-24 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | | | | | added camera snippet injection to inpage.js | brunobar79 | 2018-07-24 | 1 | -0/+39 |
| | * | | | | | | | | | | | | | | | | | | | | | added instascan pkg | brunobar79 | 2018-07-24 | 2 | -7/+77 |
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5020 from MetaMask/FixMigration28v4.9.2v4.9.1 | Dan Finlay | 2018-08-10 | 2 | -2/+48 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | tests for migration 28 | Esteban MIno | 2018-08-10 | 1 | -0/+46 |
| | * | | | | | | | | | | | | | | | | | | | | | | fix migration 28 | Esteban MIno | 2018-08-10 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5022 from MetaMask/sentry-release-version | Jenny Pollack | 2018-08-10 | 2 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | sentry - change releaseVersion to release | Jenny Pollack | 2018-08-10 | 2 | -4/+4 |
| |/ / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5017 from MetaMask/v4.9.1 | Dan Finlay | 2018-08-10 | 2 | -10/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | v4.9.1 | Thomas | 2018-08-10 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | | Bump Changelog | Thomas | 2018-08-10 | 1 | -0/+6 |
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into develop | Thomas | 2018-08-10 | 4 | -0/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into develop | Thomas | 2018-08-10 | 2 | -9/+14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | remove duplicate template (#5016) | bobby dresser | 2018-08-10 | 1 | -17/+0 |
| | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | Create issue templates (#4972) | bobby dresser | 2018-08-10 | 4 | -0/+74 |
| |/ / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5010 from eduadiez/develop | Thomas Huang | 2018-08-10 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 2 | -2/+2 |
| | | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethquery | Dan J Miller | 2018-08-09 | 5 | -6/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Fix lint error in tx-list | Whymarrh Whitby | 2018-08-09 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | | | | | | Get nonce for showing retry button using ethQuery transaction count. | Dan Miller | 2018-08-09 | 5 | -6/+51 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4986 from MetaMask/approve-calc-token-decimals | Dan J Miller | 2018-08-09 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Use token decimals when calculating confirm screen amount for token approvals. | Dan Miller | 2018-08-08 | 1 | -2/+8 |
| | | |_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Update eth-keyring-controller and eth-hd-keyring versions (#4989) | Paul Bouchon | 2018-08-09 | 2 | -36072/+32114 |
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4988 from MetaMask/remove-engine-restrictions | Bruno Barbieri | 2018-08-09 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | remove engine restrictions | brunobar79 | 2018-08-08 | 1 | -1/+0 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge pull request #4982 from MetaMask/sig-version-fix | Dan Finlay | 2018-08-08 | 2 | -1458/+5519 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |