aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix handling of migrating old vault styleDan Finlay2016-11-035-56/+114
* Add reveal of seed words.Kevin Serrano2016-11-025-2/+52
* Make identicon tolerant of changing stateDan Finlay2016-11-021-0/+17
* Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-026-13/+54
* Make forgot password button.Dan Finlay2016-11-023-32/+23
* Remove and untrack npm debug filesDan Finlay2016-11-022-46/+1
* Fix seed phrase restoreDan Finlay2016-11-023-5/+4
* Made progress on parity for MultiVaultKevin Serrano2016-11-0210-199/+103
* Do not open MM page in dev mode.Kevin Serrano2016-11-021-1/+2
* LintedKevin Serrano2016-11-012-1/+46
* Implement seed word confirmation page.Kevin Serrano2016-11-019-12/+53
* Implement auto-faucetingKevin Serrano2016-11-011-1/+6
* Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-315-16/+142
|\
| * Now migrating old vaults to new DEN formatDan Finlay2016-10-295-16/+142
* | Make case condition more consistent. Remove extra action. Fix incorrect displ...Kevin Serrano2016-10-312-2/+3
* | Add focus to password field.Kevin Serrano2016-10-311-0/+4
* | Add password warning div.Kevin Serrano2016-10-311-2/+7
* | Modify first-screen design to match docs.Kevin Serrano2016-10-311-2/+3
* | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-2913-30/+465
|\|
| * Add vault migration testDan Finlay2016-10-291-0/+91
| * Configure BIP44 Keychain as default oneDan Finlay2016-10-294-11/+44
| * Added hd wallet testsDan Finlay2016-10-282-4/+109
| * Add hd wallet keyringDan Finlay2016-10-282-0/+79
| * Fix identicon renderingDan Finlay2016-10-281-7/+6
| * Update first screen to match design.Dan Finlay2016-10-282-10/+99
| * Add latest jazzicon versionDan Finlay2016-10-281-1/+1
| * Add first-time stateDan Finlay2016-10-282-1/+40
| * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-2620-205/+7
| |\
| * \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-264-14/+35
| |\ \
* | \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-2912-42/+76
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge pull request #778 from MetaMask/mascara-buildkumavis2016-10-273-11/+1
| |\ \ \
| | * | | mascara - remove global transpilekumavis2016-10-272-10/+0
| | * | | mascara - example dapp - log main accountkumavis2016-10-271-1/+1
| |/ / /
| * | | Merge pull request #774 from MetaMask/walkThroughDan Finlay2016-10-272-4/+21
| |\ \ \
| | * \ \ Merge branch 'master' into walkThroughFrankie2016-10-272-1/+2
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #767 from MetaMask/UpdateWeb3kumavis2016-10-272-1/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-272-1/+3
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-274-12/+15
| | |\ \ \ \
| | * | | | | deps - web3 - set version to 0.17.0-betakumavis2016-10-271-1/+1
| | * | | | | Update web3.js versionDan Finlay2016-10-262-1/+2
| | | |_|_|/ | | |/| | |
| | | | * | Fix typos and clean upFrankie2016-10-272-2/+1
| | | | * | Merge branch 'master' into walkThroughFrankie2016-10-275-11/+15
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #773 from MetaMask/Version-2.13.62.13.6Dan Finlay2016-10-272-1/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Version 2.13.6Dan Finlay2016-10-272-1/+3
| |/ / / /
| * | | | Merge pull request #768 from MetaMask/i762-RenameWalletToAccountDan Finlay2016-10-272-1/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-273-9/+10
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #764 from MetaMask/761-FixCustomMordenIndicationKevin Serrano2016-10-273-9/+10
| |\ \ \ \ \
| | * \ \ \ \ 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
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | * | | Rename wallet to accountDan Finlay2016-10-262-1/+2
| | |/ / /
| | | * | Fix the size of the pop-upFrankie2016-10-271-3/+3
| | | * | Add more info about first useFrankie2016-10-271-1/+19
| | |/ / | |/| |
| * | | Merge pull request #769 from MetaMask/FixDelegateCallDan Finlay2016-10-261-1/+1
| |\ \ \
| | * | | 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 analysisDan Finlay2016-10-262-1/+2
| |/ /
| * | Merge pull request #745 from MetaMask/i743-FixDelegateCallFlagkumavis2016-10-254-14/+35
| |\ \
| | * | test - fix delegate-call testkumavis2016-10-254-12/+10
| | * | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-255-2/+37
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-194-3/+7
| | |\ \
| | * | | Reproduced issue 743 in test caseDan Finlay2016-10-183-12/+35
* | | | | Remove debugger statement.Kevin Serrano2016-10-261-1/+0
* | | | | Phase out extra warning screen.Kevin Serrano2016-10-2620-205/+8
* | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-2415-87/+712
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-224-1/+36
| |\| | |
| * | | | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| * | | | Fix loading indicationDan Finlay2016-10-221-1/+1
| * | | | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-222-1/+150
| * | | | Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-223-3/+74
| * | | | Create new vault before each keyringController unit testDan Finlay2016-10-221-3/+5
| * | | | Create basic keyring-controller unit test fileDan Finlay2016-10-224-32/+83
| * | | | Added SimpleKeyring testsDan Finlay2016-10-224-18/+110
| * | | | Added tx and msg signing to keychain & controllerDan Finlay2016-10-214-39/+134
| * | | | Improved simple account generationDan Finlay2016-10-213-35/+52
| * | | | Began adding first basic keyringDan Finlay2016-10-218-13/+166
| * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-244-1/+36
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #752 from MetaMask/i#741Dan Finlay2016-10-224-1/+36
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | 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 i328-MultiVaultKevin Serrano2016-10-211-1/+1
|\| | | | | |_|_|/ |/| | |
| * | | Merge pull request #751 from MetaMask/ClarifyCallbackRoleFrankie2016-10-211-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
| |/ /
* | | Fix background connection referencesDan Finlay2016-10-212-2/+2
* | | Fix testsDan Finlay2016-10-217-179/+16
* | | Linted & added salting to vaultDan Finlay2016-10-217-44/+31
* | | Fix state updating after vault creation and unlockingDan Finlay2016-10-213-4/+11
* | | Fix unlock logicDan Finlay2016-10-211-6/+17
* | | Commented out useless advanced not on init screenDan Finlay2016-10-211-0/+2
* | | Change actions reference to keyringController to backgroundDan Finlay2016-10-212-25/+25
* | | LintedDan Finlay2016-10-211-1/+1
* | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-2127-120/+483
|\ \ \
| * \ \ Resolve merge conflict.Kevin Serrano2016-10-200-0/+0
| |\ \ \
| * \ \ \ Git merge resolution.Kevin Serrano2016-10-2014-45/+267
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #749 from MetaMask/Version-2.13.5Kevin Serrano2016-10-193-2/+4
| | |\ \ \
| | | * | | 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.Dan Finlay2016-10-192-1/+3
| | |/ /
| | * | Merge pull request #744 from MetaMask/i738-IncreaseGaskumavis2016-10-183-1/+29
| | |\ \
| | | * | Restore hex prefix to gas priceDan Finlay2016-10-182-1/+2
| | | * | Increase gas estimate by 100000 weiDan Finlay2016-10-183-1/+28
| | |/ /
| | * | Merge pull request #737 from MetaMask/Version-2.13.4Kevin Serrano2016-10-183-2/+5
| | |\ \
| | | * | Version 2.13.4Dan Finlay2016-10-183-2/+5
| | |/ /
| | * | Merge pull request #736 from MetaMask/i735-xmlfixDan Finlay2016-10-182-2/+15
| | |\ \
| | | * \ Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-189-38/+213
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #720 from MetaMask/i#495CustomGasFieldkumavis2016-10-179-38/+214
| | |\ \ \
| | | * | | 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
| | | |_|_|/ / | | |/| | | |
| * | | | | | Intermediary commit.Kevin Serrano2016-10-209-37/+77
| * | | | | | Remove unused crypto dependencies.Kevin Serrano2016-10-202-4/+0
| * | | | | | Add crypto packages to package.jsonKevin Serrano2016-10-201-0/+2
| * | | | | | Merge in crypto.Kevin Serrano2016-10-209-5/+195
| * | | | | | Initial work on UI sideKevin Serrano2016-10-166-1/+82
| * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into or...Kevin Serrano2016-10-1311-144/+467
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #730 from MetaMask/i695-dapp-reloadkumavis2016-10-137-35/+57
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into i695-dapp-reloadkumavis2016-10-131-2/+2
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #733 from MetaMask/tos-fixKevin Serrano2016-10-131-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | 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
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | dapp reload - fixed disconnect detection via pollingkumavis2016-10-137-35/+57
| | | |_|/ / | | |/| | |
* | | | | | Add debug flag to dev modeDan Finlay2016-10-201-2/+2
| |_|_|_|/ |/| | | |
* | | | | LintedDan Finlay2016-10-152-10/+5
* | | | | Fixed vector usage in encryptorDan Finlay2016-10-151-3/+17
* | | | | Got basic encryptor workingDan Finlay2016-10-152-14/+61
* | | | | Got encrypting working, not yet decryptingDan Finlay2016-10-155-115/+51
* | | | | Began adding browser-native encryptor moduleDan Finlay2016-10-138-3/+201
| |_|/ / |/| | |
* | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-133-15/+94
* | | | Remove additional deprecated actionDan Finlay2016-10-131-15/+0
* | | | Remove opinionated seed word codeDan Finlay2016-10-137-116/+4
* | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-1316-83/+365
|\| | |
| * | | Merge pull request #723 from MetaMask/i721-ScrollAccountListFrankie2016-10-124-34/+69
| |\ \ \
| | * \ \ Merge branch 'master' into i721-ScrollAccountListDan Finlay2016-10-1213-49/+296
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #702 from MetaMask/tosDan Finlay2016-10-1213-49/+296
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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
| | * | | 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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add initial KeyringController filesDan Finlay2016-10-122-0/+183
* | | | | | | | Add to docDan Finlay2016-10-121-0/+13
* | | | | | | | Add multi-vault planning docDan Finlay2016-10-081-0/+175
|/ / / / / / /
* | | | | | | Merge pull request #710 from MetaMask/EmphasizeAutoUpdatingDan Finlay2016-10-061-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Emphasize auto-updating in announcementDan Finlay2016-10-061-1/+1
|/ / / / / /
* | | | | | Merge pull request #709 from MetaMask/i707-MixedCaseAddressesDan Finlay2016-10-063-4/+4
|\ \ \ \ \ \
| * | | | | | 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
|/ / / / / /
* | | | | | Merge pull request #708 from MetaMask/LittleFixes2.13.3Dan Finlay2016-10-064-6/+14
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into SmallerCopiedButtonkumavis2016-10-055-3/+17
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #694 from MetaMask/AddAnnouncerScriptkumavis2016-10-052-1/+14
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into AddAnnouncerScriptkumavis2016-10-055-5/+10
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #700 from MetaMask/OperaCompatibilitykumavis2016-10-053-2/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into OperaCompatibilityDan Finlay2016-10-052-3/+7
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add Opera compatibilityDan Finlay2016-10-053-2/+3
| | * | | | | | | Add announcer scriptDan Finlay2016-10-052-1/+14
| |/ / / / / / /
| | * | | | | | 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
| | * | | | | | Make seed word confirmation button font smallerDan Finlay2016-10-052-0/+3
| |/ / / / / /
| | * / / / / Version 2.13.3Dan Finlay2016-10-053-2/+6
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #697 from MetaMask/StripPrivateKeyPrefixFrankie2016-10-052-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Removed hex prefix from private key exportDan Finlay2016-10-052-3/+7
|/ / / / /
* | | | | Merge pull request #693 from MetaMask/Version-2.13.22.13.2Dan Finlay2016-10-053-2/+5
|\ \ \ \ \
| * | | | | 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 parity errorsDan Finlay2016-10-042-17/+6
|/ / / /
* | | | Merge pull request #689 from MetaMask/i#688Dan Finlay2016-10-022-1/+4
|\ \ \ \
| * | | | 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.12.13.1Dan Finlay2016-09-233-3/+7
|/ / / /
* | | | Merge pull request #677 from MetaMask/i675-LoadingBuyDan Finlay2016-09-226-17/+18
|\ \ \ \
| * \ \ \ Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-224-2/+10
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #678 from MetaMask/ParityComplianceDan Finlay2016-09-224-2/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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
generated by cgit (git 2.34.1) at 2024-10-14 22:15:30 +0800