aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Got personal_sign workingDan Finlay2017-02-2411-69/+175
| | | | Also fixed bug where signing would not close popup.
* 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
| | | | These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc.
* Move changelog entryDan Finlay2017-02-221-1/+2
|
* Merge pull request #1143 from MetaMask/FixTxApprovalUiModeFrankie2017-02-2110-5/+125
|\ | | | | Fix UI Dev Mode for Tx Approval
| * Add log global to test suiteDan Finlay2017-02-211-0/+6
| |
| * Fix UI Dev Mode for Tx ApprovalDan Finlay2017-02-219-5/+119
|/ | | | | | | | | | The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging.
* Merge pull request #1140 from MetaMask/i1128-noticesdevKevin Serrano2017-02-214-14/+52
|\ | | | | Add notice functionality
| * Merge branch 'master' into i1128-noticesdevDan Finlay2017-02-216-0/+34
| |\ | |/ |/|
* | Merge pull request #1138 from MetaMask/AddBetterLoggerKevin Serrano2017-02-216-0/+34
|\ \ | | | | | | Add better logger
| * \ 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
| | | |\ | |_|_|/ |/| | | | | | | borts
* | | | Merge pull request #1139 from MetaMask/Version-3.3.0Dan Finlay2017-02-212-1/+3
|\ \ \ \ | |_|/ / |/| | | Version 3.3.0
| * | | 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 support
| * | 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
|\ | | | | Network display/change on lock screen
| * Merge branch 'master' into i1089-networkfrontDan Finlay2017-02-161-0/+2
| |\ | |/ |/|
* | Merge pull request #1123 from MetaMask/kumavis-patch-1kumavis2017-02-161-0/+2
|\ \ | | | | | | keyring controller - update memStore after restoreKeyring
| * | Add memstore update after adding new keyringDan Finlay2017-02-161-0/+1
| | |
| * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-02-16222-3290/+16338
| |\ \ | | | | | | | | | | | | kumavis-patch-1
| | * | 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 dev into master
| * \ \ 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
|\ \ \ \ | | | | | | | | | | Add tests showing recovering public key from signature
| * | | | 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.2
| * | | | Version 3.2.2v3.2.2Dan Finlay2017-02-102-1/+5
|/ / / /
* | | | Merge pull request #1105 from MetaMask/rollbackEthSighnkumavis2017-02-106-4/+36
|\ \ \ \ | | | | | | | | | | Rollback eth sign
| * | | | 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
|\ \ \ \ | | | | | | | | | | Publish 3.2.1
| | | | * 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
| | |\ \ | | | | | | | | | | Migration Testing
| | | * | 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
| | |\ \ | | | | | | | | | | Mapachurro - Update first-time.js
| | | * | Merge branch 'mapachurro-patch-1' of github.com:mapachurro/metamask-plugin ↵Kevin Serrano2017-02-111-0/+28
| | |/| | | | | | | | | | | | | | | | | into mapachurro-patch-1
| | | * | Update first-time.jsmapachurro2017-02-101-0/+28
| | |/ / | |/| |
| | * | Merge pull request #1108 from MetaMask/disclaimer-notifyKevin Serrano2017-02-1150-359/+236
| | |\ \ | | | | | | | | | | Integrate disclaimer with notification system
| | | * | 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
| |/| | | | | | | | | | | | | Allowed net_version to be called synchronously
| | * | | 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
|\ \ \ \ | | |/ / | |/| | Version 3.2.0
| | * | Merge pull request #1098 from MetaMask/Version-3.2.1kumavis2017-02-092-2/+6
| |/| | | | | | | | | | Version 3.2.1
| | * | 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.0
| | * | Version 3.2.0v3.2.0Dan Finlay2017-02-082-2/+4
| | | |
| * | | Merge pull request #1090 from MetaMask/RemoveEgregiousAlertFrankie2017-02-071-1/+0
| |\ \ \ | | |/ / | |/| | Remove egregious alert
| | * | Remove egregious alertDan Finlay2017-02-071-1/+0
| |/ /
| * | Merge pull request #1088 from MetaMask/CreateShapeshiftControllerkumavis2017-02-067-40/+156
| |\ \ | | | | | | | | Create shapeshift controller
| | * | 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
| |/ / | | | | | | | | | Rendering the list is still having issues, so this isn't done yet.
| * | Merge pull request #1087 from MetaMask/kumavis-refactor7Kevin Serrano2017-02-041-0/+2
| |\ \ | | | | | | | | bugfix - eth-store - update store state after manipulating
| | * | eth-store - update store state after manipulatingkumavis2017-02-041-0/+2
| | | |
| * | | Merge pull request #1086 from MetaMask/kumavis-refactor7kumavis2017-02-0410-42/+77
| |\| | | | | | | | | | Refactor round 7
| | * | 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
| |\ \ | | | | | | | | Refactor round 6
| | * | 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
| |\ \ | | | | | | | | modification of notices.
| | * \ Merge branch 'dev' into notice-managementKevin Serrano2017-02-035-21/+23
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1079 from MetaMask/kumavis-refactor5Kevin Serrano2017-02-025-22/+23
| |\ \ \ | | | | | | | | | | Refactor round 5
| | * | | test - first-time - re-add terms header checkkumavis2017-02-021-0/+2
| | | | |
| | * | | metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ↵kumavis2017-02-022-1/+1
| | | | | | | | | | | | | | | | | | | | controller
| | * | | 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
| |\ \ \ | | | | | | | | | | put updateBadge back in
| | * | | 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
| |\| | | | | | | | | | Message manager clean up
| | * | 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
| |\ \ \ | | | | | | | | | | fix transactions not showing up in history
| | * | | 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
| |\ \ \ \ | | |/ / / | |/| | | Kumavis refactor4
| | * | | 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
| |\ \ \ | | | | | | | | | | Introduce Preferences Controller
| | * | | 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 ↵kumavis2017-01-312-0/+42
| | | | | | | | | | | | | | | | | | | | preferencesController
| | * | | 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
| |\ \ \ | | | | | | | | | | public config - get selectedAccount from keyring controller substate
| | * | | 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
| |\| | | | | | | | | | | | | Kumavis refactor3
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
| | * | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-287-198/+208
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1058 from MetaMask/kumavis-refactor2Frankie2017-01-287-198/+208
| |\ \ \ | | | | | | | | | | Ongoing refactor and cleanup
| | * | | 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 overlap
| | * | Fix ui overlapFrankie2017-01-271-2/+0
| | | |
| * | | Merge pull request #1057 from MetaMask/kumavis-refactor1kumavis2017-01-274-62/+44
| |\ \ \ | | |/ / | |/| | background - various refactor, cleanups, and fixes
| | * | 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
| |\ \ | | | | | | | | background - introduce ObservableStore (mark II)
| | * | 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
| |\ \ \ | | | | | | | | | | Background - Extracts primary account code from keyring controller
| | * \ \ Merge branch 'dev' into i#1048kumavis2017-01-2512-12/+166
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1050 from MetaMask/fixConfTxBalanceLogickumavis2017-01-252-1/+2
| |\ \ \ \ | | | | | | | | | | | | Fix conf tx balance logic
| | * | | | 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 ↵Frankie2017-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | insufficient balance
| * | | | | Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-252-5/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | | hotfix - addNewAccount - dont assume hd keyring position
| | | * | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Release 3.1.2
| * | | | | | 3.1.2kumavis2017-01-252-1/+6
|/ / / / / /
* | | | | | Merge pull request #1052 from MetaMask/hotfix1048kumavis2017-01-252-5/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | hotfix - dont assume hd keyring position
| * | | | | 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 ↵Frankie2017-01-252-7/+8
| | | | | | | | | | | | | | | | | | | | words to metamaskController
| | * | | 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
| |\ \ \ | | | | | | | | | | keep dev Up to date
| | * | | 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.1
| * | | | 3.1.1kumavis2017-01-212-1/+5
|/ / / /
| * | | Merge pull request #1039 from MetaMask/upToDatekumavis2017-01-211-1/+3
| |\ \ \ | | | | | | | | | | Keep dev up to date with master
| | * | | 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 hdKeyring
| * | | | keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
|/ / / /
| * | | Merge pull request #1029 from MetaMask/i715-AddJsonImportKevin Serrano2017-01-2011-11/+165
| |\ \ \ | | | | | | | | | | Add JSON file account import
| | * | | 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 master into dev
* | | | | Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0Dan Finlay2017-01-1933-79/+875
|\ \ \ \ \ | | | | | | | | | | | | Version 3.1.0
| * \ \ \ \ 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix the dissplay for submitted transactions...
| * | | | | | 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 ↵Frankie2017-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | when tx's were included in a block
| | * | | | | Version 3.1.0Dan Finlay2017-01-192-1/+3
| | |/ / / /
| | | * | | Add ability to import v3 JSON walletsDan Finlay2017-01-195-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
| | | * | | Implement naieve JSON file importingDan Finlay2017-01-193-5/+77
| | | | | | | | | | | | | | | | | | | | | | | | Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
| | | * | | Added new modular private key import systemDan Finlay2017-01-194-2/+65
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
| | * | | Merge pull request #1022 from MetaMask/i715-AddImportMenukumavis2017-01-1926-49/+828
| | |\ \ \ | | | | | | | | | | | | Add ability to import private keys
| | | * \ \ Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-0/+1
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #1026 from MetaMask/i1023-badTxHashDan Finlay2017-01-191-0/+2
| | |\ \ \ \ | | | | | | | | | | | | | | Bump changelog
| | | * | | | 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
| | |\| | | | | | | | | | | | | | | | | | tx-manager - use rpc-specified txHash
| | | * | | | tx-manager - use rpc-specified txHashkumavis2017-01-191-6/+5
| | |/ / / /
| | | * | | Fix test to log out despite number of menu itemsDan Finlay2017-01-182-2/+3
| | | | | |
| | | * | | Bump changelogDan Finlay2017-01-181-0/+2
| | | | | |
| | | * | | Remove outdated referenceDan Finlay2017-01-181-4/+0
| | | | | |
| | | * | | Remove unused UI filesDan Finlay2017-01-182-109/+0
| | | | | |
| | | * | | Allow importing of private key stringsDan Finlay2017-01-1810-16/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
| | | * | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-1819-74/+560
| | | |\ \ \
| | | | * | | Develop import subviewsDan Finlay2016-11-056-17/+87
| | | | | | |
| | | | * | | Add import account placeholder templateDan Finlay2016-11-054-30/+72
| | | | | | |
| | | | * | | Add babelify to gulp buildDan Finlay2016-11-051-0/+4
| | | | | | |
| | | | * | | LintedDan Finlay2016-11-053-12/+8
| | | | | | |
| | | | * | | Add account adding subview placeholdersDan Finlay2016-11-054-39/+121
| | | | | | |
| | | | * | | Merge branch 'i328-MultiVault' into i328-MultiVault-v1Dan Finlay2016-11-051-21/+1
| | | | |\ \ \
| | | | * | | | Remove unused classDan Finlay2016-11-051-1/+1
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 16:50:25 +0800