aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into localStorage-clean-upFrankie2018-02-013-0/+23
|\
| * preserve other networks TXsBruno Barbieri2018-02-011-3/+4
| * use txMeta.txParamsBruno Barbieri2018-01-311-1/+1
| * wipe only transactions for current accountBruno Barbieri2018-01-313-9/+15
| * clean upBruno Barbieri2018-01-311-3/+3
| * added reset account featureBruno Barbieri2018-01-313-0/+16
* | remove RecentBlocks from diskfrankiebee2018-02-012-3/+2
* | creater migration to remove BlacklistControllerfrankiebee2018-01-311-0/+33
* | remove BlacklistController from disk statefrankiebee2018-01-312-6/+2
|/
* Version 3.13.8v3.13.8Dan Finlay2018-01-301-1/+1
* Bump limit for event emitter warning.Kevin Serrano2018-01-261-0/+2
* Merge remote-tracking branch 'origin/master' into Version-3.13.7Dan Finlay2018-01-232-1/+13
|\
| * sentry - report failed txskumavis2018-01-232-1/+13
* | Version 3.13.7Dan Finlay2018-01-231-1/+1
|/
* Merge pull request #3016 from MetaMask/sentryDan Finlay2018-01-194-0/+37
|\
| * sentry - dedupe raven vendorkumavis2018-01-182-5/+2
| * sentry - breakout raven setup and add release configkumavis2018-01-183-9/+35
| * sentry - update raven and add to uikumavis2018-01-184-7/+13
| * sentry - add raven + sentry reporting configkumavis2018-01-182-0/+8
* | test - tx controller - fix txGasUtil referencekumavis2018-01-181-1/+2
* | Update transactions.jskumavis2018-01-181-1/+1
* | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
* | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
* | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ...frankiebee2018-01-181-2/+20
|/
* Version 3.13.5v3.13.5Dan Finlay2018-01-171-1/+1
* Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
* Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-171-2/+6
|\
| * Merge branch 'master' into open-popupFrankie2018-01-163-13/+79
| |\
| * | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
* | | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-162-11/+74
|\ \ \ | | |/ | |/|
| * | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-162-11/+74
| |\ \
| | * | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| | * | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-122-9/+76
| | |/
* | / Set gas limit to 21k for recipients with no codeDan Finlay2018-01-161-5/+22
|/ /
* | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-161-2/+5
|\ \ | |/ |/|
| * Merge branch 'master' into infura-rest-apikumavis2018-01-122-3/+10
| |\
| * | provider - infura - use infura REST apikumavis2018-01-091-2/+5
| * | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
* | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
| |/ |/|
* | Version 3.13.4v3.13.4Dan Finlay2018-01-101-1/+1
* | Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
* | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
* | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
|/
* Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-091-0/+11
|\
| * Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-093-2/+28
| |\
| * | Account for 0x/empty string address and contract creationThomas2018-01-081-0/+11
* | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-091-4/+9
|\ \ \ | |_|/ |/| |
| * | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-041-4/+9
* | | Fix feature to workDan Finlay2018-01-062-3/+11
* | | LintedDan Finlay2018-01-061-3/+0
* | | Derive gas price estimate from previous transactionsDan Finlay2018-01-063-2/+23
| |/ |/|
* | Merge pull request #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-031-2/+9
|\ \ | |/ |/|
| * tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| * Merge branch 'master' into tx-param-vaalidationFrankie2017-12-223-18/+73
| |\
| * | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
* | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-291-1/+2
|\ \ \
| * | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
* | | | Fix some silly linting issues.Kevin Serrano2017-12-282-2/+2
|/ / /
* | | Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
* | | Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
| |/ |/|
* | Merge pull request #2763 from MetaMask/AddRecentBlocksControllerThomas Huang2017-12-212-14/+69
|\ \
| * | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| * | Add Recent Blocks controllerDan Finlay2017-12-182-14/+62
* | | Allow updating token detailsDan Finlay2017-12-191-4/+4
| |/ |/|
* | Merge branch 'master' into i#2720frankiebee2017-12-161-1/+1
|\|
| * Change console.log for opts in _configureInfuraProviderThomas Huang2017-12-161-1/+1
* | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
|/
* Merge pull request #2747 from MetaMask/Version-3.13.3Thomas Huang2017-12-151-1/+1
|\
| * Version 3.13.3v3.13.3Dan Finlay2017-12-151-1/+1
* | Merge pull request #2662 from williamchong007/masterThomas Huang2017-12-151-2/+10
|\ \ | |/ |/|
| * fix #1398, prevent injecting xml without xml suffixWilliam Chong2017-12-051-2/+10
* | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-141-7/+50
* | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-141-50/+7
* | Merge pull request #2741 from MetaMask/infura-block-trackerFrankie2017-12-141-7/+50
|\ \
| * | network - for infura networks use the infura block tracker providerkumavis2017-12-141-7/+50
* | | dont aggresively query account datafrankiebee2017-12-141-2/+0
|/ /
* | Version 3.13.2v3.13.2Dan Finlay2017-12-101-1/+1
* | Pass polling interval to zero client providerDan Finlay2017-12-101-1/+5
* | tx-controller - failed state is a finished statekumavis2017-12-082-7/+9
* | Version 3.13.1Dan Finlay2017-12-081-1/+1
* | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
* | Merge branch 'master' into patch-2Dan Finlay2017-12-084-1/+21
|\ \
| * | Version 3.13.0Dan Finlay2017-12-071-1/+1
| * | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+4
| * | Fix retry actionDan Finlay2017-12-071-1/+9
| * | Add retry background method and actionDan Finlay2017-12-073-0/+9
* | | A more expressive wayvicnaum2017-12-071-5/+2
* | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
|/ /
* | firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in...Dan2017-12-071-1/+1
* | Correct note for updateTx after block-update event in transaction.jsDan2017-12-071-1/+1
* | Fix undefined latestBlockNumber in _resubmitTxDan2017-12-071-1/+1
* | Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-062-2/+20
|/
* Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1Thomas Huang2017-11-305-17/+85
|\
| * Bump version to 3.12.1Dan Finlay2017-11-301-1/+1
| * Fix migration commentDan Finlay2017-11-301-2/+3
| * Migrate old data to include firstVersion infoDan Finlay2017-11-292-0/+41
| * LintedDan Finlay2017-11-292-2/+2
| * Add seed phrase bounty award noticeDan Finlay2017-11-291-1/+0
| * Get notice version filtering working nicelyDan Finlay2017-11-292-24/+28
| * Add firstVersion field to notices selectorDan Finlay2017-11-292-1/+5
| * Add optional version field to noticesDan Finlay2017-11-292-1/+20
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fixkumavis2017-11-301-1/+1
|\|
| * Merge pull request #2441 from MetaMask/kumavis-patch-3Dan Finlay2017-11-281-1/+1
| |\
| | * network controller - warn via log.warnkumavis2017-11-281-1/+1
| | * Update network.jskumavis2017-10-241-1/+1
* | | deps - obs-store@3 + migrate stream plumbingkumavis2017-11-293-6/+10
|/ /
* | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
* | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
* | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3ErrorThomas Huang2017-11-211-0/+7
|\ \
| * | Add useful error when duplicate web3 is detected.Dan Finlay2017-11-011-0/+7
* | | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-062-2/+2
|/ /
* | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
|\ \
| * | Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
* | | Resolve merge conflictsKevin Serrano2017-10-2720-64/+209
|\ \ \
| * | | 3.12.0v3.12.0kumavis2017-10-261-1/+1
| * | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
| * | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2513-31/+30
| |\ \ \
| | * | | Fix lint warningsDaijiro Wachi2017-10-2213-31/+30
| * | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-241-0/+76
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add ShapeShift UIChi Kei Chan2017-10-211-0/+76
| | |/ /
| * | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| * | | Version 3.11.2v3.11.2Dan Finlay2017-10-221-1/+1
| |/ /
| * | Version 3.11.1v3.11.1Dan Finlay2017-10-211-1/+1
| * | LintedDan Finlay2017-10-202-2/+1
| * | Fix bug where new account was not immediately selectedDan Finlay2017-10-201-3/+14
| * | Allow computed balances to enumerate its own viewDan Finlay2017-10-201-2/+3
| * | Remove account-tracker from keyringControllerDan Finlay2017-10-191-1/+0
| * | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-196-90/+72
| |\ \
| | * | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-196-90/+72
| * | | Make account tracking much more reactiveDan Finlay2017-10-192-12/+13
| * | | Make account tracking more reactiveDan Finlay2017-10-193-29/+33
| * | | Refresh computed balances controller when restoring vaultDan Finlay2017-10-192-1/+6
| * | | Add validation to balance constructorDan Finlay2017-10-191-0/+10
| * | | Stop tracking old account balances after restore vaultDan Finlay2017-10-191-0/+13
| * | | Promisify metamask-controller vault creating methodsDan Finlay2017-10-181-17/+10
| * | | Select first account when restoring seedDan Finlay2017-10-181-3/+17
| * | | Select first account on new vault creationDan Finlay2017-10-181-1/+12
| |/ /
| * | contentscript - fix inpage require and bundlingkumavis2017-10-131-4/+4
| * | Break up inpage file read into multiple linesDan Finlay2017-10-131-1/+3
| * | Merge branch 'master' into i1340-SynchronousInjectionDan Finlay2017-10-1312-80/+317
| |\ \
| | * \ Merge pull request #2345 from MetaMask/Version-3.11.0Thomas Huang2017-10-131-1/+1
| | |\ \
| | | * | Version 3.11.0v3.11.0Dan Finlay2017-10-121-1/+1
| | * | | nonce-tracker - use blockTracker directlykumavis2017-10-122-7/+4
| | * | | network-controller - use obj-proxy for providerProxykumavis2017-10-111-3/+4
| | * | | util - add obj-proxykumavis2017-10-111-0/+19
| | * | | events-proxy - clean upkumavis2017-10-111-5/+5
| | * | | lint fixeskumavis2017-10-112-8/+3
| | * | | network controller - refactor to use eth-rpc-clientkumavis2017-10-112-29/+34
| | * | | metamask controller - define this.newTransaction to ease instantiation orderkumavis2017-10-111-1/+6
| | * | | metamask controller - simplify provider initkumavis2017-10-111-22/+16
| | * | | metamask controller - breakout getAccounts methodkumavis2017-10-111-12/+14
| | |/ /
| * | / Begin implementing sync injection ideaDan Finlay2017-10-051-2/+1
| | |/ | |/|
* | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-107-4/+221
|\ \ \ | | |/ | |/|
| * | Merge pull request #2223 from ukstv/masterDan Finlay2017-10-103-1/+182
| |\ \
| | * | Validate data format for eth_signTypedDataSergey Ukustov2017-10-071-0/+4
| | * | Merge branch 'master' into SignTypedDataDan Finlay2017-10-073-1/+29
| | |\ \
| | * \ \ Merge branch 'Version-3.10.9' into SignTypedDataDan Finlay2017-10-061-1/+1
| | |\ \ \
| | * \ \ \ Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-4/+6
| | |\ \ \ \
| | * | | | | Add signTypedData input validationsDan Finlay2017-10-062-4/+20
| | * | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-6/+7
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-039-80/+83
| | |\ \ \ \ \
| | * | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-303-1/+162
| * | | | | | | Merge pull request #2305 from MetaMask/nodeifyFrankie2017-10-071-2/+10
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | lint fix - nodeifykumavis2017-10-071-1/+1
| | * | | | | | nodeify - allow callback to be optionalkumavis2017-10-071-2/+10
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInitkumavis2017-10-071-0/+1
| |\ \ \ \ \ \
| | * | | | | | Check status of pending transactions on startupDan Finlay2017-10-071-0/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | When checking pending txs, check for successful txs with same nonce.Dan Finlay2017-10-071-0/+20
| * | | | | | Provide method for tx tracker to refer to all txsDan Finlay2017-10-072-1/+8
| |/ / / / /
* | | | | | Make the function callback friendly.Kevin Serrano2017-10-101-4/+4
* | | | | | Simplify try catchKevin Serrano2017-10-061-4/+2
* | | | | | Catch an error if this is not defined.Kevin Serrano2017-10-061-1/+8
* | | | | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-063-5/+7
|\| | | | |
| * | | | | Version 3.10.9v3.10.9Dan Finlay2017-10-061-1/+1
| | |_|_|/ | |/| | |
| * | | | "fix" hours for messagefrankiebee2017-10-061-1/+2
| * | | | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-062-4/+5
| |/ / /
* | | | Configured for callback-required function.'Kevin Serrano2017-10-051-2/+2
* | | | Include OS versionKevin Serrano2017-10-051-0/+4
|/ / /
* | | Merge pull request #2250 from interfect/masterFrankie2017-10-041-1/+0
|\ \ \
| * | | Don't pass origin as an HTTP headerAdam Novak2017-10-021-1/+0
* | | | pending tx tracker - on tx:warn append error message instead of error objkumavis2017-10-031-1/+1
* | | | pending tx tracker - tx:warning event includes err objkumavis2017-10-031-2/+2
* | | | pending tx tracker - resubmit - warn dont error on unknown errorkumavis2017-10-031-2/+5
* | | | pending tx tracker - dont throw on load failurekumavis2017-10-031-1/+0
| |_|/ |/| |
* | | Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into h...kumavis2017-10-032-2/+4
|\ \ \
| * \ \ Merge branch 'master' into history-notesfrankiebee2017-10-032-2/+4
| |\ \ \
| | * | | tx state history - fix bug where initial snapshot was mutated on updateTxkumavis2017-10-032-2/+3
| | * | | Merge pull request #2138 from sunify/fix-firefox-corsThomas Huang2017-10-031-1/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Update manifest.jsonKevin Serrano2017-10-031-2/+1
| | | * | Wildcard for infura.io permissions, added permission for cryptonator apiAlex Lunyov2017-09-221-4/+2
| | | * | Fix CORS issues in FireFoxAlex Lunyov2017-09-211-1/+5
* | | | | tx state history - append note to first op of diffkumavis2017-10-031-2/+5
|/ / / /
* / / / transaction - provide notes for historyfrankiebee2017-10-032-12/+14
|/ / /
* | | Version 3.10.8 - Fix Currency Conversionv3.10.8Dan Finlay2017-09-302-2/+2
* | | Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactionskumavis2017-09-303-26/+1
|\ \ \
| * | | pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-303-26/+1
* | | | Merge pull request #2239 from MetaMask/network-controller-contdFrankie2017-09-301-2/+3
|\ \ \ \
| * | | | network - make network controller internal network switching explicitkumavis2017-09-301-2/+3
* | | | | Merge pull request #2237 from MetaMask/network-controller-contdFrankie2017-09-303-36/+47
|\| | | |
| * | | | network - convert localhost from custom rpc to network typekumavis2017-09-303-7/+3
| * | | | network controller - small refactorkumavis2017-09-302-35/+50
| |/ / /
* / / / Version 3.10.7v3.10.7Dan Finlay2017-09-301-1/+1
|/ / /
* | / Ensure selected account is always set if possibleDan Finlay2017-09-301-0/+9
| |/ |/|
* | Merge pull request #2124 from MetaMask/breakout-mascarakumavis2017-09-281-1/+0
|\ \
| * | re-enabled x-metamask-origin for mascarafrankiebee2017-09-282-5/+1
| * | platforms: put context for extension in platform extension classfrankiebee2017-09-223-2/+4
| * | Merge branch 'master' into breakout-mascarafrankiebee2017-09-202-4/+10
| |\|
| * | add context to platform to not have X-Metamask-Origin in mascarafrankiebee2017-09-202-1/+2
* | | Merge branch 'master' into new-currency-testkumavis2017-09-2818-1114/+746
|\ \ \
| * \ \ Merge pull request #2194 from MetaMask/network-controller-refactorkumavis2017-09-282-33/+34
| |\ \ \
| | * | | network controller - move _setProvider to bottomkumavis2017-09-281-18/+18
| | * | | network controller - refactor to use _setProviderkumavis2017-09-281-17/+28
| | * | | network - remove getter/setterkumavis2017-09-281-23/+14
| | * | | metamask - improve commentkumavis2017-09-281-2/+1
| * | | | Version 3.10.6Dan Finlay2017-09-281-1/+1
| * | | | Commit to the eth-keyring-controller moduleDan Finlay2017-09-281-599/+0
| * | | | Remove dead referenceDan Finlay2017-09-281-1/+0
| * | | | Fix Account SelectionDan Finlay2017-09-282-3/+7
| * | | | account-tracker - remove unused importkumavis2017-09-281-1/+0
| * | | | Merge branch 'master' into direct-block-trackerkumavis2017-09-289-323/+363
| |\ \ \ \
| | * \ \ \ Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-286-319/+356
| | |\ \ \ \
| | | * | | | pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-272-2/+6
| | | * | | | transactions: reveal #getFilteredTxList from txStateManage and fix accountTra...frankiebee2017-09-271-1/+5
| | | * | | | transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-272-11/+11
| | | * | | | transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-275-13/+23
| | | * | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-2719-254/+430
| | | |\ \ \ \
| | | * | | | | ensure that values written to txParams are hex stringsfrankiebee2017-09-142-1/+10
| | | * | | | | linting && format fixingfrankiebee2017-09-132-12/+7
| | | * | | | | match other controller patternsfrankiebee2017-09-133-23/+22
| | | * | | | | fix miss typefrankiebee2017-09-091-1/+1
| | | * | | | | more tests and craete a getPendingTransactions functionfrankiebee2017-09-092-11/+10
| | | * | | | | fix messy mergefrankiebee2017-09-071-4/+4
| | | * | | | | remove unused variablefrankiebee2017-09-071-1/+0
| | | * | | | | fix merge and errors disaperaing on updatefrankiebee2017-09-072-3/+6
| | | * | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-078-54/+233
| | | |\ \ \ \ \
| | | * | | | | | add better commentsfrankiebee2017-09-062-32/+41
| | | * | | | | | rename tx-utils.js -> tx-gas-utils.jsfrankiebee2017-09-061-4/+0
| | | * | | | | | remove #buildEthTxFromParamsfrankiebee2017-09-061-17/+0
| | | * | | | | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-227-14/+111
| | | |\ \ \ \ \ \
| | | * | | | | | | Create TxStateManagerfrankiebee2017-08-223-47/+47
| | | * | | | | | | Create tests for TxStateManagerfrankiebee2017-08-192-192/+218
| | * | | | | | | | Fix accountTracker store referencesDan Finlay2017-09-282-2/+2
| | * | | | | | | | Version 3.10.5Dan Finlay2017-09-281-1/+1
| | * | | | | | | | Fix bug where block gas limit was incorrectly parsed.Dan Finlay2017-09-281-1/+3
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | style - small whitespace nitpickkumavis2017-09-281-1/+1
| * | | | | | | | account-tracker - use new block-tracker block formatkumavis2017-09-281-4/+2
| |/ / / / / / /
| * | | | | | | Version 3.10.4v3.10.4Dan Finlay2017-09-281-1/+1
| * | | | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-289-74/+242
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOut...kumavis2017-09-277-40/+642
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Remove duplicate instantiation of account-trackerDan Finlay2017-09-271-5/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 22:21:42 +0800