aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Combine pending-tx-details component into pending-tx-detailsDan Finlay2017-03-242-370/+346
* Bump changelogDan Finlay2017-03-231-0/+3
* Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-238-52/+227
|\
| * Merge pull request #1239 from MetaMask/betterErrorskumavis2017-03-232-5/+11
| |\
| | * Add to CHANGELOGfrankiebee2017-03-231-0/+1
| | * Have better error messagesfrankiebee2017-03-231-5/+10
| |/
| * Require redux-logger of 2.10.2 and up (#1235)Kevin Serrano2017-03-231-1/+1
| * Merge pull request #1226 from MetaMask/i1195-privatekeyexportstyleDan Finlay2017-03-226-46/+215
| |\
| | * Add to changelog.Kevin Serrano2017-03-211-0/+1
| | * Adjust private key confirmation style and logic.Kevin Serrano2017-03-213-46/+75
| | * Add new development states for UI development.Kevin Serrano2017-03-212-0/+139
| |/
* | Got basic validations workingDan Finlay2017-03-235-108/+199
* | Some progressDan Finlay2017-03-232-7/+16
|/
* Merge pull request #1214 from MetaMask/i1181-RemoveLightwalletKevin Serrano2017-03-2110-903/+2
|\
| * Merge branch 'master' into i1181-RemoveLightwalletKevin Serrano2017-03-212-11/+23
| |\ | |/ |/|
* | Merge pull request #1215 from MetaMask/ImprovePersonalSignStyleDan Finlay2017-03-212-11/+23
|\ \
| * | Improve personal_sign styleDan Finlay2017-03-172-11/+23
|/ /
| * Remove eth-lightwalletDan Finlay2017-03-1710-903/+2
|/
* Merge pull request #1198 from MetaMask/i1165-predictiveDan Finlay2017-03-1710-6/+211
|\
| * Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-1531-43/+40
| |\ | |/ |/|
* | Merge pull request #1212 from MetaMask/i1211-currencyretentionkumavis2017-03-1531-43/+40
|\ \
| * \ Merge branch 'master' into i1211-currencyretentionKevin Serrano2017-03-152-1/+6
| |\ \ | |/ / |/| |
| * | Rename variables to proper currency state variables.Kevin Serrano2017-03-155-17/+14
| * | Fix description of some migrations.Kevin Serrano2017-03-152-2/+2
| * | Fix development to use new currency state.Kevin Serrano2017-03-1524-24/+24
| | * Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i...Kevin Serrano2017-03-152-1/+6
| | |\
| | | * Merge branch 'master' into i1165-predictivekumavis2017-03-152-1/+6
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #1207 from MetaMask/i1206-customrpcKevin Serrano2017-03-142-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Changelog addition.Kevin Serrano2017-03-141-0/+1
| * | | Render config screen from unlock.Kevin Serrano2017-03-141-0/+4
| * | | Display Custom RPC on lock screen.Kevin Serrano2017-03-141-1/+1
|/ / /
| * / Minor change in removing opts object.Kevin Serrano2017-03-151-4/+1
| |/
| * Add to changelog.Kevin Serrano2017-03-151-0/+1
| * Limit the number of addresses stored in our book.Kevin Serrano2017-03-141-0/+4
| * Add test to account for prevention of identities duplication.Kevin Serrano2017-03-111-1/+22
| * Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-112-9/+23
| * Add another test for duplicates.Kevin Serrano2017-03-111-0/+7
| * Improve duplicate checking in address book.Kevin Serrano2017-03-111-2/+2
| * Add basic tests.Kevin Serrano2017-03-112-1/+29
| * Add comments.Kevin Serrano2017-03-113-4/+25
| * Allow for adding recently used addresses to address book.Kevin Serrano2017-03-104-4/+40
| * Rename functions for consistency.Kevin Serrano2017-03-101-6/+6
| * Create persistence address book.Kevin Serrano2017-03-103-0/+58
| * Create distinct labels and names for addresses.Kevin Serrano2017-03-102-2/+8
| * Display owned addresses in datalist.Kevin Serrano2017-03-102-0/+12
|/
* Merge pull request #1197 from MetaMask/i1130-ResolveENSKevin Serrano2017-03-096-33/+223
|\
| * Bump changelogDan Finlay2017-03-091-0/+2
| * Add ENS click to copyDan Finlay2017-03-092-10/+9
| * Get basic ENS workingDan Finlay2017-03-0932-168/+519
| |\ | |/ |/|
* | Merge pull request #1196 from MetaMask/Version-3.4.0Dan Finlay2017-03-092-1/+3
|\ \
| * | Version 3.4.0v3.4.0Dan Finlay2017-03-092-1/+3
|/ /
* | Merge pull request #1191 from MetaMask/i1065-removealertDan Finlay2017-03-092-2/+10
|\ \
| * | Modify message.Kevin Serrano2017-03-091-1/+1
| * | Add more informative messageKevin Serrano2017-03-092-1/+9
| * | Merge branch 'master' into i1065-removealertKevin Serrano2017-03-092-26/+60
| |\ \ | |/ / |/| |
* | | Merge pull request #1189 from MetaMask/kumavis-patch-1Dan Finlay2017-03-092-26/+60
|\ \ \
| * \ \ Merge branch 'master' into kumavis-patch-1Dan Finlay2017-03-0914-51/+153
| |\ \ \ | |/ / / |/| | |
| * | | tx-utils - add encoding utilskumavis2017-03-082-9/+15
| * | | tx-utils - stricter naming type-based conventionkumavis2017-03-082-23/+29
| * | | test - tx-utilskumavis2017-03-081-3/+29
| * | | tx-utils - clean and commentkumavis2017-03-081-15/+11
| | * | Convert alert to a log.errorKevin Serrano2017-03-091-1/+1
| |/ / |/| |
* | | Merge pull request #1147 from MetaMask/i1144-moarrpcKevin Serrano2017-03-0914-51/+153
|\ \ \ | |/ / |/| |
| * | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i114...Kevin Serrano2017-03-095-7/+58
| |\ \
| | * \ Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-095-7/+58
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1187 from MetaMask/i1118-IncreaseGasBufferDan Finlay2017-03-083-5/+35
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1118-IncreaseGasBufferDan Finlay2017-03-081-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1186 from MetaMask/grammarFixDan Finlay2017-03-081-1/+1
|\ \ \ \ \
| * | | | | Fix grammar in erro messagefrankiebee2017-03-081-1/+1
|/ / / / /
| * | | | Bump changelogDan Finlay2017-03-081-0/+1
| * | | | Merge branch 'master' into i1118-IncreaseGasBufferjaredpereira2017-03-083-3/+24
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1185 from MetaMask/i#1032kumavis2017-03-081-1/+22
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i#1032Frankie2017-03-081-1/+1
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1183 from MetaMask/provider-ten-oh-onekumavis2017-03-081-1/+1
|\ \ \ \ \ \
| * | | | | | deps - bump web3-provider-engine to 10.0.1kumavis2017-03-081-1/+1
|/ / / / / /
| * | | | | Merge branch 'master' into i#1032frankiebee2017-03-0811-57/+161
| |\ \ \ \ \
| * | | | | | fix issue where account import allows for duplicatesfrankiebee2017-03-081-1/+22
| | | * | | | change BN.mul to BN.mulnJared Pereira2017-03-082-10/+8
| | | * | | | add gas buffer multiply testJared Pereira2017-03-081-16/+6
| | | * | | | remove constant buffer and add multiplierJared Pereira2017-03-081-5/+8
| | | * | | | Add gas buffer testDan Finlay2017-03-081-0/+38
| | | | * | | Fix typo, switch to log.errorKevin Serrano2017-03-091-3/+3
| | | | |/ /
| | | | * | Remove unneeded setrpc method.Kevin Serrano2017-03-091-20/+8
| | | | * | Nodeify and promisify calls to background.Kevin Serrano2017-03-092-11/+29
| | | | * | Fix tests until new ones to-be-written.Kevin Serrano2017-03-081-17/+0
| | | | * | Merge branch 'i1144-moarrpc' of github.com:MetaMask/metamask-plugin into i114...Kevin Serrano2017-03-080-0/+0
| | | | |\ \
| | | | | * \ Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-081-1/+1
| | | | | |\ \
| | | | * | \ \ Merge github.com:MetaMask/metamask-plugin into i1144-moarrpcKevin Serrano2017-03-082-2/+2
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #1182 from MetaMask/provider-tenkumavis2017-03-081-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | deps - bump web3-provider-enginekumavis2017-03-081-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #1180 from MetaMask/kumavis-patch-1kumavis2017-03-081-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' into kumavis-patch-1Dan Finlay2017-03-081-1/+1
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1179 from MetaMask/FixHexEncodingkumavis2017-03-081-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fixed encodingDan Finlay2017-03-082-15/+2
| * | | | | | Remove unrelated test fileDan Finlay2017-03-081-38/+0
| * | | | | | Fix test nameDan Finlay2017-03-071-1/+1
| * | | | | | Fixed internal encoding test caseDan Finlay2017-03-072-1/+39
| * | | | | | LintedDan Finlay2017-03-071-2/+2
| * | | | | | Fix hex encoding of message to create valid hex stringsDan Finlay2017-03-071-1/+14
|/ / / / / /
| * / / / / deps - bump web3-provider-enginekumavis2017-03-081-1/+1
|/ / / / /
| | * / / Refactor of code into separate reducers and actions.Kevin Serrano2017-03-085-36/+26
| | |/ /
| | * | Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-0811-56/+160
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1177 from MetaMask/i1173-ShowPersonalMessagekumavis2017-03-075-21/+106
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1173-ShowPersonalMessageDan Finlay2017-03-072-5/+5
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1178 from MetaMask/i#1168kumavis2017-03-072-5/+5
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i#1168Frankie2017-03-074-30/+49
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix issue where old txMeta object was being used to pass the txHash to the cbFrankie2017-03-072-5/+5
| | |/ / / | |/| | |
| | * | | Merge branch 'i1173-ShowPersonalMessage' of github.com:MetaMask/metamask-plug...Dan Finlay2017-03-071-1/+1
| | |\ \ \
| | | * \ \ Merge branch 'master' into i1173-ShowPersonalMessagekumavis2017-03-071-1/+1
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1176 from MetaMask/i1162-FixLoosePersonalSignkumavis2017-03-071-1/+1
|\ \ \ \ \ \
| * | | | | | Fix personal sign for loose accountsDan Finlay2017-03-071-1/+1
|/ / / / / /
| | * / / / Fix normalizeMsgData function to always return hex prefixedDan Finlay2017-03-072-3/+3
| | |/ / /
| | * | | Remove logDan Finlay2017-03-071-1/+0
| | * | | Fix function namesDan Finlay2017-03-071-6/+6
| | * | | Render personal_sign messages as utf-8 textDan Finlay2017-03-075-21/+107
| |/ / / |/| | |
* | | | Merge pull request #1161 from MetaMask/DebuggingDan Finlay2017-03-073-29/+48
|\ \ \ \ | |/ / / |/| | |
| * | | Prevent submission of invalid gas parameters.Kevin Serrano2017-03-022-3/+26
| * | | Various improvements to gas input.Kevin Serrano2017-03-023-27/+22
| * | | Only allow numbers in gas inputsDan Finlay2017-03-021-0/+1
|/ / /
| * | Modify tests.'Kevin Serrano2017-03-081-15/+19
| * | Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-083-11/+31
| * | More conflict resolution.Kevin Serrano2017-03-028-7/+16
| |\ \
| | * | Fix test referenceDan Finlay2017-02-281-1/+1
| | * | add controllers to root scripts folderDan Finlay2017-02-284-3/+3
| | * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-2830-658/+717
| | |\ \
| | * | | Concatenate custom RPC labels that are too longDan Finlay2017-02-281-1/+9
| * | | | Fix merge conflicts.Kevin Serrano2017-03-0237-797/+1214
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Fix spelling error.Kevin Serrano2017-02-251-1/+1
| |/ / /
| * | | Tested against code to play nice with unit tests.Kevin Serrano2017-02-246-14/+54
| * | | Make the UI play nice with empty RPC lists.Kevin Serrano2017-02-232-1/+2
| * | | LintoKevin Serrano2017-02-231-1/+1
| * | | Changelog.Kevin Serrano2017-02-231-0/+2
| * | | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-233-16/+41
| * | | Connect to actions.Kevin Serrano2017-02-222-0/+2
| * | | Fix namingKevin Serrano2017-02-222-3/+3
| * | | Basic infrasture for RPC list added.Kevin Serrano2017-02-222-3/+24
| | | * Add ens recognition to send form inputDan Finlay2017-03-013-5/+144
| | | * Fix loading indication for conf-tx viewDan Finlay2017-03-011-1/+1
| |_|/ |/| |
* | | Merge pull request #1154 from MetaMask/i765-gaslimitsKevin Serrano2017-03-0116-145/+505
|\ \ \ | |_|/ |/| |
| * | Add reset button to reset gas fields.Kevin Serrano2017-03-012-4/+20
| * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-011-2/+12
| |\ \
| | * \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Kevin Serrano2017-03-013-3/+4
| | |\ \
| | * | | Gas and Gaslimit revert to default if set to 0Kevin Serrano2017-03-011-2/+12
| * | | | Bump changelogDan Finlay2017-03-011-0/+1
| * | | | Add a couple more debug logsDan Finlay2017-03-012-0/+2
| | |/ / | |/| |
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-011-18/+4
| |\| |
| | * | lintsKevin Serrano2017-03-011-3/+0
| | * | Remove advanced options for now.Kevin Serrano2017-03-011-15/+4
| * | | Use correct action to update and submit txDan Finlay2017-03-013-3/+4
| |/ /
| * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-011-0/+2
| |\ \
| | * | lintKevin Serrano2017-03-011-2/+4
| * | | LintedDan Finlay2017-03-013-5/+2
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Dan Finlay2017-03-012-4/+17
| |\| |
| | * | Hide gas options behind an advanced options checkbox.Kevin Serrano2017-03-011-4/+16
| | * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Kevin Serrano2017-03-011-1/+1
| | |\ \
| | * \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Kevin Serrano2017-03-013-2/+4
| | |\ \ \
| | * \ \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Kevin Serrano2017-03-012-30/+39
| | |\ \ \ \
| | * | | | | Add margins to align.Kevin Serrano2017-03-011-0/+1
| * | | | | | Remove gasMultiplier txMeta paramDan Finlay2017-03-019-128/+11
| | |_|_|/ / | |/| | | |
| * | | | | Fix bug that showed conf-tx screen on boot at wrong timesDan Finlay2017-03-011-1/+1
| | |_|/ / | |/| | |
| * | | | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-013-2/+4
| | |/ / | |/| |
| * | | Fix infinite loop bugDan Finlay2017-03-012-30/+39
| |/ /
| * | Fix referenceDan Finlay2017-03-011-1/+1
| * | Reorder rows for better table logicDan Finlay2017-02-281-32/+37
| * | Emit updated tx values on accept clickDan Finlay2017-02-282-1/+20
| * | Remove unused functionDan Finlay2017-02-281-5/+0
| * | Add action for updating and approving a tx in one actionDan Finlay2017-02-281-0/+15
| * | Add background method for updating and approving a tx in one callDan Finlay2017-02-281-2/+9
| * | Got gas live re-estimatingDan Finlay2017-02-282-20/+23
| * | Align input fields for gas.Kevin Serrano2017-02-281-0/+1
| * | Fix merge conflicts.Kevin Serrano2017-02-282-8/+68
| |\ \
| | * | LintedDan Finlay2017-02-282-12/+6
| | * | Add non-working gas recalculating logic to tx-details viewDan Finlay2017-02-281-6/+69
| * | | Further styling to get hex component working. Fix some typos.Kevin Serrano2017-02-283-16/+44
| |/ /
| * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76...Kevin Serrano2017-02-2830-644/+702
| |\ \
| | * \ Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-2830-644/+702
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1149 from MetaMask/i1114-AddPersonalSignDan Finlay2017-02-2830-658/+716
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove claim for ecRecover supportDan Finlay2017-02-281-1/+0
| * | | Reduce provider-engine requirementDan Finlay2017-02-251-1/+1
| * | | Removed redundant personal_recover logicDan Finlay2017-02-252-18/+0
| * | | Add personal_sign development ui stateDan Finlay2017-02-251-0/+99
| * | | Mostly fix personal_recoverDan Finlay2017-02-252-6/+6
| * | | Bump changelogDan Finlay2017-02-251-1/+2
| * | | Bump provider engine to require compliant personal_recoverDan Finlay2017-02-251-1/+1
| * | | Fixed referenceDan Finlay2017-02-241-1/+1
| * | | Fix references in testsDan Finlay2017-02-241-5/+5
| * | | Improve pending tx blue dot styleDan Finlay2017-02-242-9/+4
| * | | Remove irrelevant testsDan Finlay2017-02-241-8/+4
| * | | Fix cancel msg signing behavior.Dan Finlay2017-02-245-19/+45
| * | | Make personal sign view look niceDan Finlay2017-02-241-5/+16
| * | | Got personal_sign workingDan Finlay2017-02-2411-69/+175
| * | | Add alternate UI for pending personal_sign messagesDan Finlay2017-02-244-15/+15
| * | | Add personal sign actions and templateDan Finlay2017-02-235-26/+111
| * | | Allow provider to init before keyringControllerDan Finlay2017-02-221-2/+6
| * | | Fix referenceDan Finlay2017-02-221-1/+1
| * | | Point metamask-controller personalSignRecover method to keyring-controllerDan Finlay2017-02-221-9/+5
| * | | Move sigUtil and keyrings to external modulesDan Finlay2017-02-2214-537/+294
| * | | Move changelog entryDan Finlay2017-02-221-1/+2
|/ / /
| * | Move input boxes into table and into details component.Kevin Serrano2017-02-283-17/+39
| * | Fix state to render gasPrice for ui dev.Kevin Serrano2017-02-281-2/+3
| |/
| * Make gasPrice accessible to the UI.Kevin Serrano2017-02-252-2/+2
| * Merge github.com:MetaMask/metamask-plugin into i765-gaslimitsKevin Serrano2017-02-2419-20/+215
| |\ | |/ |/|
* | Merge pull request #1143 from MetaMask/FixTxApprovalUiModeFrankie2017-02-2110-5/+125
|\ \
| * | Add log global to test suiteDan Finlay2017-02-211-0/+6
| * | Fix UI Dev Mode for Tx ApprovalDan Finlay2017-02-219-5/+119
|/ /
* | Merge pull request #1140 from MetaMask/i1128-noticesdevKevin Serrano2017-02-214-14/+52
|\ \
| * \ Merge branch 'master' into i1128-noticesdevDan Finlay2017-02-216-0/+34
| |\ \ | |/ / |/| |
* | | Merge pull request #1138 from MetaMask/AddBetterLoggerKevin Serrano2017-02-216-0/+34
|\ \ \
| * \ \ Merge branch 'master' into AddBetterLoggerKevin Serrano2017-02-212-1/+3
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into AddBetterLoggerDan Finlay2017-02-212-2/+3
| |\ \ \
| * | | | Set default log levelsDan Finlay2017-02-213-0/+3
| * | | | Add debug logging to ui routing logic.Dan Finlay2017-02-216-0/+31
| | | * | Merge branch 'master' into i1128-noticesdevKevin Serrano2017-02-213-3/+6
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #1139 from MetaMask/Version-3.3.0Dan Finlay2017-02-212-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Version 3.3.0v3.3.0Dan Finlay2017-02-212-1/+3
|/ / / /
* | | | Merge pull request #1137 from MetaMask/AddPersonalSignMethodKevin Serrano2017-02-212-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Add personal_sign and personal_ecRecover supportDan Finlay2017-02-212-2/+3
|/ / /
| * | Integration tests play nice with new disabled buttons.Kevin Serrano2017-02-211-2/+6
| * | Notices must be scrolled down to proceed from.Kevin Serrano2017-02-211-0/+9
| * | add waits between notices.Kevin Serrano2017-02-212-11/+36
| * | Fix typo.Kevin Serrano2017-02-211-2/+2
| * | Re-enable notices on dev.Kevin Serrano2017-02-211-1/+1
|/ /
| * Broke hex decimal input into its own componentDan Finlay2017-02-184-25/+281
| * Change state to props, add modifiable fields.Kevin Serrano2017-02-182-28/+54
|/
* Merge pull request #1119 from MetaMask/i1089-networkfrontDan Finlay2017-02-163-8/+15
|\
| * Merge branch 'master' into i1089-networkfrontDan Finlay2017-02-161-0/+2
| |\ | |/ |/|
* | Merge pull request #1123 from MetaMask/kumavis-patch-1kumavis2017-02-161-0/+2
|\ \
| * | Add memstore update after adding new keyringDan Finlay2017-02-161-0/+1
| * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ku...Dan Finlay2017-02-16222-3290/+16338
| |\ \
| | * | keyring controller - update memStore after restoreKeyringkumavis2017-02-161-0/+1
| |/ / |/| |
| * | deps - bump web3-provider-enginekumavis2016-08-251-1/+1
| | * Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-161-0/+6
| | |\ | |_|/ |/| |
* | | Merge pull request #1121 from MetaMask/devKevin Serrano2017-02-1666-395/+568
|\ \ \
| * \ \ Merge branch 'master' into devDan Finlay2017-02-167-7/+88
| |\ \ \ | |/ / / |/| | |
| | | * Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-167-7/+88
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #1113 from MetaMask/RecoverTestskumavis2017-02-164-2/+47
|\ \ \ \
| * | | | Bump changelogDan Finlay2017-02-141-0/+2
| * | | | Verify messages in a loopDan Finlay2017-02-141-27/+25
| * | | | got hash test passingDan Finlay2017-02-143-16/+28
| * | | | Add failing test for signature recoveryDan Finlay2017-02-141-0/+33
|/ / / /
* | | | Merge pull request #1107 from MetaMask/Version-3.2.2Kevin Serrano2017-02-102-1/+5
|\ \ \ \
| * | | | Version 3.2.2v3.2.2Dan Finlay2017-02-102-1/+5
|/ / / /
* | | | Merge pull request #1105 from MetaMask/rollbackEthSighnkumavis2017-02-106-4/+36
|\ \ \ \
| * | | | Add to CHANGELOGFrankie2017-02-101-0/+1
| * | | | Revert old style message sighingFrankie2017-02-105-4/+35
|/ / / /
* | | | Merge pull request #1099 from MetaMask/devKevin Serrano2017-02-092-2/+6
|\ \ \ \
| | | | * Changelog.Kevin Serrano2017-02-161-0/+1
| | | | * Remove custom RPC option when on lock screen.Kevin Serrano2017-02-161-1/+1
| | | | * Change networks from lock screen.Kevin Serrano2017-02-162-7/+7
| | | |/ | | |/|
| | * | Merge pull request #1117 from MetaMask/disclaimer-cleanKevin Serrano2017-02-1615-35/+296
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:36:08 +0800