aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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 pull request #1182 from MetaMask/provider-tenkumavis2017-03-081-1/+1
|\ \ \
| * | | deps - bump web3-provider-enginekumavis2017-03-081-1/+1
|/ / /
| * | Merge branch 'master' into i#1032frankiebee2017-03-0811-57/+161
| |\ \ | |/ / |/| |
* | | 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
|/ / /
| * | 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
| |/ |/|
* | 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
|/
* 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
| | |\ \
| | | * | Add to changelog.Kevin Serrano2017-02-161-0/+1
| | | * | Complete migration tests.Kevin Serrano2017-02-162-15/+75
| | | * | Adding additional migration state to account for moving data.Kevin Serrano2017-02-161-0/+138
| | | * | Made migrations non-destructive; fixed currency migration.Kevin Serrano2017-02-1610-22/+49
| | | * | Add migrations for removing terms of use data.Kevin Serrano2017-02-153-2/+37
| | |/ /
| | * | Merge pull request #1111 from MetaMask/mapachurro-patch-1Kevin Serrano2017-02-111-0/+28
| | |\ \
| | | * | Merge branch 'mapachurro-patch-1' of github.com:mapachurro/metamask-plugin in...Kevin Serrano2017-02-111-0/+28
| | |/| |
| | | * | Update first-time.jsmapachurro2017-02-101-0/+28
| | |/ / | |/| |
| | * | Merge pull request #1108 from MetaMask/disclaimer-notifyKevin Serrano2017-02-1150-359/+236
| | |\ \
| | | * | fix debugKevin Serrano2017-02-101-1/+1
| | | * | Prevent notices from opening in test and debug mode.Kevin Serrano2017-02-101-1/+1
| | | * | Fix integration tests.Kevin Serrano2017-02-102-18/+3
| | | * | Remove trailing comma in JSON.Kevin Serrano2017-02-101-1/+1
| | | * | Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-103-1/+8
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #1101 from MetaMask/i1085-synchronousnetKevin Serrano2017-02-103-1/+8
| |/| | |
| | * | | Merge branch 'dev' into i1085-synchronousnetkumavis2017-02-102-3/+6
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Allowed net_version to be called synchronouslyKevin Serrano2017-02-093-1/+9
| | | * | Delete all code related to disclaimers.Kevin Serrano2017-02-1044-316/+30
| | | * | Fix bugs with notice. Add disclaimer notice.Kevin Serrano2017-02-105-24/+202
| | |/ / | |/| |
| * | | Merge branch 'master' into devkumavis2017-02-090-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1094 from MetaMask/devkumavis2017-02-08113-1902/+2454
|\ \ \ \ | | |/ / | |/| |
| | * | Merge pull request #1098 from MetaMask/Version-3.2.1kumavis2017-02-092-2/+6
| |/| |
| | * | Version 3.2.1v3.2.1Dan Finlay2017-02-092-2/+6
| |/ /
| * | Merge pull request #1093 from MetaMask/Version-3.2.0Dan Finlay2017-02-082-2/+4
| |\ \
| | * | Version 3.2.0v3.2.0Dan Finlay2017-02-082-2/+4
| * | | Merge pull request #1090 from MetaMask/RemoveEgregiousAlertFrankie2017-02-071-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove egregious alertDan Finlay2017-02-071-1/+0
| |/ /
| * | Merge pull request #1088 from MetaMask/CreateShapeshiftControllerkumavis2017-02-067-40/+156
| |\ \
| | * | Fix typoDan Finlay2017-02-051-1/+1
| | * | Remove shapeshift tx list from idStoreDan Finlay2017-02-051-2/+1
| | * | Stop removing old shapeshift txsDan Finlay2017-02-051-16/+0
| | * | Do not remove completed shapeshift depositsDan Finlay2017-02-041-1/+2
| | * | Fix bug when clearing old shapeshift txsDan Finlay2017-02-041-1/+3
| | * | Automatically remove shapeshift txs over 11 minutes old with no paymentDan Finlay2017-02-041-0/+22
| | * | Add migration to indexDan Finlay2017-02-041-1/+2
| | * | Got ShapeShiftController back to workingDan Finlay2017-02-042-12/+43
| | * | Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-044-38/+114
| |/ /
| * | Merge pull request #1087 from MetaMask/kumavis-refactor7Kevin Serrano2017-02-041-0/+2
| |\ \
| | * | eth-store - update store state after manipulatingkumavis2017-02-041-0/+2
| * | | Merge pull request #1086 from MetaMask/kumavis-refactor7kumavis2017-02-0410-42/+77
| |\| |
| | * | test - skip eth_sign tests until we have test datakumavis2017-02-042-2/+2
| | * | id mgmt - update to latest eth_sign speckumavis2017-02-045-36/+58
| | * | migrations - fix migration #9 and add safety checks to migratorkumavis2017-02-043-4/+15
| | * | eths-store - eagerly set current blockkumavis2017-02-041-0/+2
| |/ /
| * | Merge pull request #1083 from MetaMask/kumavis-refactor6kumavis2017-02-0320-516/+696
| |\ \
| | * | metamask - add missing diskState and memState subscriptionskumavis2017-02-031-6/+11
| | * | migration #9 - break out CurrencyController substatekumavis2017-02-0310-152/+227
| | * | eth-store - cbs default to noopkumavis2017-02-031-5/+5
| | * | migration #8 - break out NoticeController substatekumavis2017-02-034-28/+63
| | * | eth-store - convert to obs-store subclasskumavis2017-02-033-121/+106
| | * | txManager - depend on preferencesStorekumavis2017-02-033-5/+8
| | * | metamask - introduce networkStorekumavis2017-02-033-47/+53
| | * | migration 7 - break off TransactionManager substatekumavis2017-02-037-79/+179
| | * | messageManager - move view state to obs-storekumavis2017-02-033-51/+32
| | * | keyring - replace getState with memStorekumavis2017-02-032-30/+2
| | * | keyring - manage isUnlocked in memStorekumavis2017-02-031-1/+7
| | * | keyring - rm config depkumavis2017-02-032-5/+2
| | * | actions - dont expect background to provide newState, manually updatekumavis2017-02-031-12/+27
| |/ /
| * | Merge pull request #1082 from MetaMask/notice-managementkumavis2017-02-037-8/+47
| |\ \
| | * \ Merge branch 'dev' into notice-managementKevin Serrano2017-02-035-21/+23
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1079 from MetaMask/kumavis-refactor5Kevin Serrano2017-02-025-22/+23
| |\ \ \
| | * | | test - first-time - re-add terms header checkkumavis2017-02-021-0/+2
| | * | | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ...kumavis2017-02-022-1/+1
| | * | | test - mock-dev - expose metamaskController for debuggingkumavis2017-02-021-0/+1
| | * | | tests - mockDev - fix first-time flowkumavis2017-02-022-21/+19
| |/ / /
| * | | Merge pull request #1078 from MetaMask/messageManagerCleanUpFrankie2017-02-021-0/+1
| |\ \ \
| | * | | emit a update badgeFrankie2017-02-021-1/+1
| | * | | put updateBadge back inFrankie2017-02-021-0/+1
| | | * | Change filepath for new location of notices.Kevin Serrano2017-02-031-1/+1
| | | * | modification of notices.Kevin Serrano2017-02-037-8/+47
| | |/ / | |/| |
| * | | Merge pull request #1076 from MetaMask/messageManagerCleanUpkumavis2017-02-0222-216/+306
| |\| |
| | * | swap out set state for updateStateFrankie2017-02-021-4/+1
| | * | Fix messy mergeFrankie2017-02-021-14/+2
| | * | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-026-82/+75
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1077 from MetaMask/i#1075Kevin Serrano2017-02-021-1/+1
| |\ \ \
| | * | | default a return of an empty arrayFrankie2017-02-021-1/+1
| | * | | lintingFrankie2017-02-021-1/+1
| | * | | fix transactions not showing up in historyFrankie2017-02-021-1/+1
| * | | | Merge pull request #1073 from MetaMask/kumavis-refactor4Frankie2017-02-025-84/+74
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | metamask - adopt isInitialized from keyring controllerkumavis2017-02-013-13/+8
| | * | | keyring - move identities into memStorekumavis2017-02-012-9/+19
| | * | | keyring - add keyringtypes to memStorekumavis2017-02-011-3/+3
| | * | | tests - mock-dev - remove persistencekumavis2017-02-011-15/+1
| | * | | metamask - inherit some configManager state from keyring controllerkumavis2017-02-012-10/+13
| | * | | keyring - synchronous getStatekumavis2017-02-013-55/+51
| |/ / /
| | * | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-0249-128/+170
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1069 from MetaMask/i1066Frankie2017-01-3149-128/+170
| |\ \ \
| | * | | migration #6 - fix selectedAddress data sourcekumavis2017-01-311-2/+2
| | * | | inpage - set web3.eth.defaultAccount correctlykumavis2017-01-312-2/+2
generated by cgit (git 2.34.1) at 2024-10-14 22:15:49 +0800