Commit Graph

4011 Commits (16ba2e6a30fc55bb1601d96696bd08ae177f631e)
 

Author SHA1 Message Date
Kevin Serrano 16ba2e6a30
Merge branch 'master' into new-currency-test 7 years ago
kumavis 50633fbba6 Merge pull request #2170 from MetaMask/greenkeeper/sinon-4.0.0 7 years ago
greenkeeper[bot] e52d52b22e chore(package): update sinon to version 4.0.0 7 years ago
kumavis 9bbb0ca1ea Merge pull request #2143 from MetaMask/Version-3.10.3 7 years ago
kumavis 95afdfe368 Merge pull request #2145 from MetaMask/ConfigurableEncryption 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
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
Kevin Serrano b22783a223
Merge branch 'master' into new-currency-test 7 years ago
Frankie 9bd55f4897 Merge pull request #2129 from MetaMask/json-rpc-engine-bump 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
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
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
Dan Finlay c90c904f95 Version 3.10.1 7 years ago
Dan Finlay fa50bf9587 Merge pull request #2075 from MetaMask/mixed-case 7 years ago
Kevin Serrano 51f0911f87
Merge branch 'master' into new-currency-test 7 years ago
Dan Finlay c463647ad7 Merge pull request #2080 from MetaMask/fix-tooltip 7 years ago
Dan Finlay 545cbbebb9 Merge branch 'master' into fix-tooltip 7 years ago
Dan Finlay 67accea693 Merge branch 'master' into mixed-case 7 years ago
Dan Finlay 99856189ed Merge pull request #2093 from MetaMask/max-validation 7 years ago
kumavis 5d01ca10e4 tests - mascara - increase timeout before test starts 7 years ago
kumavis a9900be085 test - mascara - move skip reload test flag 7 years ago
kumavis 0ab37b52c0 mascara - proxy - small cleanup 7 years ago
kumavis d2d6f6a858 tests - integration - add mascara to integration test run 7 years ago
kumavis 779e973b45 tests - integration - mascara - small cleanup and timeout adjustments 7 years ago
frankiebee c5a2527c17 set time if platform is mascara 7 years ago