aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Merge pull request #998 from MetaMask/i960-port-stream-errkumavis2017-01-121-2/+2
|\ \ \ \ | |_|_|/ |/| | | bugfix - portstream - dont wrap cb in try catch
| * | | 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 account
| * | Send update to UI when changing selected accountDan Finlay2017-01-122-6/+5
|/ / | | | | | | Fixes #981
* | Merge pull request #990 from MetaMask/sync-accountsDan Finlay2017-01-121-17/+1
|\ \ | | | | | | rpc - fix sync account cache setting
| * | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
| | |
* | | Merge pull request #988 from MetaMask/eth_syncingkumavis2017-01-112-0/+7
|\| | | | | | | | web3 provider - override eth_syncing and web3_clientVersion
| * | 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 engine
| * | deps - bump provider enginekumavis2017-01-111-1/+1
|/ / | | | | addresses caching memory leak that can cause slow downs
* | Merge pull request #985 from MetaMask/gulp1kumavis2017-01-113-39/+83
|\ \ | | | | | | Gulp - clean and add "disc" analysis task
| * \ Merge branch 'dev' into gulp1Dan Finlay2017-01-115-21/+10
| |\ \ | |/ / |/| |
* | | Merge pull request #986 from MetaMask/i947-BrowserSolidityErrorkumavis2017-01-112-15/+3
|\ \ \ | | | | | | | | Fix browser solidity error
| * | | 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
|\ \ \ | |_|/ |/| | deps - replace promise-request with fetch
| * | 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.
| * quick typo fix.Kevin Serrano2017-01-071-2/+2
|/
* Merge pull request #970 from MetaMask/network-indicator-refactorDan Finlay2017-01-065-16/+24
|\ | | | | Network indicator modifications
| * Merge branch 'dev' into network-indicator-refactorKevin Serrano2017-01-067-45/+188
| |\ | |/ |/|
* | Merge pull request #971 from MetaMask/TearDownOnDisconnectkumavis2017-01-062-11/+8
|\ \ | | | | | | MetaMask Controller - Convert to EventEmitter
| * \ Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-064-31/+34
| |\ \ | |/ / |/| |
* | | Merge pull request #967 from MetaMask/fixTxManagerDan Finlay2017-01-064-32/+34
|\ \ \ | | | | | | | | Fix tx manager
| * \ \ 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | TxManager
| | | * \ \ Merge pull request #958 from MetaMask/i897-ReplayProtectionKevin Serrano2017-01-0415-70/+328
| | | |\ \ \ | | | | | | | | | | | | | | Add replay protection
| | | | * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #897 Needs tests.
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Always query latest block for balance & nonce
| * | | | | | Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic.
| * | | | | | 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
|\ \ \ \ | | | | | | | | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 17:00:33 +0800