Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | Dan Finlay | 2016-10-19 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #744 from MetaMask/i738-IncreaseGas | kumavis | 2016-10-18 | 3 | -1/+29 |
|\ | |||||
| * | 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 |
|/ | |||||
* | Merge pull request #737 from MetaMask/Version-2.13.4 | Kevin Serrano | 2016-10-18 | 3 | -2/+5 |
|\ | |||||
| * | 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 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ \ | |||||
| * \ \ \ | 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 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | 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 |
|\ \ \ \ | |||||
| * \ \ \ | 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 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | 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 |
| * | | | | 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 | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #709 from MetaMask/i707-MixedCaseAddresses | Dan Finlay | 2016-10-06 | 3 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #708 from MetaMask/LittleFixes2.13.3 | Dan Finlay | 2016-10-06 | 4 | -6/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 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 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | 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 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into OperaCompatibility | Dan Finlay | 2016-10-05 | 2 | -3/+7 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add Opera compatibility | Dan Finlay | 2016-10-05 | 3 | -2/+3 |
| | * | | | | | | | Add announcer script | Dan Finlay | 2016-10-05 | 2 | -1/+14 |
| |/ / / / / / / | |||||
| | * | | | | | | 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 |
| | * | | | | | | Make seed word confirmation button font smaller | Dan Finlay | 2016-10-05 | 2 | -0/+3 |
| |/ / / / / / | |||||
| | * / / / / | Version 2.13.3 | Dan Finlay | 2016-10-05 | 3 | -2/+6 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #697 from MetaMask/StripPrivateKeyPrefix | Frankie | 2016-10-05 | 2 | -3/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Removed hex prefix from private key export | Dan Finlay | 2016-10-05 | 2 | -3/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #693 from MetaMask/Version-2.13.22.13.2 | Dan Finlay | 2016-10-05 | 3 | -2/+5 |
|\ \ \ \ \ | |||||
| * | | | | | 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 parity errors | Dan Finlay | 2016-10-04 | 2 | -17/+6 |
|/ / / / | |||||
* | | | | Merge pull request #689 from MetaMask/i#688 | Dan Finlay | 2016-10-02 | 2 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | Fix for readability | Frankie | 2016-10-02 | 1 | -1/+1 |
| * | | | | Add to CHANGELOG | Frankie | 2016-10-01 | 1 | -0/+2 |
| * | | | | Fix issue #688 where fiat conversion does not persist when switching networks | Frankie | 2016-10-01 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge pull request #684 from MetaMask/Version2.13.1 | Dan Finlay | 2016-09-23 | 3 | -3/+7 |
|\ \ \ \ | |||||
| * | | | | Version 2.13.12.13.1 | Dan Finlay | 2016-09-23 | 3 | -3/+7 |
|/ / / / | |||||
* | | | | Merge pull request #677 from MetaMask/i675-LoadingBuy | Dan Finlay | 2016-09-22 | 6 | -17/+18 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i675-LoadingBuy | Dan Finlay | 2016-09-22 | 4 | -2/+10 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #678 from MetaMask/ParityCompliance | Dan Finlay | 2016-09-22 | 4 | -2/+10 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Version 2.13.0 | Dan Finlay | 2016-09-19 | 2 | -2/+4 |
| * | | | | Bump web3 provider engine version for Parity compliance | Dan Finlay | 2016-09-19 | 1 | -1/+1 |
| * | | | | Drop origin key from requests for Parity compatibility | Dan Finlay | 2016-09-19 | 2 | -0/+6 |
|/ / / / | |||||
| * | | | Space out purchase details on ShapeShift form | Dan Finlay | 2016-09-16 | 2 | -6/+5 |
| * | | | Merge branch 'master' into i675-LoadingBuy | Dan Finlay | 2016-09-16 | 2 | -4/+17 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #676 from MetaMask/tx-viz | Dan Finlay | 2016-09-16 | 2 | -4/+18 |
|\ \ \ \ | |||||
| * | | | | Fix CHANGELOG.md and restructure onClick events | Frankie | 2016-09-16 | 2 | -18/+13 |
| * | | | | linting | Frankie | 2016-09-16 | 1 | -21/+22 |
| * | | | | Merge branch 'master' into tx-viz | Frankie | 2016-09-16 | 11 | -20/+88 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add to CHANGELOG.md | Frankie | 2016-09-16 | 1 | -0/+3 |
| * | | | | add tx-viz link to transaction history | Frankie | 2016-09-16 | 1 | -12/+27 |
| | * | | | Show loading indication when selecting ShapeShift | Dan Finlay | 2016-09-16 | 4 | -11/+14 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #673 from MetaMask/i#519buyButtonTxConf | Dan Finlay | 2016-09-16 | 11 | -20/+88 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Clean up some of the code | Frankie | 2016-09-16 | 2 | -28/+18 |
| * | | | bump changelog | kumavis | 2016-09-16 | 1 | -0/+1 |
| * | | | css - smaller balance warning | kumavis | 2016-09-16 | 1 | -1/+6 |
| * | | | confTx - add insufficient balance warning message | kumavis | 2016-09-16 | 1 | -4/+6 |
| * | | | soften lint warnings | kumavis | 2016-09-16 | 1 | -2/+2 |
| * | | | confTx - show disabled accept btn + add colors | kumavis | 2016-09-16 | 2 | -37/+49 |
| * | | | Merge branch 'master' into i#519buyButtonTxConf | Frankie | 2016-09-16 | 5 | -27/+30 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #671 from MetaMask/UpdateGlobalRefs | Dan Finlay | 2016-09-15 | 1 | -8/+8 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Remove logs | Dan Finlay | 2016-09-15 | 1 | -2/+0 |
| * | | | Merge branch 'master' into UpdateGlobalRefs | Dan Finlay | 2016-09-15 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #669 from MetaMask/Version-2.12.1 | Dan Finlay | 2016-09-15 | 2 | -2/+4 |
|\ \ \ \ | |||||
| | * | | | Merge pull request #669 from MetaMask/Version-2.12.1 | Dan Finlay | 2016-09-15 | 3 | -10/+14 |
| |/| | | |/|/ / / | |||||
| * / / | Version 2.12.12.12.1 | Dan Finlay | 2016-09-15 | 2 | -2/+4 |
|/ / / | |||||
* | | | Merge pull request #666 from MetaMask/i#626 | kumavis | 2016-09-15 | 3 | -17/+15 |
|\ \ \ | |||||
| * | | | Do not show user rejection errors within our UI. | Dan Finlay | 2016-09-15 | 1 | -1/+3 |
| * | | | Merge branch 'master' into i#626 | Frankie | 2016-09-15 | 2 | -2/+5 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #665 from MetaMask/Version-2.12.0 | Dan Finlay | 2016-09-15 | 2 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | Version 2.12.02.12.0 | Dan Finlay | 2016-09-15 | 1 | -1/+1 |
| * | | | | Version 2.11.2 | Dan Finlay | 2016-09-15 | 2 | -2/+5 |
|/ / / / | |||||
| * | | | Remove unused argument | Frankie | 2016-09-15 | 1 | -1/+1 |
| * | | | Fix popup flag assignment | Dan Finlay | 2016-09-15 | 1 | -2/+1 |
| * | | | Merge branch 'master' into i#626 | Frankie | 2016-09-15 | 1 | -1/+1 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Add to CHANGELOG.md | Frankie | 2016-09-15 | 1 | -0/+3 |
| * | | | Dont generate a popup notification when submiting a transaction from with in ... | Frankie | 2016-09-15 | 1 | -17/+11 |
| | |/ | |/| | |||||
| | * | Drop the buy button in the confTx view if account does not have enough eth | Frankie | 2016-09-16 | 7 | -13/+71 |
| | * | Change Testfaucet url | Frankie | 2016-09-16 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #663 from MetaMask/pe805 | Dan Finlay | 2016-09-15 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | deps - bump provider-engine 8.0.5 | kumavis | 2016-09-15 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #657 from MetaMask/library | kumavis | 2016-09-14 | 3 | -51/+144 |
|\ | |||||
| * | Merge branch 'master' into library | kumavis | 2016-09-14 | 9 | -48/+59 |
| |\ | |/ |/| | |||||
* | | Merge pull request #656 from MetaMask/i646-ClosePopupBug | Kevin Serrano | 2016-09-14 | 2 | -3/+12 |
|\ \ | |||||
| * \ | Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into... | Dan Finlay | 2016-09-14 | 8 | -45/+47 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into i646-ClosePopupBug | Dan Finlay | 2016-09-14 | 8 | -45/+47 |
| | |\ \ | |_|/ / |/| | | | |||||
* | | | | Merge pull request #648 from MetaMask/qrCode | Dan Finlay | 2016-09-14 | 8 | -45/+47 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into qrCode | Frankie | 2016-09-14 | 22 | -118/+472 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove unused code in qr actions | Frankie | 2016-09-13 | 1 | -2/+0 |
| * | | | | Merge branch 'master' into qrCode | Frankie | 2016-09-13 | 11 | -92/+173 |
| |\ \ \ \ | |||||
| * | | | | | Add to CHANGELOG.md | Frankie | 2016-09-13 | 1 | -0/+1 |
| * | | | | | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo... | Frankie | 2016-09-13 | 7 | -45/+48 |
| | | | * | | Merge branch 'master' into i646-ClosePopupBug | Dan Finlay | 2016-09-14 | 0 | -0/+0 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||||
| | | * | | | Bump changelog | Dan Finlay | 2016-09-14 | 1 | -0/+3 |
| | | |/ / | |||||
| | | * | | Merge pull request #655 from MetaMask/FixPortStreamEnd | kumavis | 2016-09-14 | 2 | -5/+10 |
| | | |\ \ | |||||
| | | | | * | mascara - run background in iframe | kumavis | 2016-09-14 | 3 | -51/+144 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #655 from MetaMask/FixPortStreamEnd | kumavis | 2016-09-14 | 1 | -2/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Fix port stream end bug | Dan Finlay | 2016-09-14 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge pull request #651 from MetaMask/library | kumavis | 2016-09-14 | 18 | -114/+465 |
|\ \ \ | |||||
| * | | | mascara - serve popup bundle | kumavis | 2016-09-14 | 1 | -10/+22 |
| * | | | PendingTxDetails - partially remove imagify support | kumavis | 2016-09-14 | 1 | -26/+11 |
| * | | | Merge branch 'library' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-13 | 11 | -92/+177 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into library | kumavis | 2016-09-13 | 11 | -92/+177 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #650 from MetaMask/FixCacheBustBug2.11.1 | Dan Finlay | 2016-09-13 | 3 | -2/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix cache clearing reference for Opera | Dan Finlay | 2016-09-13 | 3 | -2/+6 |
|/ / / / | |||||
* | | | | Merge pull request #647 from MetaMask/Version-2.11.02.11.0 | Dan Finlay | 2016-09-13 | 2 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | Version 2.11.0 | Dan Finlay | 2016-09-13 | 2 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #645 from MetaMask/FixPasswording | Kevin Serrano | 2016-09-13 | 9 | -91/+170 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Make cache clearning error tolerant | Dan Finlay | 2016-09-13 | 1 | -1/+6 |
| * | | | Fix clearing of account cache on vault restore | Dan Finlay | 2016-09-13 | 2 | -11/+13 |
| * | | | Ensure loading indication covers fox | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| * | | | Linted | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
| * | | | Load accounts into ethStore on unlock | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| * | | | Fix single account list formatting | Dan Finlay | 2016-09-13 | 2 | -5/+2 |
| * | | | Add accounts back to metamask state | Dan Finlay | 2016-09-13 | 5 | -15/+19 |
| * | | | Merge branch 'master' into FixPasswording | Dan Finlay | 2016-09-13 | 6 | -16/+18 |
| |\ \ \ | |/ / / |/| | | | |||||
| * | | | Fix keystore reference | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| * | | | Fix some references | Dan Finlay | 2016-09-13 | 2 | -4/+4 |
| * | | | Fix account unlocking | Dan Finlay | 2016-09-13 | 3 | -29/+33 |
| | * | | mascara - add readme | kumavis | 2016-09-13 | 2 | -5/+6 |
| | * | | mascara - everything but the popup bundle | kumavis | 2016-09-13 | 4 | -4/+29 |
| | * | | popup - breakout popup-core | kumavis | 2016-09-13 | 2 | -61/+71 |
| | * | | popup - further clean and comment | kumavis | 2016-09-13 | 1 | -17/+13 |
| | * | | ui - remove unused currentDomain prop | kumavis | 2016-09-13 | 5 | -23/+3 |
| | * | | mascara - server - prepare to serve popup | kumavis | 2016-09-13 | 1 | -1/+3 |
| | |/ | |||||
| | * | bugfix - prevent iframe restart restart | kumavis | 2016-09-13 | 2 | -5/+9 |
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-13 | 54 | -560/+1341 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge pull request #644 from MetaMask/revert-638-i555-SaltVault | Frankie | 2016-09-13 | 8 | -151/+89 |
|\ \ \ | |/ / |/| | | |||||
| * | | Revert "Add new eth-lightwallet salting to vault." | Frankie | 2016-09-13 | 8 | -151/+89 |
|/ / | |||||
* | | Merge pull request #638 from MetaMask/i555-SaltVault | Frankie | 2016-09-13 | 8 | -89/+151 |
|\ \ | |||||
| * \ | Merge branch 'master' into i555-SaltVault | Dan Finlay | 2016-09-13 | 1 | -0/+7 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #639 from MetaMask/DevFaq | Kevin Serrano | 2016-09-13 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | Add developer faq to top of readme | Dan Finlay | 2016-09-10 | 1 | -0/+7 |
|/ / / | |||||
| * | | Select first address when restoring vault | Dan Finlay | 2016-09-12 | 2 | -2/+28 |
| * | | Fix ethStore pushed addresses | Dan Finlay | 2016-09-12 | 1 | -1/+1 |
| * | | Fix account list formatting when only a single item. | Dan Finlay | 2016-09-12 | 2 | -10/+7 |
| * | | Fixed caching bug | Dan Finlay | 2016-09-11 | 2 | -12/+6 |
| * | | Correct assertion for BIP32 compliance | Dan Finlay | 2016-09-11 | 1 | -1/+1 |
| * | | Remove log | Dan Finlay | 2016-09-11 | 1 | -1/+0 |
| * | | Add more bip44 assertions | Dan Finlay | 2016-09-11 | 1 | -1/+9 |
| * | | Made bip44 assertions easier to add to | Dan Finlay | 2016-09-11 | 1 | -27/+36 |
| * | | Clean up tests | Dan Finlay | 2016-09-11 | 1 | -18/+17 |
| * | | Correctly clear ethStore cache on new vault restore | Dan Finlay | 2016-09-11 | 2 | -13/+38 |
| * | | Captured #640 in failing test | Dan Finlay | 2016-09-11 | 2 | -1/+17 |
| * | | Camelcase dataset key for react | Dan Finlay | 2016-09-11 | 3 | -8/+8 |
| * | | Bump changelog | Dan Finlay | 2016-09-10 | 1 | -0/+1 |
| * | | Add new eth-lightwallet salting to vault. | Dan Finlay | 2016-09-10 | 2 | -58/+46 |
|/ / | |||||
* | | Merge pull request #636 from MetaMask/how-it-works-bug | Kevin Serrano | 2016-09-10 | 2 | -3/+5 |
|\ \ | |||||
| * | | Update changelog | Kevin Serrano | 2016-09-10 | 1 | -1/+1 |
| * | | Do not trigger how-to-video on anything but install. | Kevin Serrano | 2016-09-10 | 1 | -2/+4 |
|/ / | |||||
* | | Merge pull request #630 from MetaMask/i610-InitOneWalletOnly | Kevin Serrano | 2016-09-10 | 2 | -1/+2 |
|\ \ | |||||
| * | | Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ... | Kevin Serrano | 2016-09-10 | 2 | -1/+2 |
|/| | | |||||
| * | | Bump changelog | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| * | | Only init one wallet on restore | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
* | | | Merge pull request #632 from MetaMask/FixLogoPasswordFollow | Kevin Serrano | 2016-09-10 | 2 | -3/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into FixLogoPasswordFollow | Kevin Serrano | 2016-09-10 | 2 | -0/+3 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #631 from MetaMask/i599-LoginLoadingIndication | Kevin Serrano | 2016-09-10 | 2 | -0/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Show loading indication during unlocking. | Dan Finlay | 2016-09-09 | 2 | -0/+3 |
|/ / / | |||||
| * / | Fix fox logo password following | Dan Finlay | 2016-09-09 | 2 | -3/+2 |
|/ / | |||||
* | | Merge pull request #629 from MetaMask/FixLogoLeak | Frankie | 2016-09-09 | 3 | -5/+8 |
|\ \ | |||||
| * \ | Merge branch 'master' into FixLogoLeak | Dan Finlay | 2016-09-09 | 7 | -9/+17 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #627 from MetaMask/i#589pendingTxsIssue | Dan Finlay | 2016-09-09 | 7 | -9/+17 |
|\ \ \ | |||||
| * \ \ | Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-p... | Frankie | 2016-09-09 | 7 | -177/+29 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 7 | -177/+29 |
| | |\ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix wording in changelog and bug | Frankie | 2016-09-09 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | Remove console.log | Frankie | 2016-09-09 | 1 | -1/+0 |
| * | | | Add to CHANGELOG.md and Remove unnecessary catch | Frankie | 2016-09-09 | 2 | -9/+1 |
| * | | | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 15 | -178/+206 |
| |\ \ \ | |||||
| * | | | | Add network checks for unconfirmed Txs | Frankie | 2016-09-09 | 5 | -8/+25 |