Commit Graph

4162 Commits (833da191c37db5b5b470c69a6d4d438ff4719fec)
 

Author SHA1 Message Date
kumavis 15195bca75 deps - bump provider engine for block tracker 7 years ago
Dan Finlay f128240e7f Fix test references 7 years ago
Dan Finlay 128cf40f91 Fix accont-tracker merge bug 7 years ago
Dan Finlay f01b0a818b Fix account-tracker references 7 years ago
Dan Finlay f9d2f523c6 Merge branch 'master' into AddBalanceController 7 years ago
Dan Finlay d2a747e57e Fix computed-balances controller reference 7 years ago
Dan Finlay 11c8c07bfc Refactor eth-store into account-tracker 7 years ago
kumavis 2ca2df1832 deps - bump eth-block-tracker 7 years ago
Dan Finlay 977405fc7d Remove dead code from eth-store 7 years ago
Dan Finlay 08b36b9b58 Allow metamaskController to define keyring types 7 years ago
Dan Finlay 4c971ebfd1 Define encryptor in constructor params instead of platform object 7 years ago
Dan Finlay e9b7fd9018 Patch security update 7 years ago
kumavis 0a5ae39509 bug - fix event emitter mem leak warning 7 years ago
Dan Finlay b25d4d5cfb Add platform docs including encryptor param 7 years ago
Dan Finlay bd117d6b71 Merge branch 'master' into ConfigurableEncryption 7 years ago
Dan Finlay e9043f22df Allow custom encryptor to be passed to MetaMaskController and KeyringControllers. 7 years ago
kumavis 73d9434ad6 Merge pull request #2104 from MetaMask/AddPlatformGuide 7 years ago
Dan Finlay 8a874824a8 Version 3.10.3 7 years ago
frankiebee 14b9d16ece platforms: put context for extension in platform extension class 7 years ago
Kevin Serrano b22783a223
Merge branch 'master' into new-currency-test 7 years ago
frankiebee 418f01411e mascara: turn off background 7 years ago
Frankie 9bd55f4897 Merge pull request #2129 from MetaMask/json-rpc-engine-bump 7 years ago
frankiebee daeb7f6ad3 update metamascara 7 years ago
frankiebee 4e57cdf8b3 stub platform 7 years ago
kumavis 3a3e1511e5 changelog - add note on filter fixes 7 years ago
kumavis 77e02d264a Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-engine-bump 7 years ago
kumavis b979c6a2f3 deps - bump json-rpc-middleware-stream 7 years ago
kumavis d2ded61cc9 deps - bump json-rpc-engine 7 years ago
frankiebee 90482934f1 Merge branch 'master' into breakout-mascara 7 years ago
frankiebee bfd75107f1 add context to platform to not have X-Metamask-Origin in mascara 7 years ago
Frankie 166bd55a43 Merge pull request #2126 from MetaMask/v3.10.2-1 7 years ago
kumavis 0424ab3e48 v3.10.2 - changelog 7 years ago
kumavis 51b40adecd v3.10.2 7 years ago
frankiebee 29dd81d029 require metamascara 7 years ago
Kevin Serrano bd8428e9ed
Comply with current currency API and add additional styling. 7 years ago
Frankie 7094d96529 Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetries 7 years ago
Dan Finlay 92e738d17c Bump changelog 7 years ago
Dan Finlay 2b7b1db851 Do not mark a retry tx failed that has been broadcast successfully 7 years ago
Frankie 6204afb156 Merge pull request #2119 from MetaMask/mascara-tests2 7 years ago
kumavis eaa85f283d tests - integration - re-add mascara to normal run 7 years ago
kumavis 30874e074e Merge pull request #2118 from MetaMask/mascara-tests 7 years ago
kumavis 9f665d8eda test - integration - bump timeout 7 years ago
Frankie bbae8d975e Merge pull request #2098 from MetaMask/mascara-tests 7 years ago
kumavis 784510f89f tests - integration - remove failing mascara integration tests from normal run until fixed 7 years ago
Kevin Serrano 51cebcc173
Fix the property query for new currencies. 7 years ago
kumavis c9ac8f0919 Merge pull request #2117 from MetaMask/Version-3.10.1 7 years ago
Kevin Serrano 899a12cb2a
Fix the changelog again. 7 years ago
Kevin Serrano 90e0c10dc2
Add additional attribution to changelog. 7 years ago
Roman Rodov 9af52ee1c5
Another merge conflict resolved. 7 years ago
Roman Rodov f6f7798828
Resolve merge conflicts for currency sort merge. 7 years ago