Commit Graph

8575 Commits (0ba6f7d9bb5c2183d8a370fd0955e18d45616207)
 

Author SHA1 Message Date
Esteban MIno 4e6c71e969 Merge branch 'develop' into WatchTokenFeature 6 years ago
Esteban MIno 6ccf2811e7 unit tests for watchAsset 6 years ago
Dan Finlay babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider 6 years ago
Dan Finlay a485516488
Merge pull request #5118 from MetaMask/provider2-bugfix 6 years ago
kumavis 13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 6 years ago
brunobar79 1286ddaaed update package-lock 6 years ago
brunobar79 90886c5e05 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 6 years ago
Dan J Miller 4704f3598e
Merge pull request #5108 from MetaMask/run-ganache-with-blocktime-flag 6 years ago
Dan Miller 9bd0ce46e8 Remove unnecessary checks and user actions in metamask-beta-ui.spec 6 years ago
Jerome de Tychey 92af1ee95a
Typo in "send" translation 6 years ago
Dan Miller 1718b83d20 Run ganache with a blocktime flag for npm:run:ganache:start. 6 years ago
Esteban MIno 3a3732eb24 returning error in watchAsset 6 years ago
Esteban MIno 6fa889abcb refactor watchToken related functions 6 years ago
Bruno Barbieri 282820c93a
Merge pull request #5112 from MetaMask/hardware-wallet-fixes 6 years ago
brunobar79 54021fd90b fix unit tests 6 years ago
brunobar79 cee5783283 fix hardware wallets account name 6 years ago
brunobar79 34e3ec6092 fix account removal 6 years ago
brunobar79 0e1605b082 fix comment 6 years ago
brunobar79 ab7eb73ecc fix merge conflicts 6 years ago
Esteban MIno 68c1b4c170 watchAsset returns result wether token was added or not 6 years ago
brunobar79 6e813db473 update package-lock 6 years ago
Dan Finlay 6ce119d1fb Move inpage-provider and port-stream outside 6 years ago
Esteban MIno 81cd29df43 Merge branch 'develop' into WatchTokenFeature 6 years ago
Dan Finlay 887cad973f
Merge pull request #5095 from MetaMask/i4953-update-logo 6 years ago
Dan Finlay 097c1e90e3
Merge pull request #5084 from MetaMask/ledger-support-without-provider 6 years ago
Alexander Tseung cec87a5b2c Update logo wordmark 6 years ago
kumavis fb5faec372
Merge pull request #5090 from whymarrh/fix-ci 6 years ago
Whymarrh Whitby 00906937a1 ci: Use workspaces instead of caches for passing data downstream 6 years ago
Whymarrh Whitby 8f834ed87d ci: Install any npm@6 6 years ago
Whymarrh Whitby 2185197ef6 ci: Use Firefox 61.0.2 6 years ago
Whymarrh Whitby 7b89d3d473 ci: Disable Firefox updates 6 years ago
Whymarrh Whitby e493efb123 ci: Don't cache Firefox install 6 years ago
Dan Finlay c7f5436143
Merge pull request #5050 from MetaMask/ledger-support 6 years ago
Bruno Barbieri bd904c86f6
Merge branch 'develop' into ledger-support 6 years ago
Dan Finlay 755369e4e4
Merge pull request #4898 from dmvt/multi-account-restore 6 years ago
brunobar79 0391ec37c8 update package-lock.json 6 years ago
brunobar79 992e7f1b5a fix merge conflicts 6 years ago
kumavis 9268c4ed54
Merge pull request #5079 from MetaMask/v4.9.3 6 years ago
Dan Matthews df799d7fd6 Restores accounts until one with a zero balance is found 6 years ago
brunobar79 51e4a6d335 fix ledger affiliate link 6 years ago
brunobar79 b369560569 fix e2e tests 6 years ago
brunobar79 285814646f ui ready 6 years ago
Esteban MIno dbab9a007f delete according image when token added with watchToken deleted 6 years ago
brunobar79 2ea05e303d connect screen ready 6 years ago
Esteban MIno bb868f5834 correct behavior when notification is closed when popup 6 years ago
Esteban MIno 2ace30bcd1 WIP 6 years ago
Esteban MIno a36ea0e232 show watch asset image from hide token modal 6 years ago
Anatoli Babenia 59ba2d2785 info.js Remove width element to fix email layout (#4588) 6 years ago
Esteban MIno 5289a36664 change watchAsset to new spec for type ERC20 6 years ago
Dan Finlay 955ec2dca6
Merge pull request #4279 from MetaMask/network-remove-provider-engine 6 years ago