Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Make blockTracker an independent param | Dan Finlay | 2017-09-26 | 2 | -3/+6 | |
| * | | | | | | | | | | | Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin in... | Dan Finlay | 2017-09-26 | 5 | -9/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 5 | -9/+35 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Implemented feedback | Dan Finlay | 2017-09-26 | 3 | -20/+12 | |
| |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Made some requested changes | Dan Finlay | 2017-09-26 | 1 | -7/+7 | |
* | | | | | | | | | | | | | Merge pull request #2174 from MetaMask/i2162-TokenPrecision | Thomas Huang | 2017-09-27 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix token precision bug | Dan Finlay | 2017-09-27 | 2 | -1/+3 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | Remove keyring controller from project | Dan Finlay | 2017-09-23 | 5 | -764/+3 | |
| | | | * | | | | | | | | | Merge branch 'AddBalanceController' into BreakOutKeyringController | Dan Finlay | 2017-09-23 | 14 | -68/+333 | |
| | | | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Fix test references | Dan Finlay | 2017-09-23 | 2 | -3/+3 | |
| | * | | | | | | | | | | | Fix accont-tracker merge bug | Dan Finlay | 2017-09-23 | 1 | -0/+4 | |
| | * | | | | | | | | | | | Fix account-tracker references | Dan Finlay | 2017-09-23 | 3 | -13/+13 | |
| | * | | | | | | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-23 | 39 | -433/+434 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Fix computed-balances controller reference | Dan Finlay | 2017-09-23 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Refactor eth-store into account-tracker | Dan Finlay | 2017-09-23 | 4 | -16/+22 | |
| | * | | | | | | | | | | | | Remove dead code from eth-store | Dan Finlay | 2017-09-23 | 1 | -43/+1 | |
| | * | | | | | | | | | | | | Fix test | Dan Finlay | 2017-09-14 | 1 | -0/+5 | |
| | * | | | | | | | | | | | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-14 | 14 | -166/+292 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | Add computed balance to account detail view | Dan Finlay | 2017-09-14 | 6 | -10/+20 | |
| | * | | | | | | | | | | | | | Use computed balance for tx confirmation | Dan Finlay | 2017-09-14 | 2 | -4/+6 | |
| | * | | | | | | | | | | | | | Got pending balance updating correctly | Dan Finlay | 2017-09-14 | 3 | -81/+69 | |
| | * | | | | | | | | | | | | | Add state-labeled events to allow subscribing to any transaction's state change | Dan Finlay | 2017-09-14 | 1 | -0/+1 | |
| | * | | | | | | | | | | | | | Some progress | Dan Finlay | 2017-09-13 | 4 | -1/+144 | |
| | * | | | | | | | | | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController | Dan Finlay | 2017-09-12 | 2 | -0/+149 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | Linted | Dan Finlay | 2017-09-08 | 1 | -2/+1 | |
| | | * | | | | | | | | | | | | | Improve test name | Dan Finlay | 2017-09-08 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | Make tx calculations account for gas prices | Dan Finlay | 2017-09-08 | 1 | -2/+8 | |
| | | * | | | | | | | | | | | | | Add test for computing gas price | Dan Finlay | 2017-09-08 | 1 | -0/+16 | |
| | | * | | | | | | | | | | | | | Remove logs | Dan Finlay | 2017-09-08 | 2 | -13/+0 | |
| | | * | | | | | | | | | | | | | Fix balance calc test | Dan Finlay | 2017-09-08 | 2 | -1/+3 | |
| | | * | | | | | | | | | | | | | Add constructor comment | Dan Finlay | 2017-09-08 | 1 | -0/+5 | |
| | | * | | | | | | | | | | | | | Fix valueFor test | Dan Finlay | 2017-09-08 | 2 | -11/+13 | |
| | | * | | | | | | | | | | | | | Add basic test for valueFor | Dan Finlay | 2017-09-08 | 2 | -7/+31 | |
| | | * | | | | | | | | | | | | | test not passing | Dan Finlay | 2017-09-08 | 2 | -4/+49 | |
| | | * | | | | | | | | | | | | | Check balances in parallel | Dan Finlay | 2017-09-07 | 1 | -1/+8 | |
| | | * | | | | | | | | | | | | | Add first passing balance calc test | Dan Finlay | 2017-09-07 | 2 | -7/+26 | |
| | | * | | | | | | | | | | | | | Add test template | Dan Finlay | 2017-09-07 | 1 | -0/+37 | |
| | | | | | | * | | | | | | | | | Allow metamaskController to define keyring types | Dan Finlay | 2017-09-23 | 1 | -1/+1 | |
| | | | | | | | * | | | | | | | | Merge pull request #2180 from MetaMask/proxy-blockTracker | kumavis | 2017-09-27 | 4 | -22/+41 | |
| | | | | | | | |\ \ \ \ \ \ \ \ | ||||||
| | | | | | | | | * | | | | | | | | network contoller - clean up unused code | frankiebee | 2017-09-27 | 1 | -6/+0 | |
| | | | | | | | | * | | | | | | | | fix test | frankiebee | 2017-09-27 | 1 | -1/+1 | |
| | | | | | | | | * | | | | | | | | listen for the blocke event on the block tracker instead of rawBlock on the p... | frankiebee | 2017-09-27 | 2 | -2/+1 | |
| | | | | | | | | * | | | | | | | | wrap block tracker in events proxy | frankiebee | 2017-09-27 | 3 | -14/+40 | |
| | | | | | | | |/ / / / / / / / | ||||||
| | | | | | | | * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f... | kumavis | 2017-09-23 | 2 | -0/+66 | |
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | ||||||
| | | | | | | | * | | | | | | | | deps - bump filter deps and add random missing deps | kumavis | 2017-09-23 | 1 | -2/+4 | |
| | | | | | | | * | | | | | | | | metamask - use provider-engines block tracker | kumavis | 2017-09-23 | 1 | -1/+1 | |
| | | | | | | | * | | | | | | | | deps - bump provider engine for block tracker | kumavis | 2017-09-23 | 1 | -1/+1 | |
| | | | | | | | * | | | | | | | | deps - bump eth-block-tracker | kumavis | 2017-09-23 | 1 | -0/+1 | |
| | | | | | | | * | | | | | | | | bug - fix event emitter mem leak warning | kumavis | 2017-09-22 | 1 | -3/+8 | |
| | | | | | | | | |_|_|_|_|_|/ | | | | | | | | |/| | | | | | | ||||||
| | | | | | | | | | | | * | | | Add AUD, HKD, SGD, IDR, PHP to currency conversion list | tmashuang | 2017-09-28 | 2 | -0/+57 | |
| | | | | | | | | | | | * | | | Remove old conversion list. | Kevin Serrano | 2017-09-27 | 1 | -207/+0 | |
| | | | | | | | | | | | * | | | Polish names on currency list. | Kevin Serrano | 2017-09-27 | 1 | -7/+7 | |
| | | | | | | | | | | | * | | | Account for undefined currencies. | Kevin Serrano | 2017-09-27 | 1 | -1/+2 | |
| | | | | | | | | | | | * | | | Modify tests for new API. | Kevin Serrano | 2017-09-27 | 1 | -10/+10 | |
| | | | | | | | | | | | * | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-27 | 8 | -8/+101 | |
| | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #2170 from MetaMask/greenkeeper/sinon-4.0.0 | kumavis | 2017-09-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | chore(package): update sinon to version 4.0.0 | greenkeeper[bot] | 2017-09-26 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #2143 from MetaMask/Version-3.10.3 | kumavis | 2017-09-26 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Version 3.10.3 | Dan Finlay | 2017-09-22 | 2 | -1/+3 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #2145 from MetaMask/ConfigurableEncryption | kumavis | 2017-09-26 | 5 | -11/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | / / / / / / / | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | Define encryptor in constructor params instead of platform object | Dan Finlay | 2017-09-23 | 2 | -5/+11 | |
| * | | | | | | | | | | | Patch security update | Dan Finlay | 2017-09-23 | 1 | -1/+1 | |
| * | | | | | | | | | | | Add platform docs including encryptor param | Dan Finlay | 2017-09-22 | 1 | -4/+25 | |
| * | | | | | | | | | | | Merge branch 'master' into ConfigurableEncryption | Dan Finlay | 2017-09-22 | 3 | -1/+67 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #2104 from MetaMask/AddPlatformGuide | kumavis | 2017-09-22 | 2 | -0/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add guide to porting to new platforms | Dan Finlay | 2017-09-15 | 2 | -0/+66 | |
| | * | | | | | | | | | | Allow custom encryptor to be passed to MetaMaskController and KeyringControll... | Dan Finlay | 2017-09-22 | 3 | -6/+4 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| | | | | | | | * | | | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-21 | 22 | -237/+149 | |
| | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2129 from MetaMask/json-rpc-engine-bumpv3.10.3 | Frankie | 2017-09-20 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | changelog - add note on filter fixes | kumavis | 2017-09-20 | 1 | -0/+1 | |
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-en... | kumavis | 2017-09-20 | 26 | -262/+191 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2126 from MetaMask/v3.10.2-1 | Frankie | 2017-09-20 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | v3.10.2 - changelog | kumavis | 2017-09-19 | 1 | -0/+4 | |
| * | | | | | | | | | | | v3.10.2 | kumavis | 2017-09-19 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetriesv3.10.2 | Frankie | 2017-09-19 | 2 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Bump changelog | Dan Finlay | 2017-09-19 | 1 | -0/+2 | |
| * | | | | | | | | | | | Do not mark a retry tx failed that has been broadcast successfully | Dan Finlay | 2017-09-19 | 1 | -3/+9 | |
* | | | | | | | | | | | | Merge pull request #2119 from MetaMask/mascara-tests2 | Frankie | 2017-09-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | tests - integration - re-add mascara to normal run | kumavis | 2017-09-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge pull request #2118 from MetaMask/mascara-tests | kumavis | 2017-09-19 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | test - integration - bump timeout | kumavis | 2017-09-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | Merge pull request #2098 from MetaMask/mascara-tests | Frankie | 2017-09-19 | 17 | -229/+114 | |
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | tests - integration - remove failing mascara integration tests from normal ru... | kumavis | 2017-09-19 | 1 | -1/+1 | |
| * | | | | | | | | | | tests - mascara - increase timeout before test starts | kumavis | 2017-09-16 | 1 | -1/+1 | |
| * | | | | | | | | | | test - mascara - move skip reload test flag | kumavis | 2017-09-16 | 2 | -1/+1 | |
| * | | | | | | | | | | mascara - proxy - small cleanup | kumavis | 2017-09-16 | 1 | -2/+1 | |
| * | | | | | | | | | | tests - integration - add mascara to integration test run | kumavis | 2017-09-16 | 1 | -1/+1 | |
| * | | | | | | | | | | tests - integration - mascara - small cleanup and timeout adjustments | kumavis | 2017-09-16 | 2 | -9/+5 | |
| * | | | | | | | | | | set time if platform is mascara | frankiebee | 2017-09-16 | 2 | -2/+5 | |
| * | | | | | | | | | | remove testem files | frankiebee | 2017-09-16 | 3 | -35/+1 | |
| * | | | | | | | | | | dont reload on initial download and wait before passing sw to ui | frankiebee | 2017-09-16 | 3 | -18/+28 | |
| * | | | | | | | | | | tests - integration - get flat and mascara tests closer to compatible | kumavis | 2017-09-14 | 9 | -142/+18 | |
| * | | | | | | | | | | tests - refactor and rename npm scripts | kumavis | 2017-09-14 | 3 | -24/+25 | |
| * | | | | | | | | | | tests - mascara - move temp build files into dist/mascara | kumavis | 2017-09-14 | 2 | -10/+10 | |
| * | | | | | | | | | | tests - start migrating mascara tests to karma | kumavis | 2017-09-14 | 8 | -17/+50 | |
| * | | | | | | | | | | tests - break out coveralls npm script | kumavis | 2017-09-14 | 1 | -1/+2 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2117 from MetaMask/Version-3.10.1 | kumavis | 2017-09-19 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Version 3.10.1v3.10.1 | Dan Finlay | 2017-09-19 | 2 | -1/+3 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2075 from MetaMask/mixed-case | Dan Finlay | 2017-09-19 | 3 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mixed-case | Dan Finlay | 2017-09-19 | 14 | -196/+218 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Check if all lower or upper before doing checksum. | Kevin Serrano | 2017-09-13 | 1 | -1/+1 | |
| * | | | | | | | | | | | Changelogaroo. | Kevin Serrano | 2017-09-13 | 1 | -0/+1 | |
| * | | | | | | | | | | | Add specific error message for failed address checksum. | Kevin Serrano | 2017-09-13 | 2 | -0/+12 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
| | | | * | | | | | | | deps - bump json-rpc-middleware-stream | kumavis | 2017-09-20 | 1 | -1/+1 | |
| | | | * | | | | | | | deps - bump json-rpc-engine | kumavis | 2017-09-20 | 1 | -2/+1 | |
| | | | | | | | | | * | Comply with current currency API and add additional styling. | Kevin Serrano | 2017-09-19 | 3 | -4/+4 | |
| | | | | | | | | | * | Fix the property query for new currencies. | Kevin Serrano | 2017-09-19 | 1 | -2/+2 | |
| | | | | | | | | | * | Fix the changelog again. | Kevin Serrano | 2017-09-19 | 1 | -3/+2 | |
| | | | | | | | | | * | Add additional attribution to changelog. | Kevin Serrano | 2017-09-19 | 1 | -0/+3 | |
| | | | | | | | | | * | Another merge conflict resolved. | Roman Rodov | 2017-09-19 | 1 | -4/+4 | |
| | | | | | | | | | * | Resolve merge conflicts for currency sort merge. | Roman Rodov | 2017-09-19 | 1 | -1/+3 | |
| | | | | | | | | | * | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-19 | 16 | -198/+220 | |
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2080 from MetaMask/fix-tooltip | Dan Finlay | 2017-09-19 | 4 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into fix-tooltip | Dan Finlay | 2017-09-19 | 13 | -195/+216 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2093 from MetaMask/max-validation | Dan Finlay | 2017-09-19 | 2 | -25/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Haha silly me, only when gas is estimated and not explicit. | Kevin Serrano | 2017-09-14 | 1 | -1/+1 | |
| * | | | | | | | | | | Bump changelog. | Kevin Serrano | 2017-09-14 | 1 | -0/+1 | |
| * | | | | | | | | | | Lower warning threshold for high tx fee to account for fluctuating blockGasLi... | Kevin Serrano | 2017-09-14 | 1 | -1/+2 | |
| * | | | | | | | | | | Add warning of higher failure risk since app proposed gasLimit. | Kevin Serrano | 2017-09-14 | 1 | -25/+39 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2070 from MetaMask/filter-leak-fix3 | Dan Finlay | 2017-09-15 | 12 | -170/+175 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'filter-leak-fix3' of github.com:MetaMask/metamask-extension int... | kumavis | 2017-09-14 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into filter-leak-fix3 | kumavis | 2017-09-14 | 2 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | createOriginMiddleware - fix var name | kumavis | 2017-09-14 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | changelog - add note of filter memory leak fix | kumavis | 2017-09-14 | 1 | -0/+1 | |
| * | | | | | | | | | metamask controller - destroy filter polyfill on disconnect | kumavis | 2017-09-14 | 1 | -4/+10 | |
| * | | | | | | | | | metamask controller - move middleware into seperate files | kumavis | 2017-09-14 | 5 | -35/+45 | |
| * | | | | | | | | | debug - prefer logger over console | kumavis | 2017-09-14 | 2 | -9/+9 | |
| * | | | | | | | | | metamask cont - standardize multiplex stream naming | kumavis | 2017-09-14 | 1 | -8/+8 | |
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-13 | 18 | -182/+339 | |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | contentscript - fix obj-multiplex instantiation and use pump for streams | kumavis | 2017-09-12 | 1 | -12/+33 | |
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-12 | 5 | -19/+28 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | inpage - use obj-multiplex module | kumavis | 2017-09-08 | 1 | -6/+6 | |
| * | | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l... | kumavis | 2017-09-08 | 23 | -56/+193 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | lint - remove dead code | kumavis | 2017-09-08 | 1 | -1/+0 | |
| * | | | | | | | | | | | deps - bump jsonrpc filters for log filter formate fix | kumavis | 2017-09-08 | 1 | -1/+1 | |
| * | | | | | | | | | | | metamask - add jsonrpc filter middleware on per-connection engine | kumavis | 2017-09-08 | 1 | -2/+8 | |
| * | | | | | | | | | | | inpage - distinguish pump vs pipe | kumavis | 2017-09-08 | 1 | -4/+4 | |
| * | | | | | | | | | | | streams - use pump and published obj-multiplex | kumavis | 2017-09-08 | 5 | -81/+44 | |
| * | | | | | | | | | | | inpage - add idRemapMiddleware | kumavis | 2017-09-08 | 2 | -1/+4 | |
| * | | | | | | | | | | | inpage - use json-rpc-engine for inpage-provider | kumavis | 2017-08-25 | 3 | -46/+43 | |
| | | | | * | | | | | | | changelog. | Kevin Serrano | 2017-09-13 | 1 | -0/+1 | |
| | | | | * | | | | | | | fixed position of tooltips to avoid overflow. | Kevin Serrano | 2017-09-13 | 3 | -3/+3 | |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| | | | | | | | | | * | Modify conversion to new api. | Kevin Serrano | 2017-09-15 | 2 | -58/+597 | |
| | | | | | | | | | * | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-14 | 33 | -236/+483 | |
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #2079 from MetaMask/FixSupportLink | Kevin Serrano | 2017-09-13 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Bump changelog | Dan Finlay | 2017-09-13 | 1 | -0/+1 | |
| * | | | | | | | | | | Fix support link | Dan Finlay | 2017-09-13 | 1 | -1/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0 | kumavis | 2017-09-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | chore(package): update babel-eslint to version 8.0.0 | greenkeeper[bot] | 2017-09-12 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #2074 from MetaMask/export-state-logs | kumavis | 2017-09-13 | 2 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add to changelog. | Kevin Serrano | 2017-09-13 | 1 | -0/+1 | |
| * | | | | | | | | | | | Convert state logs into a download. | Kevin Serrano | 2017-09-13 | 1 | -3/+4 | |
* | | | | | | | | | | | | Merge pull request #2069 from MetaMask/integration-tests-fix2 | Thomas Huang | 2017-09-13 | 8 | -80/+172 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | ci - remove old testem config | kumavis | 2017-09-12 | 1 | -9/+0 | |
| * | | | | | | | | | | | tests - integration - fix bad cherry-pick | kumavis | 2017-09-12 | 1 | -16/+7 | |
| * | | | | | | | | | | | test - integration - drop testem for karma | kumavis | 2017-09-12 | 5 | -56/+150 | |
| * | | | | | | | | | | | test - integration - remove redundant testem scripts | kumavis | 2017-09-12 | 2 | -2/+0 | |
| * | | | | | | | | | | | test - integration - build - manually exit from test builder + add bundle des... | kumavis | 2017-09-12 | 1 | -1/+2 | |
| * | | | | | | | | | | | ci - dont attempt to submit coveralls if not configured | kumavis | 2017-09-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | test - integration - build - use pump + log bundling information | kumavis | 2017-09-12 | 1 | -6/+12 | |
| * | | | | | | | | | | | ci - deps - download latest chrome and firefox | kumavis | 2017-09-12 | 1 | -1/+12 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #2072 from MetaMask/kumavis-patch-2 | Kevin Serrano | 2017-09-12 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Rename add-to-firef.md to add-to-firefox.md | kumavis | 2017-09-12 | 1 | -0/+0 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2068 from MetaMask/export-as-file | Dan Finlay | 2017-09-12 | 4 | -9/+48 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix typo. | Kevin Serrano | 2017-09-12 | 1 | -2/+2 | |
| * | | | | | | | | | | Change the changelog | Kevin Serrano | 2017-09-12 | 1 | -0/+3 | |
| * | | | | | | | | | | Add ability to save seed words as file. | Kevin Serrano | 2017-09-12 | 1 | -0/+10 | |
| * | | | | | | | | | | Add some styling. | Kevin Serrano | 2017-09-12 | 1 | -0/+3 | |
| * | | | | | | | | | | Move function as util function. | Kevin Serrano | 2017-09-12 | 2 | -16/+18 | |
| * | | | | | | | | | | Basic private key download file functionality. | Kevin Serrano | 2017-09-12 | 1 | -9/+30 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2067 from MetaMask/integration-tests-fix | Dan Finlay | 2017-09-12 | 1 | -94/+87 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | test - integration - use async fn for error catching | kumavis | 2017-09-12 | 1 | -94/+87 | |
* | | | | | | | | | | Merge pull request #2065 from MetaMask/Version-3.10.0 | Kevin Serrano | 2017-09-12 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Version 3.10.0v3.10.0 | Dan Finlay | 2017-09-12 | 2 | -1/+4 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2045 from MetaMask/rejectallunapproved | Dan Finlay | 2017-09-12 | 4 | -15/+43 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Show reject all only when tx count is > 1 | Kevin Serrano | 2017-09-12 | 2 | -2/+6 | |
| * | | | | | | | | Remove markdown from changelog. | Kevin Serrano | 2017-09-12 | 1 | -1/+1 | |
| * | | | | | | | | Merge github.com:MetaMask/metamask-extension into rejectallunapproved | Kevin Serrano | 2017-09-12 | 8 | -43/+90 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2051 from MetaMask/ci-speedup | Dan Finlay | 2017-09-12 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | ci - dont need global install of test utils | kumavis | 2017-09-08 | 1 | -4/+0 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissions | Kevin Serrano | 2017-09-11 | 2 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Merge branch 'master' into i1938-removecryptopermissions | kumavis | 2017-09-08 | 2 | -6/+27 | |
| |\| | | | | | | | | ||||||
| * | | | | | | | | | Add to changelog. | Kevin Serrano | 2017-09-08 | 1 | -0/+1 | |
| * | | | | | | | | | Remove cryptonator from chrome permissions. | Kevin Serrano | 2017-09-08 | 1 | -3/+2 | |
* | | | | | | | | | | Merge pull request #2047 from MetaMask/i1997-networkindicate | Thomas Huang | 2017-09-09 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add cursor on hover on loading. Change some wording. | Kevin Serrano | 2017-09-08 | 1 | -3/+3 | |
| * | | | | | | | | | | Add caret to indicate network is dropdown. | Kevin Serrano | 2017-09-08 | 1 | -0/+5 | |
* | | | | | | | | | | | Merge pull request #2057 from MetaMask/Version-3.9.13 | kumavis | 2017-09-09 | 3 | -26/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Version 3.9.13v3.9.13 | Dan Finlay | 2017-09-09 | 2 | -1/+5 | |
| * | | | | | | | | | | inpage provider - define sendAsync on the prototype | kumavis | 2017-09-09 | 1 | -25/+27 | |
* | | | | | | | | | | | Merge pull request #2048 from MetaMask/i1984-tokenvalidations | Dan Finlay | 2017-09-08 | 2 | -6/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix typo. | Kevin Serrano | 2017-09-08 | 1 | -1/+1 | |
| * | | | | | | | | | | Fix link to open new tab. | Kevin Serrano | 2017-09-08 | 1 | -0/+1 | |
| * | | | | | | | | | | Bump changelog. | Kevin Serrano | 2017-09-08 | 1 | -0/+2 | |
| * | | | | | | | | | | Add front-end validation for own adddresses as a token contract address. Add ... | Kevin Serrano | 2017-09-08 | 1 | -6/+24 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #2046 from MetaMask/RewordSeedRestore | Kevin Serrano | 2017-09-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Reword forgot password to restore seed phrase | Dan Finlay | 2017-09-08 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1987 from MetaMask/CheckFaq67 | Kevin Serrano | 2017-09-08 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add test for trying to reproduce faq#67 | Dan Finlay | 2017-08-30 | 1 | -0/+19 | |
| | | * | | | | | | | Changelog and attribution. | Kevin Serrano | 2017-09-08 | 1 | -0/+1 | |
| | | * | | | | | | | Convert icon to button. | Kevin Serrano | 2017-09-08 | 2 | -12/+18 | |
| | | * | | | | | | | Fold submit and buy ether into one button slot | Kevin Serrano | 2017-09-08 | 1 | -15/+9 | |
| | | * | | | | | | | Merge branch 'master' of github.com:davidp94/metamask-extension into rejectal... | Kevin Serrano | 2017-09-08 | 2 | -0/+23 | |
| |_|/| | | | | | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | fix goHome | davidp94 | 2017-08-15 | 1 | -2/+6 | |
| | | * | | | | | | | remove unused action type | davidp94 | 2017-08-15 | 1 | -1/+0 | |
| | | * | | | | | | | cancel all txs | DavidNinja | 2017-08-15 | 2 | -0/+20 | |
* | | | | | | | | | | Merge pull request #1893 from MetaMask/readd-loose | Thomas Huang | 2017-09-08 | 6 | -5/+30 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Place object property retrieval inside try-catch | Kevin Serrano | 2017-09-08 | 1 | -2/+3 | |
| * | | | | | | | | | Change expected type to array. | Kevin Serrano | 2017-09-08 | 1 | -1/+1 | |
| * | | | | | | | | | Changelog bump | Kevin Serrano | 2017-09-07 | 1 | -0/+1 | |
| * | | | | | | | | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-07 | 5 | -7/+11 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #2033 from MetaMask/Version-3.9.12 | kumavis | 2017-09-07 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | | ||||||
| * | | | | | | | | Version 3.9.12v3.9.12 | Dan Finlay | 2017-09-07 | 2 | -1/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #2017 from MetaMask/DevEnviornment | kumavis | 2017-09-07 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update mock-store dependency | tmashuang | 2017-09-07 | 1 | -2/+2 | |
| * | | | | | | | | Update development store | tmashuang | 2017-09-05 | 1 | -2/+2 | |
* | | | | | | | | | Merge pull request #2023 from MetaMask/web3-1.0-fix | Dan Finlay | 2017-09-07 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | inpage - bug fix | kumavis | 2017-09-06 | 1 | -2/+3 | |
|/ / / / / / / / / | ||||||
| | * | | | | | | | Properly update keyring state on new account addition. | Kevin Serrano | 2017-09-07 | 1 | -1/+2 | |
| | * | | | | | | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-06 | 3 | -3/+16 | |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarning | Kevin Serrano | 2017-09-06 | 2 | -2/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make eth_sign deprecation warning more useful | Dan Finlay | 2017-09-06 | 2 | -2/+14 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarning | Kevin Serrano | 2017-09-06 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Make web3 deprecation notice more useful | Dan Finlay | 2017-09-06 | 2 | -1/+2 | |
|/ / / / / / / / | ||||||
| * | | | | | | | Resolve merge conflict from master | Kevin Serrano | 2017-09-06 | 32 | -270/+3791 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Readd loose label onto accounts. | Kevin Serrano | 2017-08-10 | 4 | -4/+26 | |
| | | | | | | * | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-09-06 | 8 | -13/+20 | |
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #2008 from MetaMask/mascara-fix | kumavis | 2017-09-02 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | mascara - fix iframe stream constructor | kumavis | 2017-09-02 | 2 | -4/+4 | |
* | | | | | | | | | Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0 | Thomas Huang | 2017-09-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | chore(package): update sinon to version 3.2.0 | greenkeeper[bot] | 2017-08-10 | 1 | -1/+1 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #2007 from MetaMask/i2005-HttpsLinjs | Kevin Serrano | 2017-09-02 | 3 | -6/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Bump changelog | Dan Finlay | 2017-09-02 | 1 | -0/+2 | |
| * | | | | | | | | Update etherscan links to https | Dan Finlay | 2017-09-02 | 1 | -5/+5 | |
| * | | | | | | | | Update support link | Dan Finlay | 2017-09-02 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #1988 from MetaMask/i1986-AddVersionToStateLogs | Kevin Serrano | 2017-08-30 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into i1986-AddVersionToStateLogs | Kevin Serrano | 2017-08-30 | 2 | -1/+2 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1992 from MetaMask/MultipleTokensText | Kevin Serrano | 2017-08-30 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update changelog | Thomas Huang | 2017-08-30 | 1 | -0/+1 | |
| * | | | | | | | | Multiple tokens shows the amount when greater than 1 | Thomas Huang | 2017-08-30 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
| * / / / / / / | Add version to state logs | Dan Finlay | 2017-08-30 | 2 | -1/+5 | |
|/ / / / / / / | ||||||
| | | | | | * | Merge branch 'master' into new-currency-test | Kevin Serrano | 2017-08-30 | 4 | -22/+73 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | Merge pull request #1985 from MetaMask/i1974-EnsureDeepCloneHistory | kumavis | 2017-08-29 | 1 | -0/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add some tests to tx-state-history-helper | Dan Finlay | 2017-08-29 | 1 | -0/+26 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #1965 from MetaMask/inpage-provider-fixes | Kevin Serrano | 2017-08-29 | 3 | -22/+47 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Merge branch 'master' into inpage-provider-fixes | kumavis | 2017-08-29 | 8 | -41/+189 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | inpage - add changelog note | kumavis | 2017-08-29 | 1 | -0/+3 | |
| * | | | | | | inpage - lint fix | kumavis | 2017-08-29 | 1 | -1/+1 | |
| * | | | | | | inpage provider - autoreload - improve readability | kumavis | 2017-08-24 | 1 | -15/+32 |