aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #768 from MetaMask/i762-RenameWalletToAccountDan Finlay2016-10-272-1/+2
|\ | | | | Rename wallet to account
| * Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-273-9/+10
| |\ | |/ |/|
* | Merge pull request #764 from MetaMask/761-FixCustomMordenIndicationKevin Serrano2016-10-273-9/+10
|\ \ | | | | | | Fix provider menu selection indication
| * \ Merge branch 'master' into 761-FixCustomMordenIndicationDan Finlay2016-10-272-2/+3
| |\ \ | |/ / |/| |
| * | Bump changelogDan Finlay2016-10-261-0/+2
| | |
| * | Fix provider menu selection indicationDan Finlay2016-10-262-9/+8
| | |
| | * Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-272-2/+3
| | |\ | |_|/ |/| |
* | | Merge pull request #769 from MetaMask/FixDelegateCallDan Finlay2016-10-261-1/+1
|\ \ \ | | | | | | | | Fix delegate call function reference 2
| * | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
|/ / /
* | | Merge pull request #766 from MetaMask/FixDelegateCallCheckDan Finlay2016-10-262-1/+2
|\ \ \ | |/ / |/| | Fix delegate call analysis
| * | Fix delegate call analysisDan Finlay2016-10-262-1/+2
|/ / | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again.
| * Rename wallet to accountDan Finlay2016-10-262-1/+2
|/ | | | Fixes #762
* Merge pull request #745 from MetaMask/i743-FixDelegateCallFlagkumavis2016-10-254-14/+35
|\ | | | | Reproduced issue 743 in test case
| * test - fix delegate-call testkumavis2016-10-254-12/+10
| |
| * Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-255-2/+37
| |\ | |/ |/|
* | Merge pull request #752 from MetaMask/i#741Dan Finlay2016-10-224-1/+36
|\ \ | | | | | | Add validations to txData param in send form
| * | Change regex in isHex functionFrankie2016-10-221-4/+1
| | |
| * | Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741Frankie2016-10-221-1/+1
| |\ \
| | * \ Merge branch 'master' into i#741Frankie2016-10-211-1/+1
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #751 from MetaMask/ClarifyCallbackRoleFrankie2016-10-211-1/+1
|\ \ \ \ | | | | | | | | | | Add note about callback param to sync method warning
| * | | | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
|/ / / /
| * / / clean up the isHex functionFrankie2016-10-221-3/+4
| |/ /
| * | Clean up testsFrankie2016-10-211-4/+4
| | |
| * | Add test and ability for isHex to handle hex strings with hex-prefixFrankie2016-10-202-0/+6
| | |
| * | Fix up wordingFrankie2016-10-201-1/+1
| | |
| * | Fix CHANGELOGFrankie2016-10-201-0/+1
| | |
| * | Merge branch 'master' into i#741Frankie2016-10-204-3/+7
| |\ \ | |/ / |/| |
| * | Add unit test for isHex and add to CHANGELOG.mdFrankie2016-10-202-0/+18
| | |
| * | Add valdations to txData paramFrankie2016-10-202-0/+12
| | |
| | * Merge branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-194-3/+7
| | |\ | |_|/ |/| |
* | | Merge pull request #749 from MetaMask/Version-2.13.5Kevin Serrano2016-10-193-2/+4
|\ \ \ | | | | | | | | Version 2.13.5
| * | | Fix changelog dateDan Finlay2016-10-191-1/+1
| | | |
| * | | Fix cli flag capitalizationDan Finlay2016-10-191-1/+1
| | | |
| * | | Version 2.13.5v2.13.5Dan Finlay2016-10-192-1/+3
| | | |
| * | | Remove livereload from prod buildsDan Finlay2016-10-191-1/+1
|/ / /
* | | Merge pull request #748 from MetaMask/i746-ReloadBugkumavis2016-10-192-1/+3
|\ \ \ | |/ / |/| | Wait for first metamask data to establish ping-pong stream.
| * | Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-192-1/+3
|/ / | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746.
| * Reproduced issue 743 in test caseDan Finlay2016-10-183-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-IncreaseGaskumavis2016-10-183-1/+29
|\ | | | | Increase gas estimate by 100000 wei
| * Restore hex prefix to gas priceDan Finlay2016-10-182-1/+2
| |
| * Increase gas estimate by 100000 weiDan Finlay2016-10-183-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.4Kevin Serrano2016-10-183-2/+5
|\ | | | | Version 2.13.4
| * Version 2.13.4Dan Finlay2016-10-183-2/+5
|/
* Merge pull request #736 from MetaMask/i735-xmlfixDan Finlay2016-10-182-2/+15
|\ | | | | Prevent injections on XML
| * Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-189-38/+213
| |\ | |/ |/|
* | Merge pull request #720 from MetaMask/i#495CustomGasFieldkumavis2016-10-179-38/+214
|\ \ | | | | | | add a gasPrice field
| * | Fix for lintingFrankie2016-10-141-1/+1
| | |
| * | Create callback and Clean-up detailsFrankie2016-10-144-12/+19
| | |
| * | fix spellingFrankie2016-10-141-4/+2
| | |
| * | Specify base 10 in bignumberFrankie2016-10-142-2/+2
| | |
| * | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-148-37/+59
| |\ \ | |/ / |/| |
| * | Fix gasPrice rangeFrankie2016-10-148-20/+37
| | |
| * | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-1216-83/+365
| |\ \
| * | | Add to CHANGELOGFrankie2016-10-111-0/+2
| | | |
| * | | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-1114-33/+58
| |\ \ \
| * | | | Add custom gas field to send pageFrankie2016-10-114-33/+185
| | | | |
| | | | * Lint.Kevin Serrano2016-10-161-1/+1
| | | | |
| | | | * Bump changelog.Kevin Serrano2016-10-161-0/+2
| | | | |
| | | | * Prevent XML from web3 injections.Kevin Serrano2016-10-161-2/+14
| |_|_|/ |/| | |
* | | | Merge pull request #730 from MetaMask/i695-dapp-reloadkumavis2016-10-137-35/+57
|\ \ \ \ | | | | | | | | | | dapp reload - fixed disconnect detection via polling
| * \ \ \ Merge branch 'master' into i695-dapp-reloadkumavis2016-10-131-2/+2
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #733 from MetaMask/tos-fixKevin Serrano2016-10-131-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix misnamed variable.
| * | | | Remove logs.Kevin Serrano2016-10-131-2/+0
| | | | |
| * | | | Fix misnamed variable.Kevin Serrano2016-10-131-2/+4
|/ / / /
| * | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-1316-83/+365
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #723 from MetaMask/i721-ScrollAccountListFrankie2016-10-124-34/+69
|\ \ \ \ | | | | | | | | | | I721 scroll account list
| * \ \ \ Merge branch 'master' into i721-ScrollAccountListDan Finlay2016-10-1213-49/+296
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #702 from MetaMask/tosDan Finlay2016-10-1213-49/+296
|\ \ \ \ \ | |_|_|_|/ |/| | | | Terms of Service UI Update
| * | | | Remove logs.Kevin Serrano2016-10-121-3/+0
| | | | |
| * | | | Remove comments.Kevin Serrano2016-10-121-16/+0
| | | | |
| * | | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tosKevin Serrano2016-10-121-0/+2
| |\ \ \ \
| | * | | | Fix bug where new vaults had no nicknamesDan Finlay2016-10-121-0/+2
| | | | | |
| * | | | | Cleanup.Kevin Serrano2016-10-124-13/+26
| |/ / / /
| * | | | lintKevin Serrano2016-10-121-2/+1
| | | | |
| * | | | Move tos hash comparison logic from background to mm controller.Kevin Serrano2016-10-122-27/+16
| | | | |
| * | | | Remove version from terms of service.Kevin Serrano2016-10-121-3/+1
| | | | |
| * | | | Move tos hash logic to build phase. Create dynamic global variables based on ↵Kevin Serrano2016-10-124-3/+12
| | | | | | | | | | | | | | | | | | | | build.
| * | | | Modify changelog.Kevin Serrano2016-10-071-0/+1
| | | | |
| * | | | Prevent back/login buttons from appearing on the terms of service.Kevin Serrano2016-10-071-0/+1
| | | | |
| * | | | Fix linting and guarantees set TOS hash.Kevin Serrano2016-10-071-0/+1
| | | | |
| * | | | Fix retention of terms of service hash across reloads of plugin.Kevin Serrano2016-10-071-1/+1
| | | | |
| * | | | Renamed variables to make more sense.Kevin Serrano2016-10-071-2/+2
| | | | |
| * | | | Add missing path require statement.Kevin Serrano2016-10-071-0/+1
| | | | |
| * | | | Merge branch 'tos' into tosplusupdatecheckKevin Serrano2016-10-071-1/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into tosKevin Serrano2016-10-071-1/+1
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | On update, check whether the TOS has changed using hashes.Kevin Serrano2016-10-061-1/+16
| | | | | |
| * | | | | Add controller functions for storing and checking TOS hashes.Kevin Serrano2016-10-061-1/+34
| | | | | |
| * | | | | Add new functions for storing TOS hashes in config manager.Kevin Serrano2016-10-061-0/+11
| | | | | |
| * | | | | Add string-hash as a package.Kevin Serrano2016-10-061-0/+1
| |/ / / /
| * | | | Merge branch 'master' into tosKevin Serrano2016-10-068-10/+21
| |\ \ \ \
| * | | | | Fix integration test.Kevin Serrano2016-10-061-8/+15
| | | | | |
| * | | | | Rewritten to react standards. Way easier.Kevin Serrano2016-10-052-10/+9
| | | | | |
| * | | | | Linting.Kevin Serrano2016-10-051-3/+3
| | | | | |
| * | | | | Add to changelog.Kevin Serrano2016-10-051-0/+3
| | | | | |
| * | | | | Rename drop menu item to be consistent with naming.Kevin Serrano2016-10-051-1/+1
| | | | | |
| * | | | | Add relevant legal links to help page.Kevin Serrano2016-10-051-8/+41
| | | | | |
| * | | | | Make config page title consistent with menu item.Kevin Serrano2016-10-051-1/+1
| | | | | |
| * | | | | Add links to relevant legal pages on user agreement page.Kevin Serrano2016-10-052-5/+14
| | | | | |
| * | | | | Add conditional logic for adding listener.Kevin Serrano2016-10-051-3/+5
| | | | | |
| * | | | | Add padding to markdown paragraphs.Kevin Serrano2016-10-051-0/+4
| | | | | |
| * | | | | Merge branch 'master' into tosKevin Serrano2016-10-0510-26/+40
| |\ \ \ \ \
| * | | | | | Add CSS rules for proper formatting.Kevin Serrano2016-10-051-1/+7
| | | | | | |
| * | | | | | Modify USER_AGREEMENT to be formatted properly.Kevin Serrano2016-10-051-36/+37
| | | | | | |
| * | | | | | Implemented scroll-to-bottom functionality for button activation.Kevin Serrano2016-10-051-2/+10
| | | | | | |
| * | | | | | Merge branch 'master' into tosKevin Serrano2016-10-039-20/+36
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into tosKevin Serrano2016-09-1913-32/+114
| |\ \ \ \ \ \
| * | | | | | | Modify terms.Kevin Serrano2016-09-191-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'master' into tosKevin Serrano2016-09-155-20/+23
| |\ \ \ \ \ \ \
| * | | | | | | | Modify user agreementKevin Serrano2016-09-151-28/+148
| | | | | | | | |
| | | | | | | * | Bump changelogDan Finlay2016-10-121-0/+1
| | | | | | | | |
| | | | | | | * | Remove flex class from account list containerDan Finlay2016-10-121-1/+1
| | | | | | | | |
| | | | | | | * | Add more accounts to account list ui stateDan Finlay2016-10-122-33/+67
| |_|_|_|_|_|/ / |/| | | | | | |
| | | | | | | * dapp reload - fixed disconnect detection via pollingkumavis2016-10-137-35/+57
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #710 from MetaMask/EmphasizeAutoUpdatingDan Finlay2016-10-061-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Emphasize auto-updating in announcement
| * | | | | | Emphasize auto-updating in announcementDan Finlay2016-10-061-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Helps avoid issues like #703 by emphasizing uninstalling is not required.
* | | | | | Merge pull request #709 from MetaMask/i707-MixedCaseAddressesDan Finlay2016-10-063-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add tolerance for mixed case addresses
| * | | | | | Made announcer use correct text boldingDan Finlay2016-10-061-1/+1
| | | | | | |
| * | | | | | Add tolerance for sending from mixed-case addresses.Dan Finlay2016-10-062-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.3Dan Finlay2016-10-064-6/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Little fixes
| * | | | | | Bump provider-engine versionDan Finlay2016-10-061-1/+1
| | | | | | |
| * | | | | | Correct async linkDan Finlay2016-10-061-4/+4
| | | | | | |
| * | | | | | Add extension store description for easy referenceDan Finlay2016-10-061-0/+8
| | | | | | |
| * | | | | | Rebuild dev statesDan Finlay2016-10-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #701 from MetaMask/Version-2.13.3kumavis2016-10-053-2/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Version 2.13.3
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3kumavis2016-10-058-4/+21
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #696 from MetaMask/SmallerCopiedButtonkumavis2016-10-053-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Formatting Fixes
| * \ \ \ \ \ Merge branch 'master' into SmallerCopiedButtonkumavis2016-10-055-3/+17
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #694 from MetaMask/AddAnnouncerScriptkumavis2016-10-052-1/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add announcer script
| * \ \ \ \ \ \ Merge branch 'master' into AddAnnouncerScriptkumavis2016-10-055-5/+10
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #700 from MetaMask/OperaCompatibilitykumavis2016-10-053-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Opera compatibility
| * \ \ \ \ \ \ \ Merge branch 'master' into OperaCompatibilityDan Finlay2016-10-052-3/+7
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add Opera compatibilityDan Finlay2016-10-053-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix incorrect OS key - Add additional icon image sizes.
| | * | | | | | | Add announcer scriptDan Finlay2016-10-052-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 SmallerCopiedButtonFrankie2016-10-052-3/+7
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | Bump changelogDan Finlay2016-10-051-0/+1
| | | | | | | |
| | * | | | | | Make popup a little tallerDan Finlay2016-10-051-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 smallerDan Finlay2016-10-052-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | To avoid formatting glitches on some machines.
| | * / / / / Version 2.13.3Dan Finlay2016-10-053-2/+6
| |/ / / / / |/| | | | | | | | | | | | | | | | | Bumps provider-engine to fix log query filtering bug.
* | | | | | Merge pull request #697 from MetaMask/StripPrivateKeyPrefixFrankie2016-10-052-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Removed hex prefix from private key export
| * | | | | Removed hex prefix from private key exportDan Finlay2016-10-052-3/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | For compatibility with Jaxx, MEW, and Geth. Fixes #687
* | | | | Merge pull request #693 from MetaMask/Version-2.13.22.13.2Dan Finlay2016-10-053-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Version 2.13.2
| * | | | | Version 2.13.2Dan Finlay2016-10-053-2/+5
|/ / / / /
* | | | | Merge pull request #692 from MetaMask/ParityFixKevin Serrano2016-10-042-17/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | Improve popup behavior for tx errors
| * | | | Improve popup behavior for parity errorsDan Finlay2016-10-042-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.
* | | | Merge pull request #689 from MetaMask/i#688Dan Finlay2016-10-022-1/+4
|\ \ \ \ | | | | | | | | | | Fix for where fiat conversion does not persist when switching networks
| * | | | Fix for readabilityFrankie2016-10-021-1/+1
| | | | |
| * | | | Add to CHANGELOGFrankie2016-10-011-0/+2
| | | | |
| * | | | Fix issue #688 where fiat conversion does not persist when switching networksFrankie2016-10-011-1/+2
|/ / / /
* | | | Merge pull request #684 from MetaMask/Version2.13.1Dan Finlay2016-09-233-3/+7
|\ \ \ \ | | | | | | | | | | Version 2.13.1
| * | | | Version 2.13.12.13.1Dan Finlay2016-09-233-3/+7
|/ / / /
* | | | Merge pull request #677 from MetaMask/i675-LoadingBuyDan Finlay2016-09-226-17/+18
|\ \ \ \ | | | | | | | | | | Show loading indication when selecting ShapeShift
| * \ \ \ Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-224-2/+10
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #678 from MetaMask/ParityComplianceDan Finlay2016-09-224-2/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | Parity compliance
| * | | | Version 2.13.0Dan Finlay2016-09-192-2/+4
| | | | |
| * | | | Bump web3 provider engine version for Parity complianceDan Finlay2016-09-191-1/+1
| | | | |
| * | | | Drop origin key from requests for Parity compatibilityDan Finlay2016-09-192-0/+6
|/ / / /
| * | | Space out purchase details on ShapeShift formDan Finlay2016-09-162-6/+5
| | | |
| * | | Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-162-4/+17
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #676 from MetaMask/tx-vizDan Finlay2016-09-162-4/+18
|\ \ \ \ | | | | | | | | | | Add eth-tx-viz link to tx history
| * | | | Fix CHANGELOG.md and restructure onClick eventsFrankie2016-09-162-18/+13
| | | | |
| * | | | lintingFrankie2016-09-161-21/+22
| | | | |
| * | | | Merge branch 'master' into tx-vizFrankie2016-09-1611-20/+88
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Add to CHANGELOG.mdFrankie2016-09-161-0/+3
| | | | |
| * | | | add tx-viz link to transaction historyFrankie2016-09-161-12/+27
| | | | |
| | * | | Show loading indication when selecting ShapeShiftDan Finlay2016-09-164-11/+14
| |/ / / |/| | |
* | | | Merge pull request #673 from MetaMask/i#519buyButtonTxConfDan Finlay2016-09-1611-20/+88
|\ \ \ \ | |/ / / |/| | | Drop the buy button in if tx is more then account balance
| * | | Clean up some of the codeFrankie2016-09-162-28/+18
| | | |
| * | | bump changelogkumavis2016-09-161-0/+1
| | | |
| * | | css - smaller balance warningkumavis2016-09-161-1/+6
| | | |
| * | | confTx - add insufficient balance warning messagekumavis2016-09-161-4/+6
| | | |
| * | | soften lint warningskumavis2016-09-161-2/+2
| | | |
| * | | confTx - show disabled accept btn + add colorskumavis2016-09-162-37/+49
| | | |
| * | | Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-165-27/+30
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #671 from MetaMask/UpdateGlobalRefsDan Finlay2016-09-151-8/+8
|\ \ \ \ | |_|_|/ |/| | | Update global refs
| * | | Remove logsDan Finlay2016-09-151-2/+0
| | | |
| * | | Merge branch 'master' into UpdateGlobalRefsDan Finlay2016-09-150-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #669 from MetaMask/Version-2.12.1Dan Finlay2016-09-152-2/+4
|\ \ \ \ | | | | | | | | | | Version 2.12.1
| | * | | Merge pull request #669 from MetaMask/Version-2.12.1Dan Finlay2016-09-153-10/+14
| |/| | | |/|/ / / | | | | | | | | Version 2.12.1
| * / / Version 2.12.12.12.1Dan Finlay2016-09-152-2/+4
|/ / /
* | | Merge pull request #666 from MetaMask/i#626kumavis2016-09-153-17/+15
|\ \ \ | | | | | | | | Dont generate a popup notification for transactions from within metmask-extension
| * | | Do not show user rejection errors within our UI.Dan Finlay2016-09-151-1/+3
| | | |
| * | | Merge branch 'master' into i#626Frankie2016-09-152-2/+5
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #665 from MetaMask/Version-2.12.0Dan Finlay2016-09-152-2/+5
|\ \ \ \ | | | | | | | | | | Version 2.12.0
| * | | | Version 2.12.02.12.0Dan Finlay2016-09-151-1/+1
| | | | |
| * | | | Version 2.11.2Dan Finlay2016-09-152-2/+5
|/ / / /
| * | | Remove unused argumentFrankie2016-09-151-1/+1
| | | |
| * | | Fix popup flag assignmentDan Finlay2016-09-151-2/+1
| | | |
| * | | Merge branch 'master' into i#626Frankie2016-09-151-1/+1
| |\ \ \ | |/ / / |/| | |
| * | | Add to CHANGELOG.mdFrankie2016-09-151-0/+3
| | | |
| * | | Dont generate a popup notification when submiting a transaction from with in ↵Frankie2016-09-151-17/+11
| | |/ | |/| | | | | | | MetaMask
| | * Drop the buy button in the confTx view if account does not have enough ethFrankie2016-09-167-13/+71
| | |
| | * Change Testfaucet urlFrankie2016-09-161-1/+1
| |/ |/|
* | Merge pull request #663 from MetaMask/pe805Dan Finlay2016-09-151-1/+1
|\ \ | |/ |/| deps - bump provider-engine 8.0.5
| * deps - bump provider-engine 8.0.5kumavis2016-09-151-1/+1
|/
* Merge pull request #657 from MetaMask/librarykumavis2016-09-143-51/+144
|\ | | | | mascara - popup initially working
| * Merge branch 'master' into librarykumavis2016-09-149-48/+59
| |\ | |/ |/|
* | Merge pull request #656 from MetaMask/i646-ClosePopupBugKevin Serrano2016-09-142-3/+12
|\ \ | | | | | | Fix popup closing bug
| * \ Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2016-09-148-45/+47
| |\ \ | | | | | | | | | | | | into i646-ClosePopupBug
| | * \ Merge branch 'master' into i646-ClosePopupBugDan Finlay2016-09-148-45/+47
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #648 from MetaMask/qrCodeDan Finlay2016-09-148-45/+47
|\ \ \ \ | | | | | | | | | | Put qr button back in account detail screen...
| * \ \ \ Merge branch 'master' into qrCodeFrankie2016-09-1422-118/+472
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused code in qr actionsFrankie2016-09-131-2/+0
| | | | |
| * | | | Merge branch 'master' into qrCodeFrankie2016-09-1311-92/+173
| |\ \ \ \
| * | | | | Add to CHANGELOG.mdFrankie2016-09-131-0/+1
| | | | | |
| * | | | | Add qrcode-npm to package.json and swap out Qr Code generator api for ↵Frankie2016-09-137-45/+48
| | | | | | | | | | | | | | | | | | | | | | | | node-module
| | | | * | Merge branch 'master' into i646-ClosePopupBugDan Finlay2016-09-140-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
| | | * | | Bump changelogDan Finlay2016-09-141-0/+3
| | | |/ /
| | | * | Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-142-5/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | Fix port stream end bug
| | | | | * mascara - run background in iframekumavis2016-09-143-51/+144
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-141-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Fix port stream end bug
| * | | Fix port stream end bugDan Finlay2016-09-141-2/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Emitting `end` or `close` was not ending the stream. Pushing a null packet also closes a stream, so I did that instead. Fixes #616
* | | Merge pull request #651 from MetaMask/librarykumavis2016-09-1418-114/+465
|\ \ \ | | | | | | | | MetaMask "Mascara" Library - initial PR
| * | | mascara - serve popup bundlekumavis2016-09-141-10/+22
| | | |
| * | | PendingTxDetails - partially remove imagify supportkumavis2016-09-141-26/+11
| | | |
| * | | Merge branch 'library' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-1311-92/+177
| |\ \ \
| | * \ \ Merge branch 'master' into librarykumavis2016-09-1311-92/+177
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #650 from MetaMask/FixCacheBustBug2.11.1Dan Finlay2016-09-133-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix cache clearing reference for Opera
| * | | | Fix cache clearing reference for OperaDan Finlay2016-09-133-2/+6
|/ / / / | | | | | | | | | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it.
* | | | Merge pull request #647 from MetaMask/Version-2.11.02.11.0Dan Finlay2016-09-132-1/+3
|\ \ \ \ | | | | | | | | | | Version 2.11.0
| * | | | Version 2.11.0Dan Finlay2016-09-132-1/+3
|/ / / /
* | | | Merge pull request #645 from MetaMask/FixPasswordingKevin Serrano2016-09-139-91/+170
|\ \ \ \ | |_|_|/ |/| | | Fix account unlocking
| * | | Make cache clearning error tolerantDan Finlay2016-09-131-1/+6
| | | |
| * | | Fix clearing of account cache on vault restoreDan Finlay2016-09-132-11/+13
| | | |
| * | | Ensure loading indication covers foxDan Finlay2016-09-131-0/+1
| | | |
| * | | LintedDan Finlay2016-09-131-2/+2
| | | |
| * | | Load accounts into ethStore on unlockDan Finlay2016-09-131-0/+1
| | | |
| * | | Fix single account list formattingDan Finlay2016-09-132-5/+2
| | | |
| * | | Add accounts back to metamask stateDan Finlay2016-09-135-15/+19
| | | |
| * | | Merge branch 'master' into FixPasswordingDan Finlay2016-09-136-16/+18
| |\ \ \ | |/ / / |/| | |
| * | | Fix keystore referenceDan Finlay2016-09-131-0/+1
| | | |
| * | | Fix some referencesDan Finlay2016-09-132-4/+4
| | | |
| * | | Fix account unlockingDan Finlay2016-09-133-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SubmitPassword was not creating a new id-management This is because I broke up the old "createIdmgmt" method to not perform as much conditional logic. Now the pieces are reusable and do what they should do.
| | * | mascara - add readmekumavis2016-09-132-5/+6
| | | |
| | * | mascara - everything but the popup bundlekumavis2016-09-134-4/+29
| | | |
| | * | popup - breakout popup-corekumavis2016-09-132-61/+71
| | | |
| | * | popup - further clean and commentkumavis2016-09-131-17/+13
| | | |
| | * | ui - remove unused currentDomain propkumavis2016-09-135-23/+3
| | | |
| | * | mascara - server - prepare to serve popupkumavis2016-09-131-1/+3
| | |/
| | * bugfix - prevent iframe restart restartkumavis2016-09-132-5/+9
| | |
| | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-1354-560/+1341
| | |\ | |_|/ |/| |
* | | Merge pull request #644 from MetaMask/revert-638-i555-SaltVaultFrankie2016-09-138-151/+89
|\ \ \ | |/ / |/| | Revert "Add new eth-lightwallet salting to vault."
| * | Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-138-151/+89
|/ /
* | Merge pull request #638 from MetaMask/i555-SaltVaultFrankie2016-09-138-89/+151
|\ \ | | | | | | Add new eth-lightwallet salting to vault.
| * \ Merge branch 'master' into i555-SaltVaultDan Finlay2016-09-131-0/+7
| |\ \ | |/ / |/| |
* | | Merge pull request #639 from MetaMask/DevFaqKevin Serrano2016-09-131-0/+7
|\ \ \ | | | | | | | | Add developer faq to top of readme
| * | | Add developer faq to top of readmeDan Finlay2016-09-101-0/+7
|/ / /
| * | Select first address when restoring vaultDan Finlay2016-09-122-2/+28
| | | | | | | | | | | | Fixes #642
| * | Fix ethStore pushed addressesDan Finlay2016-09-121-1/+1
| | | | | | | | | | | | Needed to add hex prefix always.
| * | Fix account list formatting when only a single item.Dan Finlay2016-09-122-10/+7
| | | | | | | | | | | | | | | | | | - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size.
| * | Fixed caching bugDan Finlay2016-09-112-12/+6
| | | | | | | | | | | | | | | | | | Fixed bug where the second new vault created in an IdStore would initially return the accounts from the original store. Also fixed some tests that were incorrect.
generated by cgit (git 2.34.1) at 2024-12-05 21:15:04 +0800