aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into i328-MultiVaultkumavis2016-11-113-2/+26
|\
| * Merge pull request #805 from MetaMask/i804kumavis2016-11-113-2/+26
| |\ | | | | | | detect tx error - show warning and fix gasLimit
| | * changelog - updatekumavis2016-11-111-0/+1
| | |
| | * detect tx error - show warning and fix gasLimitkumavis2016-11-112-2/+25
| |/
* | Merge pull request #802 from MetaMask/confTxFixKevin Serrano2016-11-119-28/+33
|\ \ | | | | | | Conf tx fix
| * | fix tx data so it has the network idFrankie2016-11-112-2/+9
| | |
| * | Merge branch 'master' into i328-MultiVaultFrankie2016-11-118-26/+24
|/| | | |/
| * Merge pull request #801 from MetaMask/deadlyKevin Serrano2016-11-106-18/+14
| |\ | | | | | | Properly implement 20% gas bump
| | * remove gas field, due to alias redundancy.Kevin Serrano2016-11-101-1/+0
| | |
| | * Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-103-1/+3
| | |
| | * Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadlyKevin Serrano2016-11-103-17/+12
| |/|
| | * Unify warning functions.Kevin G. Serrano2016-11-083-17/+12
| | |
| * | Merge pull request #797 from MetaMask/Version-2.13.7Frankie2016-11-093-2/+4
| |\ \ | | | | | | | | Version 2.13.7
| | * | Hard coding jazzicon at working version2.13.7Dan Finlay2016-11-091-1/+1
| | | |
| | * | Version 2.13.7Dan Finlay2016-11-092-1/+3
| |/ /
| * | Merge pull request #796 from MetaMask/IncreaseGasBufferDan Finlay2016-11-093-8/+8
| |\ \ | | | | | | | | Increase gas buffer
| | * | Adjust gas buffer to be 20% over estimateDan Finlay2016-11-093-7/+7
| | | |
| | * | Increase gas bufferDan Finlay2016-11-093-4/+4
| |/ / | | | | | | | | | Fixes #795
* | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-084-17/+48
|\| |
| * | Merge pull request #793 from MetaMask/i787-HighGasBugKevin Serrano2016-11-083-16/+45
| |\ \ | | |/ | |/| i787 High gas bug
| | * Fix gas price bufferingDan Finlay2016-11-083-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 #787Dan Finlay2016-11-081-11/+41
| |/
| * Merge pull request #786 from MetaMask/i763-GithubLinkkumavis2016-11-012-1/+3
| |\ | | | | | | Fix github link on info page
| | * Fix github link on info pageDan Finlay2016-11-012-1/+3
| |/
* | Fix integration test suiteDan Finlay2016-11-083-13/+5
| |
* | Fix nickname testDan Finlay2016-11-081-0/+1
| |
* | Fix BN referenceDan Finlay2016-11-081-0/+1
| |
* | Fix 787 gas buffer bugDan Finlay2016-11-082-9/+25
| |
* | Fix network checkingDan Finlay2016-11-051-21/+1
| |
* | Remove insane actions hashDan Finlay2016-11-051-6/+2
| |
* | Add tolerance to normalize methodDan Finlay2016-11-041-0/+1
| |
* | Fix password validation and persistence issueDan Finlay2016-11-043-4/+30
| | | | | | | | Was wiping the vault on each successful password attempt... :P
* | Implement private key exporting.Kevin Serrano2016-11-042-3/+22
| |
* | Finish fixing nicknaming bugDan Finlay2016-11-042-28/+70
| |
* | Fix account nicknaming bugDan Finlay2016-11-043-3/+19
| | | | | | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
* | Fix vault creation bugDan Finlay2016-11-042-25/+41
| |
* | Set test env during testsDan Finlay2016-11-041-1/+1
| |
* | Don't faucet during testsDan Finlay2016-11-041-1/+2
| |
* | Don't faucet in developmentDan Finlay2016-11-041-1/+3
| |
* | Fix dual vault creation bugDan Finlay2016-11-032-12/+16
| |
* | Fix initial vault creationDan Finlay2016-11-031-4/+8
| |
* | Fix handling of migrating old vault styleDan Finlay2016-11-035-56/+114
| | | | | | | | | | | | Now old vaults are recognized as an "Initialized" MetaMask instance. Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps.
* | 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
| | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.
* | 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
| | | | | | | | | | Remove logs. Move HD render files to ui/app.
* | Implement auto-faucetingKevin Serrano2016-11-011-1/+6
| |
* | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-315-16/+142
|\ \ | | | | | | | | | i328-MultiVault
| * | Now migrating old vaults to new DEN formatDan Finlay2016-10-295-16/+142
| | |
* | | Make case condition more consistent. Remove extra action. Fix incorrect ↵Kevin Serrano2016-10-312-2/+3
| | | | | | | | | | | | display of network.
* | | 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 ↵Kevin Serrano2016-10-2913-30/+465
|\| | | | | | | | | | | i328-MultiVault
| * | 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 ↵Dan Finlay2016-10-2620-205/+7
| |\ \ | | | | | | | | | | | | i328-MultiVault
| * \ \ 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 build
| | * | | 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
| |\ \ \ | | | | | | | | | | Add more info to mascara README
| | * \ \ Merge branch 'master' into walkThroughFrankie2016-10-272-1/+2
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #767 from MetaMask/UpdateWeb3kumavis2016-10-272-1/+2
| |\ \ \ \ | | | | | | | | | | | | Update web3.js version
| | * \ \ \ 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.6
| | * | | | Version 2.13.6Dan Finlay2016-10-272-1/+3
| |/ / / /
| * | | | 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
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | * | | Rename wallet to accountDan Finlay2016-10-262-1/+2
| | |/ / / | | | | | | | | | | | | | | | Fixes #762
| | | * | 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 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.
| * | 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 branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-194-3/+7
| | |\ \
| | * | | 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
* | | | | 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 ↵Kevin Serrano2016-10-2415-87/+712
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | i328-MultiVault
| * | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | | 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
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | 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 warning
| | * | 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 ↵Dan Finlay2016-10-2127-120/+483
|\ \ \ | | | | | | | | | | | | i328-MultiVault
| * \ \ 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
| | |\ \ \ | | | | | | | | | | | | 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.
| | * | 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
| | | |_|_|/ / | | |/| | | |
| * | | | | | 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 ↵Kevin Serrano2016-10-1311-144/+467
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | origin/i328-MultiVault
| * | | | | | 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
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new Qunit build process that will browserify the contents of `test/integration/lib` into the QUnit browser, allowing much more modular testing, including unit testing of our modules in our target browsers. Made a basic unit test file of this form for the new encryptor module, which fails miserably because I've only just begun to work with it. I've started with this blog post as a starting point, and will be adjusting it to our needs from there: http://qnimate.com/passphrase-based-encryption-using-web-cryptography-api/
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.
* | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-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
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | 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 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
generated by cgit (git 2.34.1) at 2024-10-15 08:28:23 +0800