Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Makes styling fixes to account dropdown. | Dan | 2017-09-28 | 2 | -10/+12 |
* | Keep privateKey out of state and clear it after closing export private key mo... | Dan | 2017-09-28 | 2 | -20/+40 |
* | Adds a back button to export private key modal; connects account details to s... | Dan | 2017-09-28 | 5 | -6/+62 |
* | Implement Confirm Deploy Contract screen | Chi Kei Chan | 2017-09-27 | 4 | -2/+357 |
* | Update the correct values in state when estimates are received. | Dan | 2017-09-27 | 2 | -18/+15 |
* | Gets gas and price estimates when send components mount. | Dan | 2017-09-27 | 3 | -42/+27 |
* | Restore notification functionality | Dan | 2017-09-27 | 2 | -0/+14 |
* | Return null if transaction.key is shapeshift | Chi Kei Chan | 2017-09-27 | 2 | -53/+18 |
* | Connect export key modal to state and enable actions. | Dan | 2017-09-27 | 3 | -15/+104 |
* | Merge pull request #2157 from danjm/MM-57-use-gas-estimator | Chi Kei Chan | 2017-09-26 | 3 | -29/+183 |
|\ | |||||
| * | Merge branch 'NewUI-flat' into MM-57-use-gas-estimator | Chi Kei Chan | 2017-09-26 | 5 | -4/+104 |
| |\ | |/ |/| | |||||
* | | Remove unnecessary trailing comma. | Dan | 2017-09-26 | 1 | -1/+1 |
* | | Select all in to and from of send screens, instead of clearing on focus. | Dan | 2017-09-26 | 2 | -15/+5 |
* | | Able to change selections in to and from fields of send and send token. | Dan | 2017-09-26 | 2 | -2/+19 |
* | | Export private key modal body ui. | Dan | 2017-09-26 | 3 | -1/+92 |
| * | Send token now estimates gas and price. | Dan | 2017-09-26 | 1 | -8/+37 |
| * | Refactor to store estimated gas and price in local state, return promise from... | Dan | 2017-09-26 | 3 | -81/+38 |
| * | Estimate gasPrice and gasLimit in send screen. | Dan | 2017-09-26 | 3 | -7/+126 |
| * | Update send token to handle errors onBlur events and prevent clicking send un... | Dan | 2017-09-26 | 1 | -12/+59 |
| * | Handles errors with to field and renders warnings from backend in send token. | Dan | 2017-09-26 | 1 | -1/+1 |
|/ | |||||
* | Exports private key modal opens from dropdown. | Dan | 2017-09-24 | 4 | -54/+110 |
* | Add Confirm Send token screen | Chi Kei Chan | 2017-09-23 | 6 | -64/+489 |
* | get identities from getState() instead of passing from caller, only set new a... | Dan | 2017-09-23 | 2 | -8/+9 |
* | New account modal now allows for addition of account name. | Dan | 2017-09-23 | 3 | -7/+35 |
* | Default class params to empty string in readonly-input | Dan | 2017-09-23 | 1 | -2/+2 |
* | ReadOnlyInput component. | Dan | 2017-09-23 | 3 | -13/+34 |
* | Open account details modal on buy -> direct deposit. | Dan | 2017-09-23 | 1 | -1/+11 |
* | Client side error handling for from, to and amount fields in send.js | Dan | 2017-09-23 | 4 | -44/+184 |
* | Refactor Confirmation Tx to render different screen | Chi Kei Chan | 2017-09-22 | 2 | -183/+163 |
* | Integrate Add Token | Chi Kei Chan | 2017-09-22 | 6 | -255/+333 |
* | Abstract account modal. | Dan | 2017-09-22 | 4 | -63/+96 |
* | Confirm screen shows amount plus gas in total field | Dan | 2017-09-22 | 2 | -6/+29 |
* | Clean up code in send.js | Dan | 2017-09-22 | 1 | -234/+193 |
* | Handles errors with to field and renders warnings from backend in send token. | Dan | 2017-09-22 | 1 | -11/+17 |
* | Add Token UI - hover/select state; fetch token address | Chi Kei Chan | 2017-09-21 | 3 | -19/+82 |
* | Add Add Token UI; Add Fuzzy search for tokens | Chi Kei Chan | 2017-09-20 | 5 | -140/+458 |
* | Buy Modal Styling | Chi Kei Chan | 2017-09-20 | 2 | -10/+17 |
* | Ensure conversion util does not return insignificant trailing zeroes. | Dan | 2017-09-20 | 1 | -1/+1 |
* | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 25 | -241/+150 |
|\ | |||||
| * | 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 |
| * | | | | 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 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | changelog. | Kevin Serrano | 2017-09-13 | 1 | -0/+1 |
| | * | | | fixed position of tooltips to avoid overflow. | Kevin Serrano | 2017-09-13 | 3 | -3/+3 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 2 | -0/+10 |
|\| | | | |||||
| * | | | 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 #2116 from chikeichan/nm | Chi Kei Chan | 2017-09-19 | 62 | -640/+5027 |
|\ \ \ \ | |||||
| * | | | | Fix Merge Problems; update yarn lock | Chi Kei Chan | 2017-09-19 | 2 | -49/+558 |
| * | | | | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 61 | -591/+4469 |
|/| | | | | |/ / / | |||||
| * | | | 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 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| * | | | | 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 |
| |/ / / | |||||
| | * / | 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 |
| | |\ | | |/ | |/| | |||||
| * | | 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 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | 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 |
| | | | * | 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 |
| | | | |\ | | |_|_|/ | |/| | | | |||||
| * | | | | 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 |
| | | | | | | * | 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 |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | 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 |
| * | | | | | 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 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 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 |
| | * | | | | | inpage provider - only warn web3 usage once per session | kumavis | 2017-08-24 | 1 | -6/+11 |
| | * | | | | | inpage provider - sync rpc - default to null values | kumavis | 2017-08-24 | 1 | -3/+3 |
| | | | * | | | Readd loose label onto accounts. | Kevin Serrano | 2017-08-10 | 4 | -4/+26 |
| | | | | | * | 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 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge pull request #1977 from MetaMask/Version-3.9.11 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Version 3.9.11v3.9.11 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1973 from MetaMask/hotfix-migration019 | kumavis | 2017-08-24 | 3 | -1/+85 |
| |\ \ \ \ \ | |||||
| | * | | | | | fall back to `latest` if blockNumber is null | frankiebee | 2017-08-24 | 1 | -1/+1 |
| | * | | | | | Make method return a number | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
| | * | | | | | Only cancel pending txs with non continuously high nonces | Dan Finlay | 2017-08-24 | 1 | -1/+24 |
| | * | | | | | fix description | frankiebee | 2017-08-24 | 1 | -2/+2 |
| | * | | | | | hotfix - fail submitted txs whos nonce is out of bound | frankiebee | 2017-08-24 | 2 | -0/+61 |
| * | | | | | | Merge pull request #1971 from MetaMask/SetMaxRetryLimit | kumavis | 2017-08-24 | 3 | -2/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+1 |
| | * | | | | | Fail transactions after a day of retries | Dan Finlay | 2017-08-24 | 2 | -2/+12 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1969 from MetaMask/i1966-IgnoreInvalidPendingNonces | Dan Finlay | 2017-08-24 | 3 | -38/+89 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+2 |
| | * | | | | Enforce nonces as type string | Dan Finlay | 2017-08-24 | 1 | -2/+10 |
| | * | | | | Use toNumber method | Dan Finlay | 2017-08-24 | 1 | -2/+1 |
| | * | | | | Fix network nonce parsing | Dan Finlay | 2017-08-24 | 1 | -4/+11 |
| | * | | | | Corrected test constraints | Dan Finlay | 2017-08-24 | 1 | -2/+2 |
| | * | | | | Add mysterious failing test | Dan Finlay | 2017-08-24 | 1 | -0/+20 |
| | * | | | | Pass nonce tests | Dan Finlay | 2017-08-24 | 2 | -12/+11 |
| | * | | | | Got all tests but one passing | Dan Finlay | 2017-08-24 | 1 | -0/+1 |
| | * | | | | Fix new test, break an older maybe wrong one | Dan Finlay | 2017-08-24 | 2 | -29/+27 |
| | * | | | | Linted | Dan Finlay | 2017-08-24 | 1 | -1/+0 |
| | * | | | | Add failing test for newly identified error state | Dan Finlay | 2017-08-24 | 1 | -0/+17 |
| | * | | | | Simplify nonce calculation | Dan Finlay | 2017-08-24 | 1 | -4/+5 |
| |/ / / / | |||||
| * | | | | Merge pull request #1963 from MetaMask/Version-3.9.10v3.9.10 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | Version 3.9.10 | Dan Finlay | 2017-08-24 | 2 | -1/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #1945 from MetaMask/useLocalNonce | Dan Finlay | 2017-08-24 | 5 | -58/+255 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 2 | -10/+2 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #1960 from MetaMask/RemoveTxViz | Kevin Serrano | 2017-08-24 | 2 | -10/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove eth-tx-viz link from tx history icons | Dan Finlay | 2017-08-24 | 2 | -10/+3 |
| |/ / / / / | |||||
| | * | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+2 |
| | * | | | | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 10 | -27/+3214 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #1946 from MetaMask/Version-3.9.9 | Thomas Huang | 2017-08-19 | 2 | -2/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Version 3.9.9v3.9.9 | Dan Finlay | 2017-08-19 | 2 | -2/+3 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 8 | -26/+3211 |
| |\ \ \ \ \ | |||||
| | * | | | | | clean - remove unused test data | kumavis | 2017-08-15 | 1 | -13634/+0 |
| | * | | | | | migration 18 - activate | kumavis | 2017-08-15 | 1 | -0/+1 |
| | * | | | | | migration 18 - fix an oops | kumavis | 2017-08-15 | 1 | -1/+1 |
| | * | | | | | tx controller - test - fix typo from moved test | kumavis | 2017-08-15 | 1 | -3/+3 |
| | * | | | | | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 5 | -4/+13637 |
| | * | | | | | tx controller - test - test tx state history in updateTx | kumavis | 2017-08-15 | 1 | -6/+18 |
| | * | | | | | migration 18 - move to diff-based history | kumavis | 2017-08-15 | 1 | -0/+52 |
| | * | | | | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 6 | -20/+3141 |
| | | |_|_|/ | | |/| | | |