aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
|/
* 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
| | * | | continue rename selectedAccount to selectedAddresskumavis2017-01-3132-55/+51
| | * | | rename selectedAccount to selectedAddresskumavis2017-01-3117-49/+35
| | * | | metamask - rename getSelectedAccount to getSelectedAddresskumavis2017-01-312-5/+5
| | * | | migration #6 - move selectedAccount from keyringController to preferencesCont...kumavis2017-01-312-0/+42
| | * | | metamask - move selectedAccount set/get to preferencesControllerkumavis2017-01-312-33/+12
| | * | | preferences - introduce preferences controllerkumavis2017-01-312-0/+39
| |/ / /
| | * | Add to CHANGELOGFrankie2017-02-021-0/+1
| | * | code clan up and testsFrankie2017-02-025-44/+140
| | * | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-302-4/+13
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1068 from MetaMask/kumavis-refactor3Frankie2017-01-302-4/+13
| |\ \ \
| | * | | metamask - lookup selectedAccount via keyringControllerkumavis2017-01-302-3/+12
| | * | | public config - get selectedAccount from keyring controller substatekumavis2017-01-301-1/+1
| | | * | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-2912-334/+274
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #1062 from MetaMask/kumavis-refactor3kumavis2017-01-2912-339/+277
| |\| | |
| | * | | metamask - subscribe metamask store to keyringController substatekumavis2017-01-291-0/+3
| | * | | migration 5 - move keyring controller state to substatekumavis2017-01-299-112/+122
| | * | | keyring - add and initialize obs-storekumavis2017-01-292-6/+36
| | * | | metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-282-2/+3
| | * | | tests - remove persistence and start with initial statekumavis2017-01-283-124/+12
| | * | | metamask - organize methodskumavis2017-01-281-120/+126
| |/ / /
| | * | Clean up message manger includes:Frankie2017-01-2920-179/+185
| | * | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-287-198/+208
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1058 from MetaMask/kumavis-refactor2Frankie2017-01-287-198/+208
| |\ \ \
| | * | | metamask - fix setupProviderConnectionkumavis2017-01-271-1/+1
| | * | | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2kumavis2017-01-271-2/+0
| | |\ \ \ | | |/ / / | |/| | |
| | * | | keymanager - small cleankumavis2017-01-271-2/+2
| | * | | lint -ignore extra spaces before values in obj expressionkumavis2017-01-271-1/+1
| | * | | metamask controller - cleanup remote apikumavis2017-01-272-79/+101
| | * | | metamask - organize into sectionskumavis2017-01-271-49/+61
| | * | | metamask - use web3-stream-provider/handler instead of manual wiringkumavis2017-01-271-23/+8
| | * | | test - lint firstkumavis2017-01-271-1/+1
| | * | | metamask controller - adopt setup*Communication from backgroundkumavis2017-01-272-44/+41
| | * | | background - stream disconnection fixkumavis2017-01-272-8/+8
| | * | | metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-272-15/+9
| | | * | Rewrite message controller to fit controller patternFrankie2017-01-281-48/+45
| | |/ / | |/| |
| * | | Merge pull request #1056 from MetaMask/i#1006kumavis2017-01-271-2/+0
| |\ \ \ | | |/ / | |/| |
| | * | Fix ui overlapFrankie2017-01-271-2/+0
| * | | Merge pull request #1057 from MetaMask/kumavis-refactor1kumavis2017-01-274-62/+44
| |\ \ \ | | |/ / | |/| |
| | * | background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
| | * | config-manager - default to USD for currentFiatkumavis2017-01-271-14/+4
| | * | background - organize metamask instantiationkumavis2017-01-273-47/+37
| |/ /
| * | Merge pull request #999 from MetaMask/obs-store2kumavis2017-01-2521-562/+508
| |\ \
| | * | mock-dev - cleanup missing polyfillkumavis2017-01-251-3/+0
| | * | obs-store - use published modulekumavis2017-01-2516-327/+113
| | * | migrations - rename 005 to stubbed _multi-keyringkumavis2017-01-251-0/+7
| | * | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-258-36/+62
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1054 from MetaMask/i#1048Frankie2017-01-257-35/+58
| |\ \ \
| | * \ \ Merge branch 'dev' into i#1048kumavis2017-01-2512-12/+166
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1050 from MetaMask/fixConfTxBalanceLogickumavis2017-01-252-1/+2
| |\ \ \ \
| | * | | | fix baseFrankie2017-01-251-2/+2
| | * | | | add to CHANGELOGFrankie2017-01-251-0/+1
| | * | | | Fix issue where ConfTx view lets you approve txs when the account has insuffi...Frankie2017-01-251-1/+1
| * | | | | Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-252-5/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | | * | | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-254-23/+34
| | | * | | merge master hotfix into devkumavis2017-01-252-2/+5
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1053 from MetaMask/3.1.2v3.1.2kumavis2017-01-252-1/+6
|\ \ \ \ \ \
| * | | | | | 3.1.2kumavis2017-01-252-1/+6
|/ / / / / /
* | | | | | Merge pull request #1052 from MetaMask/hotfix1048kumavis2017-01-252-5/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | hotfix - dont assume hd keyring positionkumavis2017-01-252-5/+7
|/ / / / /
| | * | | keyring-controller - cleanupkumavis2017-01-251-2/+3
| | * | | keyring-controller - cleanupkumavis2017-01-251-5/+3
| | * | | add to CHANGELOGFrankie2017-01-251-0/+2
| | * | | Move the assumption of their only being one hd keyring when requesting seed w...Frankie2017-01-252-7/+8
| | * | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-254-6/+15
| |/ / / |/| | |
| | * | Merge branch 'dev' into obs-store2kumavis2017-01-2249-308/+1406
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1042 from MetaMask/upToDatekumavis2017-01-212-1/+4
| |\ \ \
| | * | | Merge branch 'master' into upToDateFrankie2017-01-212-1/+4
| |/| | | | |/ / / |/| | |
* | | | Merge pull request #1040 from MetaMask/3.1.1v3.1.1kumavis2017-01-212-1/+5
|\ \ \ \
| * | | | 3.1.1kumavis2017-01-212-1/+5
|/ / / /
| * | | Merge pull request #1039 from MetaMask/upToDatekumavis2017-01-211-1/+3
| |\ \ \
| | * | | Merge branch 'master' into upToDateFrankie2017-01-211-1/+3
| |/| | | | |/ / / |/| | |
* | | | Merge pull request #1037 from MetaMask/i1034-seed-exportFrankie2017-01-211-1/+3
|\ \ \ \
| * | | | keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
|/ / / /
| * | | Merge pull request #1029 from MetaMask/i715-AddJsonImportKevin Serrano2017-01-2011-11/+165
| |\ \ \
| | * | | Bump changelogDan Finlay2017-01-191-0/+2
| | * | | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-194-3/+6
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1030 from MetaMask/masterkumavis2017-01-194-3/+6
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0Dan Finlay2017-01-1933-79/+875
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-193-2/+3
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1024 from MetaMask/fixSignedVsSubmittedDan Finlay2017-01-193-2/+4
|\ \ \ \ \ \
| * | | | | | Add to CHANGELOGFrankie2017-01-191-0/+2
| * | | | | | Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-1910-21/+28
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix the dissplay for submitted transactions and the listner wating to hear wh...Frankie2017-01-192-2/+2
| | * | | | | Version 3.1.0Dan Finlay2017-01-192-1/+3
| | |/ / / /
| | | * | | Add ability to import v3 JSON walletsDan Finlay2017-01-195-10/+27
| | | * | | Implement naieve JSON file importingDan Finlay2017-01-193-5/+77
| | | * | | Added new modular private key import systemDan Finlay2017-01-194-2/+65
| | |/ / /
| | * | | Merge pull request #1022 from MetaMask/i715-AddImportMenukumavis2017-01-1926-49/+828
| | |\ \ \
| | | * \ \ Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-0/+1
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #1026 from MetaMask/i1023-badTxHashDan Finlay2017-01-191-0/+2
| | |\ \ \ \
| | | * | | | Bump changelogDan Finlay2017-01-191-0/+2
| | | | * | | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-6/+5
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #1025 from MetaMask/i1023-badTxHashDan Finlay2017-01-191-6/+5
| | |\| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:38:52 +0800