Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -95/+167 |
* | fix merge conflicts | brunobar79 | 2018-09-11 | 4 | -4/+8 |
|\ | |||||
| * | Merge pull request #5212 from whymarrh/yo-delete | Whymarrh Whitby | 2018-09-07 | 1 | -3/+0 |
| |\ | |||||
| | * | Remove unused .yo-rc.json file | Whymarrh Whitby | 2018-09-06 | 1 | -3/+0 |
| * | | Merge pull request #5213 from whymarrh/regen-lockfile | Whymarrh Whitby | 2018-09-07 | 1 | -48/+125 |
| |\ \ | | |/ | |/| | |||||
| | * | Regenerate lockfile | Whymarrh Whitby | 2018-09-06 | 1 | -48/+125 |
| |/ | |||||
| * | Use correct loading message when connecting to Kovan (#5189) | Eugene Marinelli | 2018-09-06 | 2 | -1/+2 |
* | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -49/+126 |
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 173 | -2562/+4615 |
|\| | |||||
| * | Merge pull request #5206 from whymarrh/fix-send-content-tests | Whymarrh Whitby | 2018-09-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix assertion of missing child component | Whymarrh Whitby | 2018-09-06 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #5188 from taobun/develop | Dan J Miller | 2018-09-05 | 3 | -3/+3 |
| |\ | |||||
| | * | fix check valid decimals code in new ui | bunoi | 2018-09-05 | 1 | -1/+1 |
| | * | edit decimal check in old-ui/ | bunoi | 2018-09-03 | 2 | -2/+2 |
| * | | Merge pull request #5167 from MetaMask/fix-watcAsset-images | Dan Finlay | 2018-09-05 | 16 | -11/+54 |
| |\ \ | |||||
| | * | | add assetImages to development states | Esteban MIno | 2018-08-31 | 3 | -0/+3 |
| | * | | balance components using selectors | Esteban MIno | 2018-08-31 | 3 | -5/+5 |
| | * | | fix integration test for asset images selectors | Esteban MIno | 2018-08-31 | 2 | -2/+2 |
| | * | | fix watched tokens images showing in tx list | Esteban MIno | 2018-08-31 | 4 | -4/+16 |
| | * | | fix watched asset image rendering on confirm transaction header | Esteban MIno | 2018-08-30 | 2 | -1/+5 |
| | * | | fix images for watched tokens | Esteban MIno | 2018-08-30 | 8 | -4/+28 |
| * | | | Merge pull request #5129 from MetaMask/add-sidebar-component | Dan J Miller | 2018-09-05 | 23 | -76/+267 |
| |\ \ \ | |||||
| | * | | | Adds sidebar component and refactors slide in wallet view sidebar to use it. | Dan Miller | 2018-08-29 | 24 | -76/+290 |
| * | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data | Dan J Miller | 2018-09-04 | 11 | -4/+77 |
| |\ \ \ \ | |||||
| | * | | | | Adds feature flag toggle for the hex data row on the send screen. | Dan Miller | 2018-08-27 | 11 | -4/+77 |
| * | | | | | Merge pull request #5115 from jdetychey/patch-1 | Dan J Miller | 2018-09-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Typo in "send" translation | Jerome de Tychey | 2018-08-22 | 1 | -1/+1 |
| * | | | | | | Merge pull request #5191 from eugeneiiim/patch-2 | Dan J Miller | 2018-09-04 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix CHANGELOG.md formatting | Eugene Marinelli | 2018-09-04 | 1 | -4/+4 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0 | Dan J Miller | 2018-09-04 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | chore(package): update enzyme-adapter-react-15 to version 1.0.6 | greenkeeper[bot] | 2018-08-25 | 1 | -1/+1 |
| | * | | | | | chore(package): update enzyme to version 3.4.4 | greenkeeper[bot] | 2018-08-25 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge pull request #5176 from MetaMask/BumpTokenAbi | Dan Finlay | 2018-08-31 | 2 | -1/+24 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Bump human-standard-token-abi version for DAI support | Dan Finlay | 2018-08-31 | 2 | -1/+24 |
| |/ / / / | |||||
| * | | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinner | Alexander Tseung | 2018-08-29 | 4 | -7/+20 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Fix infinite spinner on failed transactions | Alexander Tseung | 2018-08-29 | 4 | -7/+20 |
| * | | | | Merge pull request #4606 from MetaMask/WatchTokenFeature | Bruno Barbieri | 2018-08-29 | 24 | -6184/+6858 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | fix conflicts | Esteban MIno | 2018-08-29 | 123 | -2426/+3454 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #5121 from MetaMask/i5099-approve | Alexander Tseung | 2018-08-28 | 1 | -29/+87 |
| |\ \ \ \ | |||||
| | * | | | | Use eth-contract-metadata data if the token symbol or decimals fail on retrieval | Alexander Tseung | 2018-08-23 | 1 | -29/+87 |
| * | | | | | Merge pull request #4919 from MetaMask/refactor-tx-list | Dan Finlay | 2018-08-28 | 92 | -8116/+8102 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Revert changes to tx-list-items.json, and to mock getTransactionCount method ... | Dan Miller | 2018-08-28 | 2 | -2/+2 |
| | * | | | | Fix tests | Alexander Tseung | 2018-08-24 | 6 | -15/+25 |
| | * | | | | Fix naming, add eth.getCode check for actions, fix translations for statuses | Alexander Tseung | 2018-08-24 | 24 | -97/+85 |
| | * | | | | Reduce large timeouts | Alexander Tseung | 2018-08-24 | 1 | -6/+6 |
| | * | | | | Increase e2e timeouts for firefox | Alexander Tseung | 2018-08-24 | 1 | -7/+7 |
| | * | | | | Change "Outgoing" to "Sent Ether" or "Sent Token" | Alexander Tseung | 2018-08-24 | 4 | -8/+14 |
| | * | | | | Fix Firefox e2e tests | Alexander Tseung | 2018-08-24 | 1 | -2/+2 |
| | * | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 1 | -1/+1 |
| | * | | | | Update package-lock.json | Alexander Tseung | 2018-08-24 | 1 | -6126/+6121 |
| | * | | | | Add CurrencyDisplay and TokenCurrencyDisplay components | Alexander Tseung | 2018-08-24 | 14 | -74/+425 |
| | * | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 2 | -14/+6 |
| | * | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 1 | -1/+1 |
| | * | | | | Update retry transaction logic to use network nonce | Alexander Tseung | 2018-08-24 | 3 | -12/+46 |
| | * | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 7 | -91/+108 |
| | * | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 14 | -28/+47 |
| | * | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 2 | -8/+8 |
| | * | | | | Fix shapeshift transactions. Delete unused files | Alexander Tseung | 2018-08-24 | 9 | -689/+34 |
| | * | | | | Show token amounts in TransactionListItem for token transfers | Alexander Tseung | 2018-08-24 | 10 | -79/+75 |
| | * | | | | Fix tests | Alexander Tseung | 2018-08-24 | 1 | -10/+7 |
| | * | | | | Add retry button to TransactionListItem | Alexander Tseung | 2018-08-24 | 11 | -50/+175 |
| | * | | | | Code cleanup | Alexander Tseung | 2018-08-24 | 2 | -30/+14 |
| | * | | | | Use css grid for TransactionListItem for responsive layout | Alexander Tseung | 2018-08-24 | 9 | -72/+94 |
| | * | | | | Add tOrKey function to I18nProvider | Alexander Tseung | 2018-08-24 | 1 | -2/+9 |
| | * | | | | Update package-lock.json | Alexander Tseung | 2018-08-24 | 1 | -11/+28 |
| | * | | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 40 | -381/+936 |
| | * | | | | Delete unused files | Alexander Tseung | 2018-08-24 | 3 | -189/+0 |
| | * | | | | Add withMethodData HOC, add higher-order-component folder | Alexander Tseung | 2018-08-24 | 10 | -25/+75 |
| | * | | | | Add TransactionStatus component | Alexander Tseung | 2018-08-24 | 3 | -0/+67 |
| | * | | | | Add MenuBar component | Alexander Tseung | 2018-08-24 | 4 | -0/+97 |
| | * | | | | Add react-media package to prevent rendering wallet-view twice in the popup view | Alexander Tseung | 2018-08-24 | 2 | -1/+6 |
| | * | | | | Refactor home screen and remove unused files | Alexander Tseung | 2018-08-24 | 10 | -620/+116 |
| * | | | | | Merge pull request #5136 from MetaMask/remove-test-ens | Dan Finlay | 2018-08-25 | 2 | -2/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Do not resolve .test domains using ENS | bitpshr | 2018-08-25 | 2 | -2/+1 |
| |/ / / / | |||||
| * | | | | update Korean translation (#4630) | HackyMiner | 2018-08-24 | 1 | -124/+698 |
| * | | | | Merge pull request #5096 from evgeniuz/develop | Dan J Miller | 2018-08-23 | 4 | -11/+76 |
| |\ \ \ \ | |||||
| | * | | | | updated docs, small improvement of recent RPC rendering | Evgeniy Filatov | 2018-08-23 | 3 | -4/+6 |
| | * | | | | backported RPC improvements to oldui | Evgeniy Filatov | 2018-08-23 | 2 | -5/+6 |
| | * | | | | implemented improvements to RPC history | Evgeniy Filatov | 2018-08-23 | 3 | -5/+67 |
| | |/ / / | |||||
| * / / / | Minimum Browsers Supported (#4873) | Antoine Nauleau | 2018-08-23 | 2 | -2/+6 |
| |/ / / | |||||
| * | | | Merge pull request #5089 from MetaMask/i5085-ethcode | Alexander Tseung | 2018-08-23 | 5 | -37/+99 |
| |\ \ \ | |||||
| | * | | | Use eth_getCode to sort transaction action type | Alexander Tseung | 2018-08-23 | 5 | -37/+99 |
| * | | | | Merge pull request #4830 from MetaMask/page-container-tabs | Alexander Tseung | 2018-08-23 | 6 | -86/+125 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix code readability, use PureComponent over Component | Alexander Tseung | 2018-08-23 | 3 | -33/+23 |
| | * | | | Add tabs support for PageContainer | Alexander Tseung | 2018-08-23 | 6 | -84/+133 |
| |/ / / | |||||
| * | | | Merge pull request #5122 from MetaMask/lazy-account-tracker | Dan Finlay | 2018-08-23 | 2 | -2/+37 |
| |\ \ \ | |||||
| | * | | | Add todo to dedupe UI tracking in background | Dan Finlay | 2018-08-23 | 1 | -0/+1 |
| | * | | | account-tracker - only track blocks when there are activeControllerConnections | kumavis | 2018-08-22 | 2 | -2/+24 |
| | * | | | metamask controller - track active controller connections | kumavis | 2018-08-22 | 1 | -0/+12 |
| * | | | | Merge pull request #5102 from whymarrh/fix-account-export-pw-bug | Whymarrh Whitby | 2018-08-23 | 2 | -5/+20 |
| |\ \ \ \ | |||||
| | * | | | | Clear warnings when exportAccount succeeds | Whymarrh Whitby | 2018-08-23 | 1 | -4/+19 |
| | * | | | | Handle case where keyring is missing in AccountDetailsModal | Whymarrh Whitby | 2018-08-23 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge pull request #5066 from whymarrh/fix-key-export | Whymarrh Whitby | 2018-08-23 | 4 | -23/+119 |
| |\ \ \ \ | |||||
| | * | | | | Add test cases for MetaMaskController#_onKeyringControllerUpdate | Whymarrh Whitby | 2018-08-23 | 1 | -0/+71 |
| | * | | | | Update unlock logic to not overwrite existing selected address | Whymarrh Whitby | 2018-08-23 | 1 | -13/+29 |
| | * | | | | Don't re-render the export modal when the selected identity changes | Whymarrh Whitby | 2018-08-23 | 1 | -8/+17 |
| | * | | | | Update AccountModalContainer to accept a selectedIdentity prop | Whymarrh Whitby | 2018-08-23 | 1 | -2/+2 |
| | |/ / / | |||||
| * | | | | Merge pull request #5111 from MetaMask/sender-to-recipient2 | Alexander Tseung | 2018-08-23 | 13 | -107/+210 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add new variant for SenderToRecipient component | Alexander Tseung | 2018-08-23 | 13 | -107/+210 |
| |/ / / | |||||
| | * | | watchAsset small changes | Esteban MIno | 2018-08-28 | 2 | -2/+2 |
| | * | | add watchAsset CHANGELOG | Esteban MIno | 2018-08-24 | 1 | -0/+2 |
| | * | | delete web3.metamassk.watchAsset | Esteban MIno | 2018-08-24 | 1 | -17/+0 |
| | * | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 10 | -28/+28 |
| | * | | expose web3.metamask.watchAsset | Esteban MIno | 2018-08-23 | 1 | -0/+17 |
| | * | | fix integration tests on balance component with new watchAsset | Esteban MIno | 2018-08-22 | 1 | -3/+3 |
| | * | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-22 | 14 | -307/+100 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | unit tests for watchAsset | Esteban MIno | 2018-08-22 | 2 | -2/+110 |
| | * | | returning error in watchAsset | Esteban MIno | 2018-08-22 | 1 | -4/+12 |
| | * | | refactor watchToken related functions | Esteban MIno | 2018-08-21 | 4 | -46/+45 |
| | * | | watchAsset returns result wether token was added or not | Esteban MIno | 2018-08-21 | 3 | -10/+30 |
| | * | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-21 | 128 | -33151/+32991 |
| | |\ \ | |||||
| | * | | | delete according image when token added with watchToken deleted | Esteban MIno | 2018-08-17 | 4 | -22/+23 |
| | * | | | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 5 | -17/+24 |
| | * | | | WIP | Esteban MIno | 2018-08-17 | 3 | -3/+10 |
| | * | | | show watch asset image from hide token modal | Esteban MIno | 2018-08-16 | 3 | -13/+15 |
| | * | | | 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 | 3 | -11/+20 |
| | * | | | 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 | 8 | -48/+70 |
| | * | | | update method to metamask_watchToken | Esteban MIno | 2018-08-15 | 1 | -1/+1 |
| | * | | | show token address summary on old ui | Esteban MIno | 2018-08-08 | 1 | -10/+19 |
| | * | | | refactor unused code | Esteban MIno | 2018-08-08 | 6 | -18/+13 |
| | * | | | fix merge | Esteban MIno | 2018-08-08 | 1 | -0/+1 |
| | * | | | Merge branch 'develop' into WatchTokenFeature | Esteban Miño | 2018-08-08 | 38 | -1284/+1388 |
| | |\ \ \ | |||||
| | * | | | | watch token on old ui | Esteban MIno | 2018-08-08 | 5 | -0/+221 |
| | * | | | | wip watch token old ui | Esteban MIno | 2018-08-08 | 2 | -0/+1 |
| | * | | | | clean confirm add token component | Esteban MIno | 2018-08-07 | 2 | -6/+2 |
| | * | | | | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 8 | -12/+164 |
| | * | | | | fix duplicated action | Esteban MIno | 2018-08-07 | 1 | -6/+0 |
| | * | | | | add suggested token params validation | Esteban MIno | 2018-08-07 | 1 | -4/+25 |
| | * | | | | eth_watchToken working | Esteban MIno | 2018-08-04 | 6 | -3/+42 |
| | * | | | | popup initializing with suggested tokens | Esteban MIno | 2018-08-04 | 1 | -6/+2 |
| | * | | | | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 2 | -9/+4 |
| | * | | | | merge develop | Esteban MIno | 2018-08-04 | 477 | -36307/+43909 |
| | |\ \ \ \ | |||||
| | * | | | | | Improved rpc-engine usage | Dan Finlay | 2018-06-19 | 1 | -5/+1 |
| | * | | | | | Linted | Dan Finlay | 2018-06-19 | 1 | -0/+1 |
| | * | | | | | Get popup appearing when suggesting new token | Dan Finlay | 2018-06-19 | 2 | -1/+4 |
| | * | | | | | Begin letting UI show suggested tokens | Dan Finlay | 2018-06-19 | 3 | -8/+37 |
| | * | | | | | Begin adding eth_watchToken | Dan Finlay | 2018-06-19 | 3 | -0/+28 |
* | | | | | | | add port names blacklist | brunobar79 | 2018-08-23 | 1 | -0/+8 |
* | | | | | | | handle onDisconnect | brunobar79 | 2018-08-23 | 1 | -0/+4 |
* | | | | | | | fix merge conflicts | brunobar79 | 2018-08-23 | 11 | -5776/+1605 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #5109 from MetaMask/MoveOutInpageProvider | Dan Finlay | 2018-08-22 | 9 | -276/+72 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Move inpage-provider and port-stream outside | Dan Finlay | 2018-08-21 | 9 | -284/+87 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge pull request #5118 from MetaMask/provider2-bugfix | Dan Finlay | 2018-08-22 | 3 | -13/+20 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | bugfix - prevents old blocktracker from getting internal hooks migrated | kumavis | 2018-08-22 | 3 | -13/+20 |
| | |/ / / / / | |||||
* | | | | | | | update package-lock | brunobar79 | 2018-08-22 | 1 | -6/+14 |
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-08-22 | 4 | -18/+8 |
|\| | | | | | | |||||
| * | | | | | | Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag | Dan J Miller | 2018-08-22 | 2 | -15/+2 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Remove unnecessary checks and user actions in metamask-beta-ui.spec | Dan Miller | 2018-08-22 | 2 | -15/+2 |
| | * | | | | | Run ganache with a blocktime flag for npm:run:ganache:start. | Dan Miller | 2018-08-22 | 1 | -2/+2 |
| * | | | | | | Merge pull request #5112 from MetaMask/hardware-wallet-fixes | Bruno Barbieri | 2018-08-21 | 2 | -3/+6 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | fix unit tests | brunobar79 | 2018-08-21 | 1 | -1/+1 |
| | * | | | | | fix hardware wallets account name | brunobar79 | 2018-08-21 | 1 | -1/+3 |
| | * | | | | | fix account removal | brunobar79 | 2018-08-21 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | fix comment | brunobar79 | 2018-08-21 | 1 | -2/+0 |
* | | | | | | fix merge conflicts | brunobar79 | 2018-08-21 | 116 | -4856/+8379 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5095 from MetaMask/i4953-update-logo | Dan Finlay | 2018-08-21 | 8 | -56/+143 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Update logo wordmark | Alexander Tseung | 2018-08-19 | 8 | -56/+143 |
| * | | | | | Merge pull request #5090 from whymarrh/fix-ci | kumavis | 2018-08-18 | 5 | -151/+99 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 |