Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #935 from MetaMask/kumavis-patch-1 | Dan Finlay | 2016-12-20 | 2 | -8/+11 |
|\ | | | | | inpage - temporarily disable ping stream | ||||
| * | changelog - add whitespace | kumavis | 2016-12-20 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-12-20 | 0 | -0/+0 |
| |\ | | | | | | | | | | kumavis-patch-1 | ||||
| | * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-12-20 | 2 | -4/+6 |
| | |\ | | | | | | | | | | | | | kumavis-patch-1 | ||||
| | | * | Merge branch 'master' into kumavis-patch-1 | kumavis | 2016-12-20 | 2 | -4/+5 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge pull request #929 from MetaMask/Version-2.14.0 | Dan Finlay | 2016-12-20 | 2 | -4/+5 |
|\ \ \ \ | | | | | | | | | | | Version 2.14.0 | ||||
| * | | | | Version 2.14.02.14.0 | Dan Finlay | 2016-12-17 | 2 | -4/+5 |
|/ / / / | |||||
| * / / | changelog - inf reload detection hotfix | kumavis | 2016-12-20 | 2 | -4/+6 |
| |/ / | |||||
| * / | changelog - add note on inf reload detection hotfix | kumavis | 2016-12-20 | 1 | -1/+1 |
| |/ | |||||
| * | inpage - temporarily disable ping stream | kumavis | 2016-12-20 | 1 | -8/+9 |
|/ | |||||
* | Merge pull request #927 from MetaMask/AddNotices | Dan Finlay | 2016-12-17 | 19 | -21/+607 |
|\ | | | | | Add notices | ||||
| * | Clean up first notice | Dan Finlay | 2016-12-17 | 2 | -2/+2 |
| | | | | | | | | | | Remove redundant title from notice component. Make link color the same orange as the rest of the UI. | ||||
| * | Add date to notices display. | Kevin Serrano | 2016-12-17 | 1 | -1/+15 |
| | | |||||
| * | move notice code from metamask-controller + config-manager, in to ↵ | kumavis | 2016-12-17 | 5 | -205/+213 |
| | | | | | | | | notice-controller | ||||
| * | meta - add npm-debug.log to gitignore | kumavis | 2016-12-17 | 1 | -0/+1 |
| | | |||||
| * | clean - code style | kumavis | 2016-12-17 | 2 | -8/+3 |
| | | |||||
| * | Deactivate polling for now. | Kevin Serrano | 2016-12-17 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'AddNotices' of github.com:MetaMask/metamask-plugin into AddNotices | Dan Finlay | 2016-12-17 | 2 | -1/+12 |
| |\ | |||||
| | * | remove duplicate controller. | Kevin Serrano | 2016-12-17 | 1 | -3/+0 |
| | | | |||||
| | * | Clean notices. | Kevin Serrano | 2016-12-17 | 1 | -1/+1 |
| | | | |||||
| | * | The first notice, the fall of morden. | Kevin Serrano | 2016-12-17 | 2 | -1/+12 |
| | | | |||||
| * | | Cleanup | Dan Finlay | 2016-12-17 | 3 | -4/+1 |
| |/ | |||||
| * | Rebuild development states before ci tests | Dan Finlay | 2016-12-17 | 1 | -2/+3 |
| | | |||||
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 4 | -20/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition. | ||||
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 17 | -4/+554 |
|/ | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition. | ||||
* | Merge pull request #923 from MetaMask/RemoveMorden | Frankie | 2016-12-17 | 6 | -27/+3 |
|\ | | | | | Remove morden | ||||
| * | Bump changelog for removing morden | Dan Finlay | 2016-12-16 | 1 | -0/+1 |
| | | |||||
| * | Remove morden testnet provider | Dan Finlay | 2016-12-16 | 5 | -27/+2 |
|/ | | | | Instances configured to point at Morden will now point at Ropsten. | ||||
* | Merge pull request #918 from MetaMask/i915-txPermaCache | kumavis | 2016-12-13 | 2 | -1/+2 |
|\ | | | | | deps - bump provider-engine for bug fix | ||||
| * | deps - bump provider-engine for bug fix | kumavis | 2016-12-13 | 2 | -1/+2 |
|/ | |||||
* | Merge pull request #912 from MetaMask/kumavis-patch-1 | Dan Finlay | 2016-12-08 | 1 | -0/+2 |
|\ | | | | | changelog - "fix reload detection" | ||||
| * | changelog - "fix reload detection" | kumavis | 2016-12-08 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #911 from MetaMask/i873-reloadBroken | Dan Finlay | 2016-12-08 | 1 | -1/+1 |
|\ | | | | | Fix broken disconnect detector | ||||
| * | inpage - correctly listen for incomming messages | kumavis | 2016-12-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #891 from MetaMask/Version-2.13.11 | Dan Finlay | 2016-11-29 | 2 | -1/+3 |
|\ | | | | | Version 2.13.11 | ||||
| * | Version 2.13.112.13.11 | Dan Finlay | 2016-11-24 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #884 from MetaMask/i883-sync-uninstallFilter | kumavis | 2016-11-24 | 2 | -0/+9 |
|\ | | | | | Add support for sync RPC uninstallFilter | ||||
| * | changelog - add sync rpc eth_uninstallFilter note | kumavis | 2016-11-24 | 1 | -0/+2 |
| | | |||||
| * | rpc - add sync uninstallFilter support | kumavis | 2016-11-24 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #876 from MetaMask/Version-2.13.10 | Dan Finlay | 2016-11-23 | 2 | -3/+7 |
|\ | | | | | Version 2.13.10 | ||||
| * | Version 2.13.102.13.10 | Dan Finlay | 2016-11-23 | 2 | -3/+7 |
|/ | |||||
* | Merge pull request #872 from MetaMask/i868-estimateGasTooHigh | kumavis | 2016-11-23 | 2 | -29/+50 |
|\ | | | | | Improve gas estimation logic | ||||
| * | Merge branch 'master' into i868-estimateGasTooHigh | kumavis | 2016-11-23 | 5 | -8/+17 |
| |\ | |/ |/| | |||||
* | | Merge pull request #864 from MetaMask/new-faucet | kumavis | 2016-11-23 | 3 | -4/+5 |
|\ \ | | | | | | | Point to ropsten faucet | ||||
| * \ | Merge branch 'master' into new-faucet | Dan Finlay | 2016-11-23 | 3 | -4/+12 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #855 from MetaMask/i834-RopstenLinks | Kevin Serrano | 2016-11-23 | 3 | -4/+12 |
|\ \ \ | | | | | | | | | Add ropsten link support | ||||
| * | | | Unify test wording | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add temporary morden explorer link support | Dan Finlay | 2016-11-22 | 2 | -1/+7 |
| | | | | |||||
| * | | | Fix ropsten link test | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Bump changelog | Dan Finlay | 2016-11-22 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into i834-RopstenLinks | Dan Finlay | 2016-11-22 | 2 | -1/+3 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Add ropsten link support | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | | |||||
| | * | | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 2 | -4/+4 |
| | | | | |||||
| | * | | Add to changelog. | Kevin Serrano | 2016-11-23 | 3 | -2/+3 |
| |/ / |/| | | |||||
| | * | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 2 | -29/+50 |
| |/ |/| | |||||
* | | Merge pull request #838 from MetaMask/Version-2.13.9 | kumavis | 2016-11-22 | 2 | -1/+3 |
|\ \ | |/ |/| | Version 2.13.9 | ||||
| * | Version 2.13.92.13.9 | Dan Finlay | 2016-11-22 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #832 from MetaMask/i831-AddRopsten | Kevin Serrano | 2016-11-22 | 8 | -4/+42 |
|\ | | | | | Begin adding Ropsten support | ||||
| * | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 8 | -4/+42 |
|/ | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831 | ||||
* | Merge pull request #819 from MetaMask/i791-FixLosingConnection | kumavis | 2016-11-18 | 4 | -11/+13 |
|\ | | | | | Increment tx ids to avoid collisions | ||||
| * | Increment tx ids to avoid collisions | Dan Finlay | 2016-11-18 | 4 | -11/+13 |
|/ | | | | | | | | | | Fixes #791 It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection. This new id generation strategy creates a random ID, and increments it for each request. In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big. | ||||
* | Merge pull request #814 from MetaMask/Version-2.13.8 | kumavis | 2016-11-17 | 2 | -2/+5 |
|\ | | | | | Version 2.13.8: Faithful Serpent | ||||
| * | Version 2.13.82.13.8 | Dan Finlay | 2016-11-17 | 2 | -2/+5 |
|/ | |||||
* | Merge pull request #811 from MetaMask/deadly-fix | kumavis | 2016-11-15 | 3 | -4/+4 |
|\ | | | | | Fix error display in confirmation screen | ||||
| * | Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix | Kevin Serrano | 2016-11-15 | 0 | -0/+0 |
| |\ | |||||
| | * | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 2 | -4/+3 |
| |/ |/| | |||||
| * | Add to changelog. | Kevin Serrano | 2016-11-15 | 1 | -0/+1 |
| | | |||||
| * | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 2 | -4/+3 |
|/ | |||||
* | Merge pull request #807 from MetaMask/cssIsAwesome | kumavis | 2016-11-11 | 2 | -2/+6 |
|\ | | | | | Fix funny looking errors in conf-tx | ||||
| * | lint fix | Frankie | 2016-11-11 | 1 | -1/+2 |
| | | |||||
| * | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 2 | -2/+5 |
|/ | |||||
* | Merge pull request #805 from MetaMask/i804 | kumavis | 2016-11-11 | 3 | -2/+26 |
|\ | | | | | detect tx error - show warning and fix gasLimit | ||||
| * | changelog - update | kumavis | 2016-11-11 | 1 | -0/+1 |
| | | |||||
| * | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 2 | -2/+25 |
|/ | |||||
* | Merge pull request #801 from MetaMask/deadly | Kevin Serrano | 2016-11-10 | 6 | -18/+14 |
|\ | | | | | Properly implement 20% gas bump | ||||
| * | remove gas field, due to alias redundancy. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |
| | | |||||
| * | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 3 | -1/+3 |
| | | |||||
| * | Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly | Kevin Serrano | 2016-11-10 | 3 | -17/+12 |
|/| | |||||
| * | Unify warning functions. | Kevin G. Serrano | 2016-11-08 | 3 | -17/+12 |
| | | |||||
* | | Merge pull request #797 from MetaMask/Version-2.13.7 | Frankie | 2016-11-09 | 3 | -2/+4 |
|\ \ | | | | | | | Version 2.13.7 | ||||
| * | | Hard coding jazzicon at working version2.13.7 | Dan Finlay | 2016-11-09 | 1 | -1/+1 |
| | | | |||||
| * | | Version 2.13.7 | Dan Finlay | 2016-11-09 | 2 | -1/+3 |
|/ / | |||||
* | | Merge pull request #796 from MetaMask/IncreaseGasBuffer | Dan Finlay | 2016-11-09 | 3 | -8/+8 |
|\ \ | | | | | | | Increase gas buffer | ||||
| * | | Adjust gas buffer to be 20% over estimate | Dan Finlay | 2016-11-09 | 3 | -7/+7 |
| | | | |||||
| * | | Increase gas buffer | Dan Finlay | 2016-11-09 | 3 | -4/+4 |
|/ / | | | | | | | Fixes #795 | ||||
* | | Merge pull request #793 from MetaMask/i787-HighGasBug | Kevin Serrano | 2016-11-08 | 3 | -16/+45 |
|\ \ | |/ |/| | i787 High gas bug | ||||
| * | Fix gas price buffering | Dan Finlay | 2016-11-08 | 3 | -13/+12 |
| | | | | | | | | | | | | | | Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time. | ||||
| * | Added failing test for #787 | Dan Finlay | 2016-11-08 | 1 | -11/+41 |
|/ | |||||
* | Merge pull request #786 from MetaMask/i763-GithubLink | kumavis | 2016-11-01 | 2 | -1/+3 |
|\ | | | | | Fix github link on info page | ||||
| * | Fix github link on info page | Dan Finlay | 2016-11-01 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #778 from MetaMask/mascara-build | kumavis | 2016-10-27 | 3 | -11/+1 |
|\ | | | | | Mascara build | ||||
| * | mascara - remove global transpile | kumavis | 2016-10-27 | 2 | -10/+0 |
| | | |||||
| * | mascara - example dapp - log main account | kumavis | 2016-10-27 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #774 from MetaMask/walkThrough | Dan Finlay | 2016-10-27 | 2 | -4/+21 |
|\ | | | | | Add more info to mascara README | ||||
| * | Merge branch 'master' into walkThrough | Frankie | 2016-10-27 | 2 | -1/+2 |
| |\ | |/ |/| | |||||
* | | Merge pull request #767 from MetaMask/UpdateWeb3 | kumavis | 2016-10-27 | 2 | -1/+2 |
|\ \ | | | | | | | Update web3.js version | ||||
| * \ | Merge branch 'master' into UpdateWeb3 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
| |\ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into UpdateWeb3 | Dan Finlay | 2016-10-27 | 4 | -12/+15 |
| |\ \ | |||||
| * | | | deps - web3 - set version to 0.17.0-beta | kumavis | 2016-10-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update web3.js version | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| | | | | |||||
| | | * | Fix typos and clean up | Frankie | 2016-10-27 | 2 | -2/+1 |
| | | | | |||||
| | | * | Merge branch 'master' into walkThrough | Frankie | 2016-10-27 | 5 | -11/+15 |
| | | |\ | |_|_|/ |/| | | | |||||
* | | | | Merge pull request #773 from MetaMask/Version-2.13.62.13.6 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
|\ \ \ \ | |_|/ / |/| | | | Version 2.13.6 | ||||
| * | | | Version 2.13.6 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
|/ / / | |||||
* | | | Merge pull request #768 from MetaMask/i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 2 | -1/+2 |
|\ \ \ | | | | | | | | | Rename wallet to account | ||||
| * \ \ | Merge branch 'master' into i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 3 | -9/+10 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #764 from MetaMask/761-FixCustomMordenIndication | Kevin Serrano | 2016-10-27 | 3 | -9/+10 |
|\ \ \ \ | | | | | | | | | | | Fix provider menu selection indication | ||||
| * \ \ \ | Merge branch 'master' into 761-FixCustomMordenIndication | Dan Finlay | 2016-10-27 | 2 | -2/+3 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Bump changelog | Dan Finlay | 2016-10-26 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Fix provider menu selection indication | Dan Finlay | 2016-10-26 | 2 | -9/+8 |
| | |/ / | |/| | | |||||
| | * | | Merge branch 'master' into i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 2 | -2/+3 |
| | |\ \ | |_|/ / |/| | | | |||||
| | * | | Rename wallet to account | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| |/ / | | | | | | | | | | Fixes #762 | ||||
| | * | Fix the size of the pop-up | Frankie | 2016-10-27 | 1 | -3/+3 |
| | | | |||||
| | * | Add more info about first use | Frankie | 2016-10-27 | 1 | -1/+19 |
| |/ |/| | |||||
* | | Merge pull request #769 from MetaMask/FixDelegateCall | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
|\ \ | | | | | | | Fix delegate call function reference 2 | ||||
| * | | Fix delegate call function reference 2 | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #766 from MetaMask/FixDelegateCallCheck | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
|\ \ | |/ |/| | Fix delegate call analysis | ||||
| * | Fix delegate call analysis | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
|/ | | | | Fixed reference allowing transactions to be analyzed for delegate call again. | ||||
* | Merge pull request #745 from MetaMask/i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 4 | -14/+35 |
|\ | | | | | Reproduced issue 743 in test case | ||||
| * | test - fix delegate-call test | kumavis | 2016-10-25 | 4 | -12/+10 |
| | | |||||
| * | Merge branch 'master' into i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 5 | -2/+37 |
| |\ | |/ |/| | |||||
* | | Merge pull request #752 from MetaMask/i#741 | Dan Finlay | 2016-10-22 | 4 | -1/+36 |
|\ \ | | | | | | | Add validations to txData param in send form | ||||
| * | | Change regex in isHex function | Frankie | 2016-10-22 | 1 | -4/+1 |
| | | | |||||
| * | | Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741 | Frankie | 2016-10-22 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into i#741 | Frankie | 2016-10-21 | 1 | -1/+1 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #751 from MetaMask/ClarifyCallbackRole | Frankie | 2016-10-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Add note about callback param to sync method warning | ||||
| * | | | | Add note about callback param to sync method warning | Dan Finlay | 2016-10-20 | 1 | -1/+1 |
|/ / / / | |||||
| * / / | clean up the isHex function | Frankie | 2016-10-22 | 1 | -3/+4 |
| |/ / | |||||
| * | | Clean up tests | Frankie | 2016-10-21 | 1 | -4/+4 |
| | | | |||||
| * | | Add test and ability for isHex to handle hex strings with hex-prefix | Frankie | 2016-10-20 | 2 | -0/+6 |
| | | | |||||
| * | | Fix up wording | Frankie | 2016-10-20 | 1 | -1/+1 |
| | | | |||||
| * | | Fix CHANGELOG | Frankie | 2016-10-20 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into i#741 | Frankie | 2016-10-20 | 4 | -3/+7 |
| |\ \ | |/ / |/| | | |||||
| * | | Add unit test for isHex and add to CHANGELOG.md | Frankie | 2016-10-20 | 2 | -0/+18 |
| | | | |||||
| * | | Add valdations to txData param | Frankie | 2016-10-20 | 2 | -0/+12 |
| | | | |||||
| | * | Merge branch 'master' into i743-FixDelegateCallFlag | Kevin Serrano | 2016-10-19 | 4 | -3/+7 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #749 from MetaMask/Version-2.13.5 | Kevin Serrano | 2016-10-19 | 3 | -2/+4 |
|\ \ \ | | | | | | | | | Version 2.13.5 | ||||
| * | | | Fix changelog date | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix cli flag capitalization | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Version 2.13.5v2.13.5 | Dan Finlay | 2016-10-19 | 2 | -1/+3 |
| | | | | |||||
| * | | | Remove livereload from prod builds | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #748 from MetaMask/i746-ReloadBug | kumavis | 2016-10-19 | 2 | -1/+3 |
|\ \ \ | |/ / |/| | | Wait for first metamask data to establish ping-pong stream. | ||||
| * | | Wait for first metamask data to establish ping-pong stream. | Dan Finlay | 2016-10-19 | 2 | -1/+3 |
|/ / | | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746. | ||||
| * | Reproduced issue 743 in test case | Dan Finlay | 2016-10-18 | 3 | -12/+35 |
|/ | | | | | | This contract hex does include the value `f4`, but it was compiled from a contract with no instance of `.delegatecall`. I believe `f4` in this case is part of some other value or contract address, and `ethBinToOps` has some error in how it skips pushed data. @kumavis | ||||
* | Merge pull request #744 from MetaMask/i738-IncreaseGas | kumavis | 2016-10-18 | 3 | -1/+29 |
|\ | | | | | Increase gas estimate by 100000 wei | ||||
| * | Restore hex prefix to gas price | Dan Finlay | 2016-10-18 | 2 | -1/+2 |
| | | |||||
| * | Increase gas estimate by 100000 wei | Dan Finlay | 2016-10-18 | 3 | -1/+28 |
|/ | | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738. | ||||
* | Merge pull request #737 from MetaMask/Version-2.13.4 | Kevin Serrano | 2016-10-18 | 3 | -2/+5 |
|\ | | | | | Version 2.13.4 | ||||
| * | Version 2.13.4 | Dan Finlay | 2016-10-18 | 3 | -2/+5 |
|/ | |||||
* | Merge pull request #736 from MetaMask/i735-xmlfix | Dan Finlay | 2016-10-18 | 2 | -2/+15 |
|\ | | | | | Prevent injections on XML | ||||
| * | Merge branch 'master' into i735-xmlfix | Kevin Serrano | 2016-10-18 | 9 | -38/+213 |
| |\ | |/ |/| | |||||
* | | Merge pull request #720 from MetaMask/i#495CustomGasField | kumavis | 2016-10-17 | 9 | -38/+214 |
|\ \ | | | | | | | add a gasPrice field | ||||
| * | | Fix for linting | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | | |||||
| * | | Create callback and Clean-up details | Frankie | 2016-10-14 | 4 | -12/+19 |
| | | | |||||
| * | | fix spelling | Frankie | 2016-10-14 | 1 | -4/+2 |
| | | | |||||
| * | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 8 | -37/+59 |
| |\ \ | |/ / |/| | | |||||
| * | | Fix gasPrice range | Frankie | 2016-10-14 | 8 | -20/+37 |
| | | | |||||
| * | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 16 | -83/+365 |
| |\ \ | |||||
| * | | | Add to CHANGELOG | Frankie | 2016-10-11 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 14 | -33/+58 |
| |\ \ \ | |||||
| * | | | | Add custom gas field to send page | Frankie | 2016-10-11 | 4 | -33/+185 |
| | | | | | |||||
| | | | * | Lint. | Kevin Serrano | 2016-10-16 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Bump changelog. | Kevin Serrano | 2016-10-16 | 1 | -0/+2 |
| | | | | | |||||
| | | | * | Prevent XML from web3 injections. | Kevin Serrano | 2016-10-16 | 1 | -2/+14 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #730 from MetaMask/i695-dapp-reload | kumavis | 2016-10-13 | 7 | -35/+57 |
|\ \ \ \ | | | | | | | | | | | dapp reload - fixed disconnect detection via polling | ||||
| * \ \ \ | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #733 from MetaMask/tos-fix | Kevin Serrano | 2016-10-13 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix misnamed variable. | ||||
| * | | | | Remove logs. | Kevin Serrano | 2016-10-13 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Fix misnamed variable. | Kevin Serrano | 2016-10-13 | 1 | -2/+4 |
|/ / / / | |||||
| * | | | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 16 | -83/+365 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #723 from MetaMask/i721-ScrollAccountList | Frankie | 2016-10-12 | 4 | -34/+69 |
|\ \ \ \ | | | | | | | | | | | I721 scroll account list | ||||
| * \ \ \ | Merge branch 'master' into i721-ScrollAccountList | Dan Finlay | 2016-10-12 | 13 | -49/+296 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #702 from MetaMask/tos | Dan Finlay | 2016-10-12 | 13 | -49/+296 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Terms of Service UI Update | ||||
| * | | | | Remove logs. | Kevin Serrano | 2016-10-12 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Remove comments. | Kevin Serrano | 2016-10-12 | 1 | -16/+0 |
| | | | | | |||||
| * | | | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos | Kevin Serrano | 2016-10-12 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix bug where new vaults had no nicknames | Dan Finlay | 2016-10-12 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Cleanup. | Kevin Serrano | 2016-10-12 | 4 | -13/+26 |
| |/ / / / | |||||
| * | | | | lint | Kevin Serrano | 2016-10-12 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Move tos hash comparison logic from background to mm controller. | Kevin Serrano | 2016-10-12 | 2 | -27/+16 |
| | | | | | |||||
| * | | | | Remove version from terms of service. | Kevin Serrano | 2016-10-12 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Move tos hash logic to build phase. Create dynamic global variables based on ↵ | Kevin Serrano | 2016-10-12 | 4 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | build. | ||||
| * | | | | Modify changelog. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Prevent back/login buttons from appearing on the terms of service. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix linting and guarantees set TOS hash. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix retention of terms of service hash across reloads of plugin. | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Renamed variables to make more sense. | Kevin Serrano | 2016-10-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add missing path require statement. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'tos' into tosplusupdatecheck | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into tos | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | On update, check whether the TOS has changed using hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+16 |
| | | | | | | |||||
| * | | | | | Add controller functions for storing and checking TOS hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+34 |
| | | | | | | |||||
| * | | | | | Add new functions for storing TOS hashes in config manager. | Kevin Serrano | 2016-10-06 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Add string-hash as a package. | Kevin Serrano | 2016-10-06 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-10-06 | 8 | -10/+21 |
| |\ \ \ \ | |||||
| * | | | | | Fix integration test. | Kevin Serrano | 2016-10-06 | 1 | -8/+15 |
| | | | | | | |||||
| * | | | | | Rewritten to react standards. Way easier. | Kevin Serrano | 2016-10-05 | 2 | -10/+9 |
| | | | | | | |||||
| * | | | | | Linting. | Kevin Serrano | 2016-10-05 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Add to changelog. | Kevin Serrano | 2016-10-05 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Rename drop menu item to be consistent with naming. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add relevant legal links to help page. | Kevin Serrano | 2016-10-05 | 1 | -8/+41 |
| | | | | | | |||||
| * | | | | | Make config page title consistent with menu item. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add links to relevant legal pages on user agreement page. | Kevin Serrano | 2016-10-05 | 2 | -5/+14 |
| | | | | | | |||||
| * | | | | | Add conditional logic for adding listener. | Kevin Serrano | 2016-10-05 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Add padding to markdown paragraphs. | Kevin Serrano | 2016-10-05 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-10-05 | 10 | -26/+40 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add CSS rules for proper formatting. | Kevin Serrano | 2016-10-05 | 1 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | Modify USER_AGREEMENT to be formatted properly. | Kevin Serrano | 2016-10-05 | 1 | -36/+37 |
| | | | | | | | |||||
| * | | | | | | Implemented scroll-to-bottom functionality for button activation. | Kevin Serrano | 2016-10-05 | 1 | -2/+10 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-10-03 | 9 | -20/+36 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-09-19 | 13 | -32/+114 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Modify terms. | Kevin Serrano | 2016-09-19 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-09-15 | 5 | -20/+23 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Modify user agreement | Kevin Serrano | 2016-09-15 | 1 | -28/+148 |
| | | | | | | | | | |||||
| | | | | | | * | | Bump changelog | Dan Finlay | 2016-10-12 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | | | | | * | | Remove flex class from account list container | Dan Finlay | 2016-10-12 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | | | | * | | Add more accounts to account list ui state | Dan Finlay | 2016-10-12 | 2 | -33/+67 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
| | | | | | | * | dapp reload - fixed disconnect detection via polling | kumavis | 2016-10-13 | 7 | -35/+57 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #710 from MetaMask/EmphasizeAutoUpdating | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Emphasize auto-updating in announcement | ||||
| * | | | | | | Emphasize auto-updating in announcement | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Helps avoid issues like #703 by emphasizing uninstalling is not required. | ||||
* | | | | | | Merge pull request #709 from MetaMask/i707-MixedCaseAddresses | Dan Finlay | 2016-10-06 | 3 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add tolerance for mixed case addresses | ||||
| * | | | | | | Made announcer use correct text bolding | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add tolerance for sending from mixed-case addresses. | Dan Finlay | 2016-10-06 | 2 | -3/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses. Fixes #707 | ||||
* | | | | | | Merge pull request #708 from MetaMask/LittleFixes2.13.3 | Dan Finlay | 2016-10-06 | 4 | -6/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Little fixes | ||||
| * | | | | | | Bump provider-engine version | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Correct async link | Dan Finlay | 2016-10-06 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Add extension store description for easy reference | Dan Finlay | 2016-10-06 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | Rebuild dev states | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #701 from MetaMask/Version-2.13.3 | kumavis | 2016-10-05 | 3 | -2/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Version 2.13.3 | ||||
| * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3 | kumavis | 2016-10-05 | 8 | -4/+21 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #696 from MetaMask/SmallerCopiedButton | kumavis | 2016-10-05 | 3 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Formatting Fixes | ||||
| * \ \ \ \ \ | Merge branch 'master' into SmallerCopiedButton | kumavis | 2016-10-05 | 5 | -3/+17 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #694 from MetaMask/AddAnnouncerScript | kumavis | 2016-10-05 | 2 | -1/+14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add announcer script | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into AddAnnouncerScript | kumavis | 2016-10-05 | 5 | -5/+10 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #700 from MetaMask/OperaCompatibility | kumavis | 2016-10-05 | 3 | -2/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add Opera compatibility | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into OperaCompatibility | Dan Finlay | 2016-10-05 | 2 | -3/+7 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add Opera compatibility | Dan Finlay | 2016-10-05 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix incorrect OS key - Add additional icon image sizes. | ||||
| | * | | | | | | | Add announcer script | Dan Finlay | 2016-10-05 | 2 | -1/+14 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I always keep writing up this same announcement message whenever I publish a new version. I've now written a script to automate my announcement formatting, it looks like this: ``` **MetaMask 2.13.2** now published to the Chrome Store! It should be available over the next hour! 2016-10-4 - Fix bug where chosen FIAT exchange rate does no persist when switching networks - Fix additional parameters that made MetaMask sometimes receive errors from Parity. - Fix bug where invalid transactions would still open the MetaMask popup. ``` | ||||
| | * | | | | | | Merge branch 'master' into SmallerCopiedButton | Frankie | 2016-10-05 | 2 | -3/+7 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| | * | | | | | | Bump changelog | Dan Finlay | 2016-10-05 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Make popup a little taller | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the popup was often cutting off the bottom buttons of the UI. We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now. | ||||
| | * | | | | | | Make seed word confirmation button font smaller | Dan Finlay | 2016-10-05 | 2 | -0/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | To avoid formatting glitches on some machines. | ||||
| | * / / / / | Version 2.13.3 | Dan Finlay | 2016-10-05 | 3 | -2/+6 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | Bumps provider-engine to fix log query filtering bug. | ||||
* | | | | | | Merge pull request #697 from MetaMask/StripPrivateKeyPrefix | Frankie | 2016-10-05 | 2 | -3/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Removed hex prefix from private key export | ||||
| * | | | | | Removed hex prefix from private key export | Dan Finlay | 2016-10-05 | 2 | -3/+7 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | For compatibility with Jaxx, MEW, and Geth. Fixes #687 | ||||
* | | | | | Merge pull request #693 from MetaMask/Version-2.13.22.13.2 | Dan Finlay | 2016-10-05 | 3 | -2/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Version 2.13.2 | ||||
| * | | | | | Version 2.13.2 | Dan Finlay | 2016-10-05 | 3 | -2/+5 |
|/ / / / / | |||||
* | | | | | Merge pull request #692 from MetaMask/ParityFix | Kevin Serrano | 2016-10-04 | 2 | -17/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Improve popup behavior for tx errors | ||||
| * | | | | Improve popup behavior for parity errors | Dan Finlay | 2016-10-04 | 2 | -17/+6 |
|/ / / / | | | | | | | | | | | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code. |