aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
| | * | | | | Convert buy subview to new tab bar componentDan Finlay2016-11-051-36/+47
| | | | | | |
| | * | | | | Scaffold new account viewDan Finlay2016-11-059-2/+192
| | | | | | |
| * | | | | | Add "import account" menu item + template viewDan Finlay2017-01-184-0/+63
|/ / / / / /
* | | | | | Merge pull request #1017 from MetaMask/conversion-api-errDan Finlay2017-01-182-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Conversion api err
| * \ \ \ \ \ Merge branch 'dev' into conversion-api-errDan Finlay2017-01-1828-261/+413
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1019 from MetaMask/i1014-FixSigningDan Finlay2017-01-185-7/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dev - fix signing
| * \ \ \ \ \ \ Merge branch 'dev' into i1014-FixSigningkumavis2017-01-171-12/+0
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1016 from MetaMask/i1014-FixSigningkumavis2017-01-172-2/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | dev: fix signing
| * \ \ \ \ \ \ \ Merge branch 'dev' into i1014-FixSigningkumavis2017-01-171-12/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1012 from MetaMask/RemoveOldNoticekumavis2017-01-171-12/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove old notice
| * | | | | | | | | Remove old noticeDan Finlay2017-01-171-12/+0
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | This notice is not relevant to new users, should be removed.
| | | * | | | | | Version 3.0.1Dan Finlay2017-01-172-1/+3
| | | | | | | | |
| | | * | | | | | Fix bug where signed messages were not dismissedDan Finlay2017-01-171-0/+1
| | | | | | | | |
| | | * | | | | | Fix removeHexPrefix to stripHexPrefixDan Finlay2017-01-171-1/+1
| | | | | | | | |
| | | * | | | | | Fix message signing UI renderingDan Finlay2017-01-171-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that.
| | | * | | | | | Bump changelogDan Finlay2017-01-171-0/+2
| | |/ / / / / /
| | * | | | | | Wrote fix for eth.signDan Finlay2017-01-171-2/+1
| | | | | | | |
| | * | | | | | Wrote failing test for eth.signDan Finlay2017-01-171-0/+18
| |/ / / / / /
| * | | | | | Merge pull request #1011 from MetaMask/devkumavis2017-01-170-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | Equalize Master and Dev
* | | | | | | Merge pull request #1010 from MetaMask/masterkumavis2017-01-171-1/+1
|\| | | | | | | | | | | | | | | | | | | | Equalize Master and Dev
| * | | | | | Merge pull request #1009 from MetaMask/FixManifestkumavis2017-01-171-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix manifest version
| | * \ \ \ \ \ Merge branch 'master' into FixManifestkumavis2017-01-170-0/+0
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1005 from MetaMask/devkumavis2017-01-17132-1609/+10269
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Merge dev into master!
| | * | | | | | Fix manifest versionDan Finlay2017-01-171-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1008 from MetaMask/Version-3.0.0v3.0.0Dan Finlay2017-01-172-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Version 3.0.0
| * | | | | | | Version 3.0.0Dan Finlay2017-01-172-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #1007 from MetaMask/simple-keystore-fixDan Finlay2017-01-172-9/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | keyring - simple - fix address generation
| * \ \ \ \ \ \ Merge branch 'dev' into simple-keystore-fixkumavis2017-01-176-9/+11
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Bump changelog to mention BIP44 fixDan Finlay2017-01-171-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' into devDan Finlay2017-01-176-9/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #984 from MetaMask/correctCoinbaseInfoDan Finlay2017-01-113-5/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correct coinbase info
| | * | | | | | | add to CHANGELOGFrankie2017-01-111-0/+1
| | | | | | | | |
| | * | | | | | | update coinbase info and viewFrankie2017-01-112-5/+5
| |/ / / / / / /
| * | | | | | | Merge pull request #943 from MetaMask/fixExplorerLinkDan Finlay2016-12-214-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix explorer link
| | * | | | | | | make CHANGELOG more human readableFrankie2016-12-211-1/+1
| | | | | | | | |
| | * | | | | | | Add to CHANGELOG.mdFrances Pangilinan2016-12-211-0/+1
| | | | | | | | |
| | * | | | | | | remove network Id 2 from explorer link and Add network Id 3Frances Pangilinan2016-12-213-4/+3
| |/ / / / / / /
| | * | | | | | test - keyring - simple - fix fixture datakumavis2017-01-171-6/+3
| | | | | | | |
| | * | | | | | keyring - simple - throw error if wallet not found for addresskumavis2017-01-171-1/+4
| | | | | | | |
| | * | | | | | keyring - simple - fix address generationkumavis2017-01-171-3/+3
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1004 from MetaMask/doubleRenderIssueDan Finlay2017-01-172-2/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Dont render conf-tx if their are no txParams to show
| * | | | | | add to CHANGELOGFrankie2017-01-151-0/+1
| | | | | | |
| * | | | | | Dont render conf-tx if their are no txParams to showFrankie2017-01-151-2/+4
|/ / / / / /
* | | | | | Merge pull request #1002 from MetaMask/bug-submitTxFrankie2017-01-1510-160/+258
|\ \ \ \ \ \ | | | | | | | | | | | | | | handle tx finalization in controllers instead of provider-engine
| * | | | | | test - clear localStorage on test startkumavis2017-01-151-3/+3
| | | | | | |
| * | | | | | test - clear localStorage in case CI caches it (?)kumavis2017-01-151-0/+1
| | | | | | |
| * | | | | | test - txManager - add network to all txskumavis2017-01-151-18/+19
| | | | | | |
| * | | | | | tests - txManager - add getNetwork fn to fixture txManagerkumavis2017-01-151-0/+1
| | | | | | |
| * | | | | | eth-store - emit update on new account addkumavis2017-01-151-1/+3
| | | | | | |
| * | | | | | background - txManager - filter txs by networkkumavis2017-01-152-4/+6
| | | | | | |
| * | | | | | background - return txHash to provider-engine on donekumavis2017-01-152-14/+13
| | | | | | |
| * | | | | | Fix the inclusion of the txFee in the meta tx objectFrankie2017-01-151-3/+5
| | | | | | |
| * | | | | | fix for lintingFrankie2017-01-142-2/+3
| | | | | | |
| * | | | | | Satisfy review needs:Frankie2017-01-142-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed unnecessary this.query = opts.query from constructor Created a tx error state for errors in approveTransaction validateTxParams has been moved to tx-utils removed "value" arg from _setTxStatus
| * | | | | | fix the maxcost not being included in txMetaFrankie2017-01-141-3/+7
| | | | | | |
| * | | | | | Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-01-1411-65/+96
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bug-submitTx
| | * \ \ \ \ \ Merge branch 'dev' into bug-submitTxkumavis2017-01-1411-65/+96
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #997 from MetaMask/integrateTxManagerUIkumavis2017-01-1411-66/+99
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Integrate tx manager ui
| * \ \ \ \ \ \ \ Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-141-2/+2
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | remove orphaned commentFrankie2017-01-141-1/+0
| | | | | | | | |
| * | | | | | | | lintFrankie2017-01-141-1/+1
| | | | | | | | |
| * | | | | | | | Clean up codeFrankie2017-01-144-34/+39
| | | | | | | | |
| * | | | | | | | Fix sorting and instances where something could be undefinedFrankie2017-01-123-4/+5
| | | | | | | | |
| * | | | | | | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-122-6/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix wording and icon of failed txsFrankie2017-01-123-15/+22
| | | | | | | | | |
| * | | | | | | | | Add to CHANGELOGFrankie2017-01-122-2/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-128-78/+102
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-1210-54/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pending and unaproved transactions
| | | | * | | | | | | background - metamask controller - fix 'this' refkumavis2017-01-141-7/+8
| | | | |/ / / / / /
| | | | * / / / / / background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-137-131/+215
| |_|_|/ / / / / / |/| | | | | | | |
| | | | | * | | | lint - warn on unhandled errkumavis2017-01-121-2/+2
| | | | | | | | |
| | | | | * | | | currency conversion - less noisy errorkumavis2017-01-121-1/+1
| | | |_|/ / / / | | |/| | | | |
| | | | | | | * background - fix metamaskController store -> diskStore persistencekumavis2017-01-131-1/+6
| | | | | | | |
| | | | | | | * migrations - wip - 005 multivault migrationkumavis2017-01-127-31/+82
| | | | | | | |
| | | | | | | * migrations - introduce promise-based migratorkumavis2017-01-127-136/+204
| | | | | | | |
| | | | | | | * background - move pojo migrator to outside of metamask controllerkumavis2017-01-1215-244/+231
| | | | | | | |
generated by cgit (git 2.34.1) at 2024-10-15 18:32:20 +0800