aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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
| |\
| | * 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
| |/
* | Merge pull request #1004 from MetaMask/doubleRenderIssueDan Finlay2017-01-172-2/+5
|\ \
| * | 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
|\ \
| * | 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
| * | fix the maxcost not being included in txMetaFrankie2017-01-141-3/+7
| * | Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-s...kumavis2017-01-1411-65/+96
| |\ \
| | * \ Merge branch 'dev' into bug-submitTxkumavis2017-01-1411-65/+96
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #997 from MetaMask/integrateTxManagerUIkumavis2017-01-1411-66/+99
|\ \ \ \
| * \ \ \ 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 pending...Frankie2017-01-1210-54/+68
| | | | * | | background - metamask controller - fix 'this' refkumavis2017-01-141-7/+8
| | | | |/ /
| | | | * / background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-137-131/+215
| |_|_|/ / |/| | | |
* | | | | Merge pull request #998 from MetaMask/i960-port-stream-errkumavis2017-01-121-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
|/ / / /
* | | | Merge pull request #996 from MetaMask/i981-UpdateOnAccountChangekumavis2017-01-122-6/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Send update to UI when changing selected accountDan Finlay2017-01-122-6/+5
|/ / /
* | | Merge pull request #990 from MetaMask/sync-accountsDan Finlay2017-01-121-17/+1
|\ \ \
| * | | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
* | | | Merge pull request #988 from MetaMask/eth_syncingkumavis2017-01-112-0/+7
|\| | |
| * | | changelog - add note on rpc overrideskumavis2017-01-111-0/+2
| * | | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
|/ / /
* | | Merge pull request #987 from MetaMask/kumavis-patch-1kumavis2017-01-111-1/+1
|\ \ \
| * | | deps - bump provider enginekumavis2017-01-111-1/+1
|/ / /
* | | Merge pull request #985 from MetaMask/gulp1kumavis2017-01-113-39/+83
|\ \ \
| * \ \ Merge branch 'dev' into gulp1Dan Finlay2017-01-115-21/+10
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #986 from MetaMask/i947-BrowserSolidityErrorkumavis2017-01-112-15/+3
|\ \ \ \
| * | | | Bump changelogDan Finlay2017-01-111-0/+1
| * | | | Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
|/ / / /
* | | | Merge pull request #983 from MetaMask/slim1Kevin Serrano2017-01-113-6/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | tests - add fetch polyfillkumavis2017-01-112-1/+4
| * | | deps - replace promise-request with fetchkumavis2017-01-112-5/+3
|/ / /
| * | gulp - fix brfs instrumentationkumavis2017-01-112-5/+2
| * | gulp - cleanup commentskumavis2017-01-111-13/+19
| * | gulp - add disc bundle analysis taskkumavis2017-01-113-5/+55
| * | gulp - clean and simplifykumavis2017-01-112-25/+16
|/ /
* | Merge pull request #974 from MetaMask/typo-fixFrankie2017-01-071-2/+2
|\ \
| * | quick typo fix.Kevin Serrano2017-01-071-2/+2
|/ /
* | Merge pull request #970 from MetaMask/network-indicator-refactorDan Finlay2017-01-065-16/+24
|\ \
| * \ Merge branch 'dev' into network-indicator-refactorKevin Serrano2017-01-067-45/+188
| |\ \ | |/ / |/| |
* | | Merge pull request #971 from MetaMask/TearDownOnDisconnectkumavis2017-01-062-11/+8
|\ \ \
| * \ \ Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-064-31/+34
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #967 from MetaMask/fixTxManagerDan Finlay2017-01-064-32/+34
|\ \ \ \
| * \ \ \ Merge branch 'dev' into fixTxManagerDan Finlay2017-01-064-2/+146
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| * | | | remove unnecessary try statmentsFrankie2017-01-053-37/+24
| * | | | Merge branch 'TxManager' into fixTxManagerFrankie2017-01-051-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into ...Frankie2017-01-053-22/+31
| | |\ \ \ \
| | | * \ \ \ Merge pull request #958 from MetaMask/i897-ReplayProtectionKevin Serrano2017-01-0415-70/+328
| | | |\ \ \ \
| | | | * \ \ \ Merge branch 'dev' into i897-ReplayProtectionDan Finlay2017-01-0311-48/+259
| | | | |\ \ \ \
| | | | * | | | | Use chainId parameter instead of second argumentDan Finlay2017-01-031-1/+2
| | | | * | | | | LintedDan Finlay2017-01-031-2/+2
| | | | * | | | | Bump changelogDan Finlay2017-01-031-0/+1
| | | | * | | | | Add replay protection to Transaction ManagerDan Finlay2017-01-032-23/+30
| * | | | | | | | clean upFrankie2017-01-051-1/+1
| * | | | | | | | Merge branch 'dev' into fixtTxManagerFrankie2017-01-0515-100/+324
| |\| | | | | | |
| * | | | | | | | Fix signing of transactionsFrankie2017-01-053-46/+62
| | |_|/ / / / / | |/| | | | | |
| | | | | * | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-064-2/+146
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #969 from MetaMask/i945-AlwaysQueryLatestKevin Serrano2017-01-064-2/+146
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
| * | | | | | | Fix dependency referenceDan Finlay2017-01-051-1/+1
| * | | | | | | Caught typoDan Finlay2017-01-051-2/+3
| * | | | | | | Add descriptive commentDan Finlay2017-01-051-0/+9
| * | | | | | | LintedDan Finlay2017-01-051-22/+17
| * | | | | | | Bump changelogDan Finlay2017-01-051-0/+1
| * | | | | | | Remove old eth-store dependencyDan Finlay2017-01-051-1/+0
| * | | | | | | Removed reliance on eth-store internal custom eth-queryDan Finlay2017-01-051-6/+15
| * | | | | | | Move eth-store@1.1.0 into local repo.Dan Finlay2017-01-051-0/+132
|/ / / / / / /
| | | | * / / MetaMask Controller - Convert to EventEmitterFrankie2017-01-062-12/+8
| |_|_|/ / / |/| | | | |
| | | | * | Switch order of header and indicator.Kevin Serrano2017-01-061-1/+1
| | | | * | Changelog.Kevin Serrano2017-01-051-0/+2
| | | | * | Linting.Kevin Serrano2017-01-052-2/+1
| | | | * | 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
|\ \ \ \ \
| * \ \ \ \ 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
|\ \ \ \ \ \
| * \ \ \ \ \ 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
| | |_|_|/ / | |/| | | |
| | * | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|/ / / / /
| * | | | 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
| | |\ \ \
| | * \ \ \ Merge pull request #955 from MetaMask/i727-provider-is-metamaskFrankie2017-01-031-0/+2
| | |\ \ \ \
| * | | | | | 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 RevertTx...Dan Finlay2017-01-031-0/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
| | |/ / / / | |/| | | |
* | | | | | 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
| |\| |
| | * | 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
| | * | | 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
|/ / / /
* | | | Merge pull request #949 from MetaMask/RemoveLogKevin Serrano2016-12-231-1/+0
|\ \ \ \
| * | | | Remove logDan Finlay2016-12-231-1/+0
|/ / / /
* | | | Merge pull request #948 from MetaMask/RecoverLostAccountsDan Finlay2016-12-2314-191/+316
|\ \ \ \
| * | | | 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
| * | | | 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
| * | | | 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
* | | | | Fix account injection bugDan Finlay2016-12-231-2/+3
| |_|/ / |/| | |
* | | | Merge pull request #944 from MetaMask/i938-uri-validationDan Finlay2016-12-224-13/+39
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * | | 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
| |/ /
* | | Merge pull request #939 from MetaMask/BrowserPassworderDan Finlay2016-12-214-228/+3
|\ \ \
| * | | 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
* | | | Merge pull request #942 from MetaMask/Version-2.14.1Dan Finlay2016-12-212-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Merged master into devDan Finlay2016-12-2025-54/+626
|/| | | | |/ /
| * | Merge pull request #935 from MetaMask/kumavis-patch-1Dan Finlay2016-12-202-8/+11
| |\ \
| | * | changelog - add whitespacekumavis2016-12-201-0/+1
| | * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ku...kumavis2016-12-200-0/+0
| | |\ \
| | | * \ Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ku...kumavis2016-12-202-4/+6
| | | |\ \
| | | | * \ 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.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
| |\ \
| | * | Clean up first noticeDan Finlay2016-12-172-2/+2
| | * | Add date to notices display.Kevin Serrano2016-12-171-1/+15
| | * | move notice code from metamask-controller + config-manager, in to notice-cont...kumavis2016-12-175-205/+213
| | * | 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
| | * | Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-1717-4/+554
| |/ /
| * | Merge pull request #923 from MetaMask/RemoveMordenFrankie2016-12-176-27/+3
| |\ \
| | * | Bump changelog for removing mordenDan Finlay2016-12-161-0/+1
| | * | Remove morden testnet providerDan Finlay2016-12-165-27/+2
| |/ /
| * | Merge pull request #918 from MetaMask/i915-txPermaCachekumavis2016-12-132-1/+2
| |\ \
| | * | 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"kumavis2016-12-081-0/+2
| |/ /
| * | Merge pull request #911 from MetaMask/i873-reloadBrokenDan Finlay2016-12-081-1/+1
| |\ \
| | * | 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.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"Dan Finlay2016-12-1711-54/+101
|/ / /
* | | Merge pull request #920 from luisivan/devDan Finlay2016-12-1511-101/+54
|\ \ \ | |_|/ |/| |
| * | 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
|\ \
| * | 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
|\ \
| * | Remove redundant logging blockDan Finlay2016-12-021-3/+0
| * | Fix vault encrypting & unlocking bugDan Finlay2016-12-016-13/+53
| * | Add integration tests for logging out and back inDan Finlay2016-12-012-2/+29
| * | Add more integration testsDan Finlay2016-12-011-0/+25
| * | 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
|\ \
| * | Add useful nodeify error messageDan Finlay2016-11-301-2/+9
| * | Return promise correctly from setSelectedAddressDan Finlay2016-11-301-1/+1
* | | Merge pull request #896 from MetaMask/i893-DenodeifyKeyringControllerKevin Serrano2016-11-309-458/+722
|\| |
| * | 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
| * | 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
* | | Merge pull request #890 from MetaMask/MergeMasterIntoDevKevin Serrano2016-11-296-33/+72
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 23:47:38 +0800