aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB...kumavis2018-10-261-1/+1
|\
| * Merge pull request #5555 from MetaMask/support-wallet-watch-assetkumavis2018-10-211-1/+1
| |\
| | * add support for wallet_watchAssetEsteban MIno2018-10-201-1/+1
* | | tx-gas-util - set error message when invalidating tx based on tx data but no ...kumavis2018-10-211-4/+5
* | | Merge branch 'develop' into developkumavis2018-10-213-27/+98
|\| |
| * | specific add and remove methods for frequentRpcList (#5554)Esteban MiƱo2018-10-201-26/+25
| |/
| * Adds toggle for primary currency (#5421)Alexander Tseung2018-10-171-0/+30
| * Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-162-1/+39
| * Ensure that new transactions added are using the selected addressWhymarrh Whitby2018-10-111-0/+4
| * Revert "transactions - add txReceipt to the txMeta body for confirmed txs (#5...Whymarrh Whitby2018-10-111-23/+1
| * transactions - add txReceipt to the txMeta body for confirmed txs (#5375)Frankie2018-10-101-1/+23
* | tx-gas-utils - improve format + commentskumavis2018-10-101-12/+18
* | ganache-core merged my PR, so I changed some comments to clarify that ganache...Howard Braham2018-10-101-5/+6
* | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-101-7/+16
|/
* Merge pull request #5458 from MetaMask/provider-subsBruno Barbieri2018-10-103-8/+10
|\
| * provider - network - restore block-ref-rewrite middleware referenceskumavis2018-10-092-4/+4
| * provider - enable subscription support (newHeads, logs)kumavis2018-10-081-4/+6
* | Fix updating of pending transactionsDan Finlay2018-10-061-0/+1
|/
* Add ability to whitelist a blacklisted domain at runtimeWhymarrh Whitby2018-10-021-0/+22
* support editable customRPC (#5267)HackyMiner2018-09-291-7/+6
* Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-251-2/+3
|\
| * Switch existing modals from using Notification to Modal. Remove Notification ...Alexander Tseung2018-09-201-2/+3
* | Adds getPendingNonce method to provider initialization options in metamask-co...Dan Miller2018-09-221-1/+1
|/
* Delete ConfigManager, replacing its usages with PreferencesControllerWhymarrh Whitby2018-09-121-0/+18
* Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-112-2/+59
|\
| * Add createCancelTransaction methodAlexander Tseung2018-09-112-2/+59
* | Attach the RPC error value to txMetaWhymarrh Whitby2018-09-091-0/+1
|/
* fix conflictsEsteban MIno2018-08-291-2/+2
|\
| * updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-231-1/+1
| * implemented improvements to RPC historyEvgeniy Filatov2018-08-231-1/+1
* | watchAsset small changesEsteban MIno2018-08-281-1/+1
* | typo watchAsset imageUrl to imageEsteban MIno2018-08-241-6/+6
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-221-1/+1
|\|
| * bugfix - prevents old blocktracker from getting internal hooks migratedkumavis2018-08-221-1/+1
* | returning error in watchAssetEsteban MIno2018-08-221-4/+12
* | refactor watchToken related functionsEsteban MIno2018-08-211-37/+36
* | watchAsset returns result wether token was added or notEsteban MIno2018-08-211-7/+9
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2112-188/+285
|\|
| * Merge branch 'develop' into network-remove-provider-engineThomas2018-08-152-17/+79
| |\
| * \ Merge branch 'network-remove-provider-engine' into network-remove-provider-en...frankiebee2018-08-071-1/+1
| |\ \
| | * | network - fix blockTracker reference to return the blockTrackerProxy instead ...frankiebee2018-08-071-1/+1
| * | | Merge branch 'develop' into network-remove-provider-engine-testsThomas Huang2018-08-021-7/+3
| |\ \ \
| * \ \ \ Merge branch 'develop' into network-remove-provider-engineThomas2018-07-265-14/+162
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-045-7/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-07-036-21/+36
| |\ \ \ \ \
| * | | | | | lint - fix lint for networkkumavis2018-06-133-3/+0
| * | | | | | network - import createBlockTrackerInspectorMiddleware and rearrange cache mi...kumavis2018-06-133-37/+4
| * | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
| * | | | | | lint - controllers - whitepace fixkumavis2018-06-121-5/+5
| * | | | | | network - provider - infura - use block-reemit middlewarekumavis2018-06-081-2/+2
| * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-074-1/+44
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-06-074-13/+113
| |\ \ \ \ \ \ \
| * | | | | | | | controllers - transactions - fix tx status update on bootkumavis2018-05-292-2/+13
| * | | | | | | | controllers - transactions - fix tx confirmationkumavis2018-05-292-3/+3
| * | | | | | | | controllers - transaction - pending-tx-tracker - lint fixkumavis2018-05-291-1/+1
| * | | | | | | | controllers - transactions - merge @frankiebee's work with minekumavis2018-05-293-96/+55
| * | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until bloc...kumavis2018-05-261-1/+10
| * | | | | | | | tx-gas-utils - query for block without tx bodieskumavis2018-05-261-2/+2
| * | | | | | | | controllers - recent-blocks - guard against empty blockkumavis2018-05-251-3/+3
| * | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catchkumavis2018-05-241-1/+7
| * | | | | | | | Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask...kumavis2018-05-242-9/+24
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #4347 from MetaMask/transactions-use-new-block-trackerkumavis2018-05-242-9/+24
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...frankiebee2018-05-234-53/+41
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | transactions - update pending-tx-tracker to use the new block trackerfrankiebee2018-05-231-7/+18
| | | * | | | | | | | | remove dependance on the even tx:confirmedfrankiebee2018-05-231-2/+6
| * | | | | | | | | | | controllers - recent-blocks - ensure full blockskumavis2018-05-241-2/+2
| |/ / / / / / / / / /
| * | / / / / / / / / controllers - recent-blocks - doc updatekumavis2018-05-241-4/+4
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-231-15/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-233-38/+34
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | recent-blocks - fix backfill blockNumber trackingkumavis2018-05-171-3/+2
| * | | | | | | | | | controllers - recent-blocks - fix pifyd setTimeout argskumavis2018-05-171-1/+1
| * | | | | | | | | | deps - fix incorrect dep paths and versionskumavis2018-05-174-4/+4
| * | | | | | | | | | controllers - balance - update for eth-block-tracker@4kumavis2018-05-171-3/+3
| * | | | | | | | | | recent-blocks - update for eth-block-tracker@4kumavis2018-05-171-27/+14
| * | | | | | | | | | remove unused events-proxy, was replaced with module swappable-obj-proxykumavis2018-05-171-1/+0
| * | | | | | | | | | lint fixkumavis2018-05-175-13/+18
| * | | | | | | | | | network - create provider and block-tracker via json-rpc-enginekumavis2018-05-177-67/+213
* | | | | | | | | | | delete according image when token added with watchToken deletedEsteban MIno2018-08-171-13/+14
* | | | | | | | | | | correct behavior when notification is closed when popupEsteban MIno2018-08-171-1/+1
* | | | | | | | | | | show watch asset image from hide token modalEsteban MIno2018-08-161-1/+1
* | | | | | | | | | | change watchAsset to new spec for type ERC20Esteban MIno2018-08-161-15/+27
* | | | | | | | | | | add suggested tokens objects in metamask stateEsteban MIno2018-08-161-6/+16
* | | | | | | | | | | watchToken to watchAssetEsteban MIno2018-08-151-1/+1
* | | | | | | | | | | add support for images base64 and urls on new uiEsteban MIno2018-08-151-6/+7
* | | | | | | | | | | update method to metamask_watchTokenEsteban MIno2018-08-151-1/+1
* | | | | | | | | | | refactor unused codeEsteban MIno2018-08-081-2/+4
* | | | | | | | | | | fix mergeEsteban MIno2018-08-081-0/+1
* | | | | | | | | | | Merge branch 'develop' into WatchTokenFeatureEsteban MiƱo2018-08-082-17/+79
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | fix doc tagEsteban MIno2018-08-011-1/+1
| * | | | | | | | | | tokens related functions refactorEsteban MIno2018-08-011-15/+22
| * | | | | | | | | | fix undefined for tokens on testsEsteban MIno2018-08-011-1/+3
| * | | | | | | | | | fix double state update when account changedEsteban MIno2018-07-311-5/+3
| * | | | | | | | | | create tokens storage when setadressesEsteban MIno2018-07-311-2/+4
| * | | | | | | | | | isolation of tokens related methods in preferencesEsteban MIno2018-07-311-43/+42
| * | | | | | | | | | Merge branch 'develop' into TokensPerAccountBasisEsteban MiƱo2018-07-281-7/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | refactor to accountTokensEsteban MIno2018-07-281-53/+47
| * | | | | | | | | | add & delete tokens per networkEsteban MIno2018-07-271-10/+8
| * | | | | | | | | | tokens per network for individual accountEsteban MIno2018-07-271-15/+51
| * | | | | | | | | | preferences test fixes for tokens per accountEsteban MIno2018-07-261-9/+16
| * | | | | | | | | | add & delete tokens per accountEsteban MIno2018-07-262-8/+27
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | add suggested token params validationEsteban MIno2018-08-071-4/+25
* | | | | | | | | | eth_watchToken workingEsteban MIno2018-08-041-0/+7
* | | | | | | | | | rpc-engine not crashing when eth_watchTokenEsteban MIno2018-08-041-5/+4
* | | | | | | | | | merge developEsteban MIno2018-08-0412-35/+182
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #4871 from MetaMask/3519-new-contract-gasFrankie2018-07-261-7/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | tx-gas-utils - catch all errors from gas estimationJenny Pollack2018-07-251-7/+3
| * | | | | | | | | network.js: convert rpc protocol to lower case (#4855)pinkiebell2018-07-251-0/+3
| |/ / / / / / / /
| * | | | | | | | run linterbrunobar792018-07-221-1/+1
| * | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MiƱo2018-07-215-15/+37
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Auto-detect tokens #3034 (#4683)Esteban MiƱo2018-07-211-0/+123
| | * | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-141-13/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge pull request #4669 from MetaMask/removeNonceTrackerFunctionThomas Huang2018-07-131-13/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'develop' into removeNonceTrackerFunctionThomas2018-07-118-14/+14
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | |
| | | | * | | | | | | | Remove unsued nonce tracker functiontmashuang2018-06-261-13/+0
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-132-1/+8
| | |\| | | | | | | |
| | | * | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-121-1/+2
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-071-10/+12
| | | | * | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-071-1/+1
| | | | * | | | | | | | Display newest transactionAlexander Tseung2018-07-071-1/+1
| | | | * | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-072-13/+12
| | | | | |/ / / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...frankiebee2018-07-118-14/+14
| | | |\| | | | | | |
| | | * | | | | | | | trandsactions - remove rejected transactions from historyfrankiebee2018-06-261-0/+6
| | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | account removal is workingbrunobar792018-07-111-0/+24
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | fix detection on submit passwordEsteban MIno2018-07-211-5/+8
| * | | | | | | | keyring unlocked detect and unit testsEsteban MIno2018-07-201-12/+16
| * | | | | | | | detect tokens when submit password and new account selectedEsteban MIno2018-07-201-13/+39
| * | | | | | | | detect tokens through infuraEsteban MIno2018-07-131-21/+24
| * | | | | | | | improve testsEsteban MIno2018-07-121-16/+13
| * | | | | | | | Merge branch 'develop' into detectTokenFeatureEsteban MIno2018-07-048-14/+14
| |\| | | | | | |
| | * | | | | | | eslint --fix .brunobar792018-07-038-14/+14
| | |/ / / / / /
| * | | | | | | passtest-lintEsteban MIno2018-07-041-6/+0
| * | | | | | | tests for specEsteban MIno2018-06-281-1/+1
| * | | | | | | network store to detect tokenEsteban MIno2018-06-281-8/+10
| * | | | | | | detect tokens pollingEsteban MIno2018-06-281-0/+97
| |/ / / / / /
* | | | | | | Improved rpc-engine usageDan Finlay2018-06-191-5/+1
* | | | | | | Get popup appearing when suggesting new tokenDan Finlay2018-06-191-1/+3
* | | | | | | Begin letting UI show suggested tokensDan Finlay2018-06-191-6/+24
* | | | | | | Begin adding eth_watchTokenDan Finlay2018-06-191-0/+25
|/ / / / / /
* | | | | | lint - fix recipient-blacklist.jskumavis2018-06-161-13/+13
* | | | | | blacklist - recipient blacklist as js for inline commentskumavis2018-06-162-2/+2
* | | | | | Update recipient-blacklist-config.jsonkumavis2018-06-161-0/+2
* | | | | | Add apparent phishing address to block listDan Finlay2018-06-151-0/+1
* | | | | | controllers - transaction - prefer log over consolekumavis2018-06-131-2/+2
* | | | | | metamask - ensure all nonce locks are releasedkumavis2018-06-133-5/+10
* | | | | | nonce-tracker - wrap nonce calculations in try-catch and release lock on errorkumavis2018-06-131-22/+28
* | | | | | Fix bug where reset account would not work.Dan Finlay2018-06-071-2/+9
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #4414 from scsaba/recipient-blacklistkumavis2018-06-073-1/+43
|\ \ \ \ \
| * | | | | remove generating blocked accounts and use a config file insteadCsaba Solya2018-05-313-18/+20
| * | | | | fix documentationCsaba Solya2018-05-301-1/+1
| * | | | | adding tests for recipient blacklist checkerCsaba Solya2018-05-302-5/+5
| * | | | | adding transaction controller testsCsaba Solya2018-05-301-1/+1
| * | | | | initial implementationCsaba Solya2018-05-302-1/+41
* | | | | | Add account type assertion to PreferencesController#setAccountLabelWhymarrh Whitby2018-06-061-0/+1
| |_|_|_|/ |/| | | |
* | | | | diagnostics - rewrite bug-notifier as diagnostics-reporterkumavis2018-06-061-15/+4
* | | | | Record identity before deleting itDan Finlay2018-06-051-1/+1
* | | | | Mock notifier in testDan Finlay2018-06-051-1/+2
* | | | | Add commentDan Finlay2018-06-051-0/+2
* | | | | Do not alert to userDan Finlay2018-06-051-5/+0
* | | | | LintedDan Finlay2018-06-051-0/+1
* | | | | Add bug info under metadata keyDan Finlay2018-06-051-1/+7
* | | | | Add first time info to bug reportDan Finlay2018-06-051-1/+4
* | | | | Add version to reportDan Finlay2018-06-051-3/+3
* | | | | Fine tune error postingDan Finlay2018-06-051-1/+1
* | | | | Only notify first time lost ids are detectedDan Finlay2018-06-051-2/+8
* | | | | Add reporting uriDan Finlay2018-06-051-1/+1
* | | | | Begin adding unconfigured notifierDan Finlay2018-06-051-4/+17
* | | | | Persist lost identities to storage for later analysisDan Finlay2018-06-051-2/+4
* | | | | Add minimal user notification of issue.Dan Finlay2018-06-051-1/+1
* | | | | Add identity synchronizing codeDan Finlay2018-06-051-0/+31
* | | | | preferences controller - jsdoc fixkumavis2018-06-041-2/+2
* | | | | metamask - update preferences controller identities on keyring controller updatekumavis2018-06-041-3/+28
* | | | | Version 4.7.1v4.7.1Dan Finlay2018-06-021-0/+17
|/ / / /
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-ma...kumavis2018-05-302-10/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | cleanErrorStack moved to separate library moduleAnton2018-05-291-12/+4
| * | | error message fixAnton2018-05-291-2/+1
| * | | Clean up user rejection error messageAnton2018-05-281-3/+14
| * | | Merge pull request #4140 from MetaMask/v4.6.1Thomas Huang2018-05-011-1/+5
| |\ \ \
| * | | | require logfrankiebee2018-05-011-0/+1
| * | | | log emitter errorsfrankiebee2018-04-301-6/+10
| * | | | transactions - run event emitters outside context of _setTxStatusfrankiebee2018-04-301-7/+9
* | | | | controllers - recent-blocks - pull first historical blocks in parallelkumavis2018-05-221-15/+7
| |_|_|/ |/| | |
* | | | Reveal get filtered tx list (#4332)Frankie2018-05-221-15/+0
* | | | Add PreferencesController#setAddresses to update idsWhymarrh Whitby2018-05-171-0/+10
* | | | Update AddressBookController to read from preferences storeWhymarrh Whitby2018-05-171-21/+6
* | | | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-171-2/+18
| |_|/ |/| |
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-...kumavis2018-05-173-140/+43
|\ \ \
| * | | network - remove debugging console.logkumavis2018-05-171-1/+0
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-172-1/+16
| |\ \ \
| * | | | lint - cleanup some unused variableskumavis2018-05-031-1/+0
| * | | | controllers - network - move default config out of first-time-statekumavis2018-05-031-2/+15
| * | | | network - refactor to remove unnecesary codekumavis2018-05-013-124/+29
| * | | | network - remove setNetworkEndpointskumavis2018-05-011-13/+0
| * | | | controllers - network - more semantic assertkumavis2018-05-011-1/+1
| | |_|/ | |/| |
* | | | tx-state-history-helper - use more readable Date.now methodkumavis2018-05-171-1/+1
* | | | fix lint issuesCsaba Solya2018-05-102-2/+2
* | | | remove unnecessary libCsaba Solya2018-05-101-1/+0
* | | | revert unnecessary change in state managerCsaba Solya2018-05-101-13/+7
* | | | add time stamps to transaction history log entriesCsaba Solya2018-05-102-16/+28
| |/ / |/| |
* | | Fix documentation typobitpshr2018-05-081-1/+1
* | | transactions - add a nonce check utility for ui usefrankiebee2018-05-021-0/+15
* | | fix - getTxsByMetaData check if the key is in the object not if the value is ...frankiebee2018-05-021-1/+1
|/ /
* | Merge pull request #4110 from MetaMask/masterkumavis2018-04-288-144/+1402
|\|
| * Merge pull request #4095 from MetaMask/v4.6.0v4.6.0Thomas Huang2018-04-272-2/+2
| |\
| * \ Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3kumavis2018-04-268-144/+1402
| |\ \
| | * | transactions - more docs and clean upsfrankiebee2018-04-266-55/+116
| | * | Cleaned up some typos and JSDocs in TransactionsDan Finlay2018-04-243-38/+40
| | * | transactions - fix referncesfrankiebee2018-04-202-1/+2
| | * | Merge branch 'master' into tx-controller-rewrite-v3frankiebee2018-04-2010-17/+398
| | |\ \
| | * | | meta - transactions - docs yo!frankiebee2018-04-208-73/+351
| | * | | fix up - more docsfrankiebee2018-04-143-38/+77
| | * | | meta - transactions - code clean up and jsDocfrankiebee2018-04-141-41/+109
| | * | | transactions - code cleanupfrankiebee2018-04-132-58/+59
| | * | | transactions - lint fixesfrankiebee2018-04-113-12/+12
| | * | | meta - transactions - create a transactions dir in controller and move releva...frankiebee2018-04-117-61/+869
* | | | | Return 0 for token rate fetch failuresbitpshr2018-04-271-1/+5
| |_|_|/ |/| | |
* | | | rpc - bump provider-engine + eth-json-rpc-filterskumavis2018-04-261-1/+1
* | | | Merge pull request #4069 from MetaMask/i4056-LatestPriceApiDan Finlay2018-04-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Use latest balanc3 api for pricesDan Finlay2018-04-251-1/+1
* | | | Merge branch 'master' into dm-docs-2Dan2018-04-246-17/+186
|\| | |
| * | | Use the metamask balanc3 dev price apiDan Finlay2018-04-241-1/+1
| * | | Clean up network configAlexander Tseung2018-04-244-12/+138
| * | | Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshrDan Finlay2018-04-212-4/+47
| |\ \ \ | | |_|/ | |/| |
| | * | Clean up JSDoc for background scriptsbitpshr2018-04-201-2/+10
| | * | Add more documentation to computed balances controllerbitpshr2018-04-201-1/+36
| | * | Add generated docsbitpshr2018-04-191-3/+3
* | | | Fix nits.Dan2018-04-241-1/+1
* | | | Minor fixes in a number of docs.Dan2018-04-211-2/+2
* | | | Merge branch 'master' into dm-docs-2Dan2018-04-208-136/+219
|\| | |
| * | | Missing bracket in docblock.Dan2018-04-191-1/+1
| * | | Merge branch 'master' into dm-docs-1Dan2018-04-198-0/+84
| |\| |
| | * | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-177-0/+7
| | |\ \
| | | * | Require loglevel singleton in each module that uses itbitpshr2018-04-147-0/+7
| | | |/
| | * | Disable token price polling when no client is activebitpshr2018-04-171-0/+1
| | * | Maintain token prices using a background servicebitpshr2018-04-161-0/+76
| | |/
| * | NO MIXED TABS AND SPACESDan2018-04-193-137/+137
| * | Documentation fix: @constant -> @propertyDan2018-04-191-1/+1
* | | Even more documentation for various controllers and libs.Dan2018-04-194-9/+171
|/ /
* | Improve documentation of promises that return undefined.Dan2018-04-172-4/+4
* | Typo fixes, type fixes on the return clauses of the buyEthUrl and getPreffere...Dan2018-04-174-4/+4
* | Spell deprecated correctly.Dan2018-04-171-2/+2
* | @params -> @param fixDan2018-04-172-6/+6
* | Documentation for various controllers and libsDan2018-04-174-16/+313
|/
* transactions - _normalizeTxParams will now return a new object for txParamsfrankiebee2018-04-061-31/+18
* transactions - remove unnecessary keys on txParamsfrankiebee2018-04-051-0/+12
* transactions - make #_validateTxParams not async and "linting" wink wink nudg...frankiebee2018-04-051-7/+12
* transactions - normalize txParamsfrankiebee2018-04-051-2/+52
* app - currency - fix typo + prefer log over consolekumavis2018-04-041-2/+3
* app - currency - fix typokumavis2018-04-041-1/+1
* app - warn on fetch errors instead of spamming sentrykumavis2018-04-044-32/+28
* transactions gasLimit - use the block gasLimit if getCode failsfrankiebee2018-04-031-2/+3