aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-054-17/+24
|
* Merge pull request #965 from MetaMask/chrome-permissionsDan Finlay2017-01-043-4/+29
|\ | | | | Chrome permissions
| * Merge branch 'dev' of github.com:MetaMask/metamask-plugin into devKevin Serrano2017-01-041-2/+8
| |\ | |/ |/|
* | Merge pull request #964 from MetaMask/i963-BalancesNotUpdatingKevin Serrano2017-01-041-2/+8
|\ \ | | | | | | Update UI state on ethStore updates
| * \ Merge branch 'dev' into i963-BalancesNotUpdatingKevin Serrano2017-01-041-46/+28
| |\ \ | |/ / |/| |
| * | Fix sendUpdate for new promisified getState methodDan Finlay2017-01-041-2/+6
| | |
| * | Update UI state on ethStore updatesDan Finlay2017-01-041-0/+2
| | | | | | | | | | | | | | | | | | UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity. Fixes #963
| | * Merge branch 'dev' of github.com:MetaMask/metamask-plugin into devKevin Serrano2017-01-041-46/+28
| | |\ | |_|/ |/| |
* | | Merge pull request #962 from MetaMask/i961-UpdateUiBugKevin Serrano2017-01-041-46/+28
|\ \ \ | |/ / |/| | Fix AddAccount not updating UI
| * | Convert more actions to new simple patternDan Finlay2017-01-041-18/+2
| | |
| * | Restore missing lineDan Finlay2017-01-041-0/+1
| | |
| * | Corrected instances of showWarning to displayWarningDan Finlay2017-01-041-3/+3
| | |
| * | Apply new pattern to repetitive functionsDan Finlay2017-01-041-19/+2
| | |
| * | Update account list after adding accountDan Finlay2017-01-041-10/+24
|/ / | | | | | | | | | | Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process. Fixes #961
| * Changelog.Kevin Serrano2017-01-041-1/+1
| |
| * Changelog.Kevin Serrano2017-01-041-0/+1
| |
| * Take out unneeded permissions from the app.Kevin Serrano2017-01-042-4/+28
|/
* Merge remote-tracking branch 'origin/ShowDifferentAccounts' into RevertTxManagerDan Finlay2017-01-033-7/+7
|\
| * Make single letter variables more verboseDan Finlay2017-01-032-5/+5
| |
| * Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-0320-657/+669
| |\
| | * Merge pull request #954 from MetaMask/kumavis-readme-gourceFrankie2017-01-031-0/+36
| | |\ | | | | | | | | Readme - add gource instructions to readme
| | * \ Merge pull request #955 from MetaMask/i727-provider-is-metamaskFrankie2017-01-031-0/+2
| | |\ \ | | | | | | | | | | inpage-provider - add isMetaMask
| * | | | Add tolerance for hex prefixed private keys to simple keychainDan Finlay2017-01-031-3/+4
| | | | |
* | | | | Merge remote-tracking branch 'origin/i727-provider-is-metamask' into ↵Dan Finlay2017-01-031-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | RevertTxManager
| * | | | inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
| | |/ / | |/| | | | | | | | | | adds `metamaskInpageProvider.isMetaMask === true` Fixes #727
* | | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManagerDan Finlay2017-01-0319-655/+666
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | meta - readme - add gource instructionskumavis2017-01-031-0/+36
| |/
| * Merge pull request #921 from MetaMask/TxManagerkumavis2017-01-0318-657/+631
| |\ | | | | | | Feature: TxManager handles transaction state tracking
| | * Merge branch 'dev' into TxManagerFrankie2016-12-2415-197/+318
| | |\ | | |/ | |/|
| | * fix some minor spelling mistakes and clean up codeFrankie2016-12-244-34/+32
| | |
| | * fix mergeFrances Pangilinan2016-12-221-1/+1
| | |
| | * Merge branch 'dev' into TxManagerFrankie2016-12-2238-362/+813
| | |\
| | * | Remove txManager in keyring controllerFrances Pangilinan2016-12-221-2/+0
| | | |
| | * | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-224-54/+71
| | | | | | | | | | | | | | | | Fix up txManager to reflect code review requests
| | * | First pass at revision requestsFrances Pangilinan2016-12-2213-595/+239
| | | |
| | * | Clean up and comment functionsFrances Pangilinan2016-12-152-10/+31
| | | |
| | * | add to CHANGELOG.mdFrances Pangilinan2016-12-151-0/+1
| | | |
| | * | add Test for txManager. As well as fix tests to account for txManager.Frances Pangilinan2016-12-156-80/+185
| | | |
| | * | Create a TxManagerFrances Pangilinan2016-12-157-159/+350
| | | |
* | | | Correct getState test to be asyncDan Finlay2016-12-241-4/+7
| | | |
* | | | Fix rendering of loose accountsDan Finlay2016-12-242-3/+5
| | | |
* | | | Add loose account development stateDan Finlay2016-12-241-0/+126
| | | |
* | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccountsDan Finlay2016-12-243-4/+22
|\ \ \ \
| * | | | Add additional migration testDan Finlay2016-12-243-4/+22
| |/ / /
* | | | Show a "LOOSE" warning on accounts not belonging to HD Seed phraseDan Finlay2016-12-233-7/+42
| | | |
* | | | Return keyring metadata on metamask state objectDan Finlay2016-12-232-29/+55
|/ / / | | | | | | | | | | | | | | | | | | Required making the getState methods for both keyringController and metamaskController async. They both now return promises, and the main metamask-controller.getState method is now nodeified. Will allow the UI to render loose keys differently than persisted keys.
* | | Merge pull request #949 from MetaMask/RemoveLogKevin Serrano2016-12-231-1/+0
|\ \ \ | | | | | | | | Remove log
| * | | Remove logDan Finlay2016-12-231-1/+0
|/ / /
* | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-2314-191/+316
|\ \ \ | | | | | | | | Auto-Recover accounts lost to BIP44 derivation fix
| * | | Rename function to be an actionDan Finlay2016-12-231-2/+2
| | | |
| * | | Break up migration functionDan Finlay2016-12-231-24/+24
| | | |
| * | | Don't bother changing selected accounts since accounts are recoveredDan Finlay2016-12-231-13/+3
| | | |
| * | | Remove logsDan Finlay2016-12-231-2/+2
| | | |
| * | | LintedDan Finlay2016-12-221-4/+3
| | | |
| * | | Restructured migrationDan Finlay2016-12-226-144/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrator now returns a lostAccount array that includes objects these objects include keys of address and privateKey, this allows the MetamaskController to restore the lost accounts even without customizing the idStore or the KeyringController. Also includes a patch that allows idStore to synchronously export private keys.
| * | | Return undefined when vault is uninitializedDan Finlay2016-12-221-1/+1
| | | |
| * | | Added error when trying to unlock uninitialized vaultDan Finlay2016-12-221-0/+4
| | | |
| * | | Move old keystore migration code to metamask controllerDan Finlay2016-12-222-46/+50
| | | | | | | | | | | | | | | | Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.
| * | | Fixed another lostAccount testDan Finlay2016-12-221-1/+1
| | | |
| * | | Refine a lostAccount testDan Finlay2016-12-211-1/+1
| | | |
| * | | LintedDan Finlay2016-12-213-5/+3
| | | |
| * | | Add lost accounts ui development stateDan Finlay2016-12-211-0/+91
| | | |
| * | | Make notices confirmation configurableDan Finlay2016-12-216-15/+72
| | | | | | | | | | | | | | | | - Confirm button will now dismiss the lost accounts array.
* | | | Fix account injection bugDan Finlay2016-12-231-2/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account. I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](https://github.com/MetaMask/metamask-plugin/commit/f5b0795ac5582dd53de728479cf47c43eabfe67c) by @Zanibas. Sorry, Kevin! Had you actually changed all instances, this bug would not have happened. Fixes #908
* | | Merge pull request #944 from MetaMask/i938-uri-validationDan Finlay2016-12-224-13/+39
|\ \ \ | |/ / |/| | I938 uri validation
| * | Add to changelog.Kevin Serrano2016-12-211-0/+1
| | |
| * | Lint.Kevin Serrano2016-12-212-12/+12
| | |
| * | Validate URIs before entering them in.Kevin Serrano2016-12-212-2/+27
|/ /
* | Merge pull request #916 from MetaMask/i894-DetectBadAccountsDan Finlay2016-12-219-57/+124
|\ \ | | | | | | I894 detect bad accounts
| * | Made changes according to feedback.Dan Finlay2016-12-205-14/+13
| | |
| * | Got bad account detection working and added to stateDan Finlay2016-12-104-34/+13
| | |
| * | Mostly added bad account detectionDan Finlay2016-12-098-50/+139
| |/ | | | | | | Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.
* | Merge pull request #939 from MetaMask/BrowserPassworderDan Finlay2016-12-214-228/+3
|\ \ | | | | | | Remove encryptor in favor of external browser-passworder
| * | Bump passworder versionDan Finlay2016-12-211-1/+1
| | |
| * | Use security patched version of browser-passworderDan Finlay2016-12-211-1/+1
| | |
| * | Remove encryptor in favor of external browser-passworderDan Finlay2016-12-204-228/+3
| | | | | | | | | | | | I broke out the encryptor lib into its own module on npm called browser-passworder.
* | | Merge pull request #942 from MetaMask/Version-2.14.1Dan Finlay2016-12-212-1/+3
|\ \ \ | |/ / |/| | Version 2.14.1
| * | Version 2.14.12.14.1Dan Finlay2016-12-212-1/+3
| | |
* | | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-208-26/+32
|\ \ \ | | | | | | | | I900 forgot password flow
| * | | Modify actions to support better transition.Kevin Serrano2016-12-203-1/+18
| | | |
| * | | Add to changelog.Kevin Serrano2016-12-201-0/+1
| | | |
| * | | Lint.Kevin Serrano2016-12-203-6/+5
| | | |
| * | | Redirect to seed word screen for forgotten passwords.Kevin Serrano2016-12-204-20/+9
| | | |
* | | | Merge pull request #936 from MetaMask/MergeMasterkumavis2016-12-2025-54/+626
|\ \ \ \ | |/ / / |/| | | Merge master
| * | | Merged master into devDan Finlay2016-12-2025-54/+626
|/| | | | |/ /
| * | Merge pull request #935 from MetaMask/kumavis-patch-1Dan Finlay2016-12-202-8/+11
| |\ \ | | | | | | | | inpage - temporarily disable ping stream
| | * | changelog - add whitespacekumavis2016-12-201-0/+1
| | | |
| | * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-12-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | kumavis-patch-1
| | | * \ Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-12-202-4/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | kumavis-patch-1
| | | | * \ Merge branch 'master' into kumavis-patch-1kumavis2016-12-202-4/+5
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #929 from MetaMask/Version-2.14.0Dan Finlay2016-12-202-4/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Version 2.14.0
| | * | | | | Version 2.14.02.14.0Dan Finlay2016-12-172-4/+5
| |/ / / / /
| | * / / / changelog - inf reload detection hotfixkumavis2016-12-202-4/+6
| | |/ / /
| | * / / changelog - add note on inf reload detection hotfixkumavis2016-12-201-1/+1
| | |/ /
| | * / inpage - temporarily disable ping streamkumavis2016-12-201-8/+9
| |/ /
| * | Merge pull request #927 from MetaMask/AddNoticesDan Finlay2016-12-1719-21/+607
| |\ \ | | | | | | | | Add notices
| | * | Clean up first noticeDan Finlay2016-12-172-2/+2
| | | | | | | | | | | | | | | | | | | | Remove redundant title from notice component. Make link color the same orange as the rest of the UI.
| | * | Add date to notices display.Kevin Serrano2016-12-171-1/+15
| | | |
| | * | move notice code from metamask-controller + config-manager, in to ↵kumavis2016-12-175-205/+213
| | | | | | | | | | | | | | | | notice-controller
| | * | meta - add npm-debug.log to gitignorekumavis2016-12-171-0/+1
| | | |
| | * | clean - code stylekumavis2016-12-172-8/+3
| | | |
| | * | Deactivate polling for now.Kevin Serrano2016-12-171-1/+3
| | | |
| | * | Merge branch 'AddNotices' of github.com:MetaMask/metamask-plugin into AddNoticesDan Finlay2016-12-172-1/+12
| | |\ \
| | | * | remove duplicate controller.Kevin Serrano2016-12-171-3/+0
| | | | |
| | | * | Clean notices.Kevin Serrano2016-12-171-1/+1
| | | | |
| | | * | The first notice, the fall of morden.Kevin Serrano2016-12-172-1/+12
| | | | |
| | * | | CleanupDan Finlay2016-12-173-4/+1
| | |/ /
| | * | Rebuild development states before ci testsDan Finlay2016-12-171-2/+3
| | | |
| | * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-174-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| | * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-1717-4/+554
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| * | Merge pull request #923 from MetaMask/RemoveMordenFrankie2016-12-176-27/+3
| |\ \ | | | | | | | | Remove morden
| | * | Bump changelog for removing mordenDan Finlay2016-12-161-0/+1
| | | |
| | * | Remove morden testnet providerDan Finlay2016-12-165-27/+2
| |/ / | | | | | | | | | Instances configured to point at Morden will now point at Ropsten.
| * | Merge pull request #918 from MetaMask/i915-txPermaCachekumavis2016-12-132-1/+2
| |\ \ | | | | | | | | deps - bump provider-engine for bug fix
| | * | deps - bump provider-engine for bug fixkumavis2016-12-132-1/+2
| |/ /
| * | Merge pull request #912 from MetaMask/kumavis-patch-1Dan Finlay2016-12-081-0/+2
| |\ \ | | | | | | | | changelog - "fix reload detection"
| | * | changelog - "fix reload detection"kumavis2016-12-081-0/+2
| |/ /
| * | Merge pull request #911 from MetaMask/i873-reloadBrokenDan Finlay2016-12-081-1/+1
| |\ \ | | | | | | | | Fix broken disconnect detector
| | * | inpage - correctly listen for incomming messageskumavis2016-12-081-1/+1
| |/ /
| * | Merge pull request #891 from MetaMask/Version-2.13.11Dan Finlay2016-11-292-1/+3
| |\ \ | | | | | | | | Version 2.13.11
| | * | Version 2.13.112.13.11Dan Finlay2016-11-242-1/+3
| |/ /
* | | Merge pull request #926 from MetaMask/revert-920-devDan Finlay2016-12-1711-54/+101
|\ \ \ | | | | | | | | Revert "Interface enhancements"
| * | | Revert "Interface enhancements"Dan Finlay2016-12-1711-54/+101
|/ / /
* | | Merge pull request #920 from luisivan/devDan Finlay2016-12-1511-101/+54
|\ \ \ | |_|/ |/| | Interface enhancements
| * | Fixed header h1 alignment and network nameLuis Iván Cuende2016-12-152-5/+3
| | |
| * | Better account details viewLuis Iván Cuende2016-12-155-42/+14
| | |
| * | Better editable labelLuis Iván Cuende2016-12-155-40/+15
| | |
| * | Better buttonsLuis Iván Cuende2016-12-142-4/+9
| | |
| * | Beautified disclaimerLuis Iván Cuende2016-12-143-11/+14
|/ /
* | Merge pull request #914 from MetaMask/FixUnitTestSuiteDan Finlay2016-12-092-2/+2
|\ \ | | | | | | Remove .only from unit test suite
| * | Cranked up CI test suite wait duration to alleviate their nondeterminism for nowDan Finlay2016-12-081-1/+1
| | |
| * | Remove .only from unit test suiteDan Finlay2016-12-081-1/+1
|/ /
* | Merge pull request #904 from MetaMask/BetterIntegrationTestkumavis2016-12-029-18/+161
|\ \ | | | | | | Made integration test suite better, added a step to story
| * | Remove redundant logging blockDan Finlay2016-12-021-3/+0
| | |
| * | Fix vault encrypting & unlocking bugDan Finlay2016-12-016-13/+53
| | | | | | | | | | | | | | | | | | | | | | | | This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.
| * | Add integration tests for logging out and back inDan Finlay2016-12-012-2/+29
| | |
| * | Add more integration testsDan Finlay2016-12-011-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Integration tests now: - Scroll through terms - Accept terms - Confirm seed phrase - Verify account detail screen
| * | Made integration test create a first vaultDan Finlay2016-12-015-4/+58
|/ /
* | Merge pull request #899 from MetaMask/i893-DenodeifyKeyringControllerKevin Serrano2016-11-302-3/+10
|\ \ | | | | | | Fix incorrect nodeification and add descriptive error to help find in future
| * | Add useful nodeify error messageDan Finlay2016-11-301-2/+9
| | | | | | | | | | | | | | | | | | | | | If a nodified method does not return a Promise, it will throw an error, like this: ``` Error in event handler for (unknown): Error: The function setSelectedAccount did not return a Promise, but was nodeified. ```
| * | Return promise correctly from setSelectedAddressDan Finlay2016-11-301-1/+1
| | |
* | | Merge pull request #896 from MetaMask/i893-DenodeifyKeyringControllerKevin Serrano2016-11-309-458/+722
|\| | | | | | | | Denodeify most of KeyringController
| * | Flattened addTx async methodsDan Finlay2016-11-302-90/+83
| | |
| * | Bind ethQuery to estimateGas to allow it to be moved around.Dan Finlay2016-11-301-2/+2
| | |
| * | Fix tx adding codeDan Finlay2016-11-302-50/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.
| * | Ordered keyringController methods the same in metamask-controllerDan Finlay2016-11-302-5/+9
| | |
| * | Annotated KeyringControllerDan Finlay2016-11-301-219/+496
| | |
| * | Remove unused depDan Finlay2016-11-291-1/+0
| | |
| * | Fix nodeify usageDan Finlay2016-11-291-11/+11
| | |
| * | Fix nodeifyDan Finlay2016-11-292-55/+35
| | |
| * | Denodeify most of KeyringControllerDan Finlay2016-11-297-172/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly Fixes #893 A couple methods cache callbacks, and will require a larger refactor to fully denodeify. Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those. I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.
* | | Merge pull request #890 from MetaMask/MergeMasterIntoDevKevin Serrano2016-11-296-33/+72
|\| | | | | | | | Merge master into dev
| * | Merge branch 'master' into devDan Finlay2016-11-246-33/+72
|/| | | |/
| * Merge pull request #884 from MetaMask/i883-sync-uninstallFilterkumavis2016-11-242-0/+9
| |\ | | | | | | Add support for sync RPC uninstallFilter
| | * changelog - add sync rpc eth_uninstallFilter notekumavis2016-11-241-0/+2
| | |
| | * rpc - add sync uninstallFilter supportkumavis2016-11-241-0/+7
| |/
| * Merge pull request #876 from MetaMask/Version-2.13.10Dan Finlay2016-11-232-3/+7
| |\ | | | | | | Version 2.13.10
| | * Version 2.13.102.13.10Dan Finlay2016-11-232-3/+7
| |/
| * Merge pull request #872 from MetaMask/i868-estimateGasTooHighkumavis2016-11-232-29/+50
| |\ | | | | | | Improve gas estimation logic
| | * Merge branch 'master' into i868-estimateGasTooHighkumavis2016-11-235-8/+17
| | |\ | | |/ | |/|
| * | Merge pull request #864 from MetaMask/new-faucetkumavis2016-11-233-4/+5
| |\ \ | | | | | | | | Point to ropsten faucet
| | * \ Merge branch 'master' into new-faucetDan Finlay2016-11-233-4/+12
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #855 from MetaMask/i834-RopstenLinksKevin Serrano2016-11-233-4/+12
| |\ \ \ | | | | | | | | | | Add ropsten link support
| | * | | Unify test wordingDan Finlay2016-11-221-2/+2
| | | | |
| | * | | Add temporary morden explorer link supportDan Finlay2016-11-222-1/+7
| | | | |
| | * | | Fix ropsten link testDan Finlay2016-11-221-2/+2
| | | | |
| | * | | Bump changelogDan Finlay2016-11-221-0/+2
| | | | |
| | * | | Merge branch 'master' into i834-RopstenLinksDan Finlay2016-11-222-1/+3
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Add ropsten link supportDan Finlay2016-11-221-2/+2
| | | | |
| | | * | Ropsten has sole access to the faucet.Kevin Serrano2016-11-232-4/+4
| | | | |
| | | * | Add to changelog.Kevin Serrano2016-11-233-2/+3
| | |/ / | |/| |
| | | * idStore - fix estimateGas calculationkumavis2016-11-232-29/+50
| | |/ | |/|
| * | Merge pull request #838 from MetaMask/Version-2.13.9kumavis2016-11-222-1/+3
| |\ \ | | |/ | |/| Version 2.13.9
| | * Version 2.13.92.13.9Dan Finlay2016-11-222-1/+3
| |/
| * Merge pull request #832 from MetaMask/i831-AddRopstenKevin Serrano2016-11-228-4/+42
| |\ | | | | | | Begin adding Ropsten support
* | \ Merge pull request #887 from MetaMask/i865-erabeKevin Serrano2016-11-245-37/+20
|\ \ \ | | | | | | | | Modify forgot password flow to go back to init screen.
| * | | Cosmetic changes, rename links.Kevin Serrano2016-11-241-9/+9
| | | |
| * | | Add link back to unlock.Kevin Serrano2016-11-241-0/+16
| | | |
| * | | Fix proper behavior for restoring accounts when password forgotten.Kevin Serrano2016-11-242-0/+2
| | | |
| * | | Modify forgot password flow to go back to init screen.Kevin Serrano2016-11-242-36/+1
| | | |
* | | | Merge pull request #888 from MetaMask/i844-AsyncKeyringsKevin Serrano2016-11-246-144/+236
|\ \ \ \ | |/ / / |/| | | Modify Keyring protocol to always return promises for public methods
| * | | Fix last async keyring testDan Finlay2016-11-241-8/+10
| | | |
| * | | Fix more async usage of KeyringControllerDan Finlay2016-11-241-25/+32
| | | |
| * | | Fix more keyring asyncifying testsDan Finlay2016-11-242-3/+11
| | | |
| * | | Mostly got async keyringController tests passingDan Finlay2016-11-234-62/+100
| | | |
| * | | Complete first pass at asyncrhonizing keyring controllerDan Finlay2016-11-231-31/+53
| | | |
| * | | Asynced keyrings and started on controllerDan Finlay2016-11-233-32/+47
|/ / /
* | | Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptorKevin Serrano2016-11-235-6/+21
|\ \ \ | | | | | | | | Fix new encryptor implementation
| * | | Fix new encryptor migration logicDan Finlay2016-11-233-3/+13
| | | |
| * | | Fix undefined provider menu itemDan Finlay2016-11-231-2/+5
| | | |
| * | | Fix password referenceDan Finlay2016-11-232-1/+3
| | | |
* | | | Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptorDan Finlay2016-11-234-49/+42
|\| | | | | | | | | | | Simplify Encryptor API Surface
| * | | Remove line of cruftDan Finlay2016-11-231-1/+0
| | | |
| * | | Fix vault migration unit testDan Finlay2016-11-231-1/+1
| | | |
| * | | Improve vault migration unit testDan Finlay2016-11-231-1/+2
| | | |
| * | | Refine isInitialized derivation methodDan Finlay2016-11-231-1/+1
| | | |
| * | | LintedDan Finlay2016-11-231-1/+1
| | | |
| * | | Simplify Encryptor API SurfaceDan Finlay2016-11-233-49/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least, the portion of it that we use. Moved salting within the encryptor, so it does not need to be managed externally. KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt. Encryptor payload is now in a JSON format, so its portions are both base64 encoded *and* labeled appropriately. The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`. Fixes #843 Fixes #859
| * | | Merge branch 'dev' into i843-MoveSaltIntoEncryptorDan Finlay2016-11-2348-138/+234
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-devDan Finlay2016-11-232-5/+62
|\ \ \ \ | | | | | | | | | | I868 estimate gas too high dev
| * | | | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOGkumavis2016-11-232-5/+62
| | | | |
* | | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWordkumavis2016-11-234-8/+21
|\ \ \ \ \ | |/ / / / |/| | | | I842 wait for seed word
| * | | | Move state update outside of conditional callback blockDan Finlay2016-11-231-1/+1
| | | | |
| * | | | Restore ropsten link supportDan Finlay2016-11-231-3/+3
| | | | |
| * | | | Remove callback type checkDan Finlay2016-11-231-1/+1
| | | | |
| * | | | Fix etherscan link generation testDan Finlay2016-11-231-2/+8
| | | | |
| * | | | Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-238-46/+67
| |\ \ \ \
| * | | | | Use callback in placeSeedWord method.Dan Finlay2016-11-222-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842
* | | | | | Merge pull request #857 from MetaMask/i841-RenameMethodkumavis2016-11-232-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rename idStoreMigrator method for clarity
| * | | | | | Rename idStoreMigrator method for clarityDan Finlay2016-11-222-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes #841
* | | | | | Merge pull request #869 from MetaMask/dev-cleanupkumavis2016-11-2337-71/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dev Cleanup Package
| * \ \ \ \ \ Merge branch 'dev' into dev-cleanupKevin Serrano2016-11-238-46/+67
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Fix camel casing on setSelectedAccount action.Dan Finlay2016-11-223-4/+4
| | | | | | |
| * | | | | | Added instructions for installing local buildDan Finlay2016-11-221-0/+6
| | | | | | |
| * | | | | | Change fauceting to become a response of an emit.Kevin Serrano2016-11-223-4/+9
| | | | | | |
| * | | | | | change all instances of selectedAddress to selectedAccount.Kevin Serrano2016-11-2231-52/+49
| | | | | | |
| * | | | | | Remove entropy from encryption and project.Kevin Serrano2016-11-227-17/+15
| | | | | | |
* | | | | | | Merge pull request #871 from MetaMask/i860-ethjsremovekumavis2016-11-232-6/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Phase out ethereumjs-util from encryptor module.
| * | | | | | Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-232-6/+5
|/ / / / / /
* | | | | | Merge pull request #866 from MetaMask/new-faucet-devDan Finlay2016-11-233-3/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make ropsten faucet button point at the correct url.
| * | | | | | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-233-3/+4
| |/ / / / /
* | | | | | Merge pull request #856 from MetaMask/i835-OrganizeKeyringsKevin Serrano2016-11-236-45/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | I835 organize keyrings
| * | | | | | Fix keyring testDan Finlay2016-11-221-1/+1
| | | | | | |
| * | | | | | Improve Keyring organizationDan Finlay2016-11-225-42/+62
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846)
| | | * | | Began moving salt into encryptorDan Finlay2016-11-231-5/+10
| | |/ / / | |/| | |
| * | | | Revert premature link test fixDan Finlay2016-11-221-2/+2
|/ / / /
* / / / Fixed account link test for ropsten networkDan Finlay2016-11-221-2/+2
|/ / /
* | | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-224-8/+96
|\ \ \ | | | | | | | | Fix custom provider menu item
| * | | Add development states.js back into repoDan Finlay2016-11-222-1/+1
| | | |
| * | | Fix custom provider menu itemDan Finlay2016-11-225-8/+96
| | | | | | | | | | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
* | | | Merge pull request #833 from MetaMask/i831-AddRopsten-DevKevin Serrano2016-11-228-4/+41
|\ \ \ \ | | | | | | | | | | Begin adding Ropsten support to dev
| * | | | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-22100-814/+8243
| |\| | | | | |_|/ | |/| |
| * | | Begin adding Ropsten supportDan Finlay2016-11-228-4/+42
| | |/ | |/| | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* | | Merge pull request #830 from MetaMask/kumavis-patch-1Dan Finlay2016-11-221-1/+8
|\ \ \ | |_|/ |/| | meta - README - add npm start to instructions
| * | meta - README - add npm start to instructionskumavis2016-11-221-1/+8
|/ / | | | | thanks @karlfloersch
* | Merge pull request #827 from MetaMask/currency-cleanupDan Finlay2016-11-194-7/+5731
|\ \ | | | | | | Convert conversion-util to pure json.
| * | Convert conversion util to pure json.Kevin Serrano2016-11-194-7/+5731
| | |
* | | Merge pull request #826 from MetaMask/mini-lintDan Finlay2016-11-192-3/+3
|\ \ \ | |/ / |/| | Maintain linting.
| * | Maintain linting.Kevin Serrano2016-11-192-3/+3
|/ /
* | Merge pull request #824 from MetaMask/failing-testsDan Finlay2016-11-193-5/+72
|\ \ | | | | | | Promisify persistence of old vaults in migration code
| * | Promisify persistence of keyrings before returning keyKevin Serrano2016-11-191-5/+5
| | | | | | | | | | | | Change single letter variables (shame)
| * | Merge branch 'dev' into failing-testsKevin Serrano2016-11-192-3/+3
| |\ \ | |/ / |/| |
* | | Merge pull request #823 from MetaMask/FixBorkKevin Serrano2016-11-191-2/+2
|\ \ \ | | | | | | | | Update migration code for new hd wallet param name
| * | | Update migration code for new hd wallet param nameDan Finlay2016-11-191-2/+2
|/ / /
* | | Persist keyrings from migration to storage.Kevin Serrano2016-11-191-1/+1
| | |
| * | Create failing test to check submitPassword in keyringController.Kevin Serrano2016-11-192-0/+67
|/ /
* | Resolve merge conflict.Kevin Serrano2016-11-1994-805/+2444
|\ \ | |/ |/|
| * random-id - use Number.MAX_SAFE_INTEGER as maxkumavis2016-11-181-1/+1
| |
| * Merge pull request #816 from MetaMask/i328-MultiVaultkumavis2016-11-1895-818/+2457
| |\ | | | | | | Multi vault to Dev Branch
| | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-11-1866-306/+273
| | |\ | | | | | | | | | | | | i328-MultiVault
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 18:33:36 +0800