tangerine-wallet-browser - Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into i2907-NoCodeGasLimit	kumavis	2018-01-17	1	-2/+6
\|\
\| *	Merge branch 'master' into open-popup	Frankie	2018-01-16	3	-13/+79
\| \|\
\| * \|	transactions - emit 'newUnapprovedTx' before estimateGas finishes	frankiebee	2018-01-15	1	-2/+6
\| \| \|
* \| \|	Merge branch 'master' into i2907-NoCodeGasLimit	Dan Finlay	2018-01-16	2	-11/+74
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation	Dan Finlay	2018-01-16	2	-11/+74
\| \|\ \ \| \| \| \| \| \| \| \|	Improve gas price estimation by backfilling recent-blocks
\| \| * \|	Prefer passing a provider over an ethQuery instance	Dan Finlay	2018-01-13	2	-8/+4
\| \| \| \|
\| \| * \|	Improve gas price estimation by backfilling recent-blocks	Dan Finlay	2018-01-12	2	-9/+76
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925
* \| /	Set gas limit to 21k for recipients with no code	Dan Finlay	2018-01-16	1	-5/+22
\|/ / \| \| \| \| \| \|	Fixes #2907
* \|	Merge branch 'master' into infura-rest-api	kumavis	2018-01-12	1	-2/+9
\|\\|
\| *	Default to 1 gwei for empty blocks	Dan Finlay	2018-01-09	1	-2/+3
\| \|
\| *	Default gas estimate to 1 gwei for networks with no block activity	Dan Finlay	2018-01-09	1	-0/+6
\| \|
\| *	bugfix - transactions controller - breakout logic and fix order of ↵	kumavis	2018-01-09	1	-2/+4
\| \| \| \| \| \| \| \|	operations bug
* \|	provider - infura - use infura REST api	kumavis	2018-01-09	1	-2/+5
\| \|
* \|	bugfix - transactions controller - breakout logic and fix order of ↵	kumavis	2018-01-09	1	-2/+4
\|/ \| \| \|	operations bug
*	Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress	Thomas Huang	2018-01-09	1	-0/+11
\|\ \| \| \| \|	Account for 0x/empty string recipient
\| *	Merge branch 'master' into i2621-0xRecipientAddress	Dan Finlay	2018-01-09	3	-2/+28
\| \|\
\| * \|	Account for 0x/empty string address and contract creation	Thomas	2018-01-08	1	-0/+11
\| \| \|
* \| \|	Merge pull request #2851 from MetaMask/i2812-seedworderrorfix	Kevin Serrano	2018-01-09	1	-4/+9
\|\ \ \ \| \|_\|/ \|/\| \|	Fix condition where failing seed word checks would infinite-spin future attempts.
\| * \|	Add fix for infinite spinner for incorrect seed phrase.	Kevin Serrano	2018-01-04	1	-4/+9
\| \| \|
* \| \|	Fix feature to work	Dan Finlay	2018-01-06	2	-3/+11
\| \| \|
* \| \|	Linted	Dan Finlay	2018-01-06	1	-3/+0
\| \| \|
* \| \|	Derive gas price estimate from previous transactions	Dan Finlay	2018-01-06	3	-2/+23
\| \|/ \|/\| \| \| \| \|	Return the 50th percentile lowest gas price of the previous 20 blocks.
* \|	Merge pull request #2783 from MetaMask/tx-param-vaalidation	kumavis	2018-01-03	1	-2/+9
\|\ \ \| \|/ \|/\|	transactions - throw error if txParams.value contains a decimal
\| *	tx-gas-utils - tx-param-validation - use more intuitive check	kumavis	2018-01-03	1	-2/+2
\| \|
\| *	Merge branch 'master' into tx-param-vaalidation	Frankie	2017-12-22	3	-18/+73
\| \|\
\| * \|	transactions - throw error if dapp provides txParams whos value has a decimal	frankiebee	2017-12-21	1	-2/+9
\| \| \|
* \| \|	Merge pull request #2817 from MetaMask/i#2810	Frankie	2017-12-29	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \|	only check nonces of transactions who's from address match the txMeta
\| * \| \|	transactions:pending - only check nonces of transactions who's from adress ↵	frankiebee	2017-12-28	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	match the txMeta
* \| \| \|	Fix some silly linting issues.	Kevin Serrano	2017-12-28	2	-2/+2
\|/ / /
* \| \|	Remove retryTimePeriod from tx controller	Dan Finlay	2017-12-22	1	-1/+0
\| \| \|
* \| \|	Stop failing pending transactions after any period of time	Dan Finlay	2017-12-22	1	-7/+0
\| \|/ \|/\|
* \|	Merge pull request #2763 from MetaMask/AddRecentBlocksController	Thomas Huang	2017-12-21	2	-14/+69
\|\ \ \| \| \| \| \| \|	Add Recent Blocks controller
\| * \|	Do not log whole txs in recent block controller.	Dan Finlay	2017-12-20	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Only record gas prices, because that has a current use.
\| * \|	Add Recent Blocks controller	Dan Finlay	2017-12-18	2	-14/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tracks recent blocks, useful for estimating recent successful gas prices.
* \| \|	Allow updating token details	Dan Finlay	2017-12-19	1	-4/+4
\| \|/ \|/\| \| \| \| \|	Fixes #2173
* \|	Merge branch 'master' into i#2720	frankiebee	2017-12-16	1	-1/+1
\|\\|
\| *	Change console.log for opts in _configureInfuraProvider	Thomas Huang	2017-12-16	1	-1/+1
\| \|
* \|	transactions:gas-utils - handle new type of estimateGas error	frankiebee	2017-12-15	1	-1/+5
\|/
*	Merge pull request #2662 from williamchong007/master	Thomas Huang	2017-12-15	1	-2/+10
\|\ \| \| \| \|	fix #1398, prevent injecting xml without xml suffix
\| *	fix #1398, prevent injecting xml without xml suffix	William Chong	2017-12-05	1	-2/+10
\| \|
* \|	Revert "Revert "network - for infura networks use the infura block tracker ↵	kumavis	2017-12-14	1	-7/+50
\| \| \| \| \| \| \| \| \| \| \| \|	provider"" This reverts commit 5df7dcd758c5a16b503a5ee237970c05c7e990c9.
* \|	Revert "network - for infura networks use the infura block tracker provider"	Frankie	2017-12-14	1	-50/+7
\| \|
* \|	Merge pull request #2741 from MetaMask/infura-block-tracker	Frankie	2017-12-14	1	-7/+50
\|\ \ \| \| \| \| \| \|	network - for infura networks use the infura block tracker provider
\| * \|	network - for infura networks use the infura block tracker provider	kumavis	2017-12-14	1	-7/+50
\| \| \|
* \| \|	dont aggresively query account data	frankiebee	2017-12-14	1	-2/+0
\|/ /
* \|	Pass polling interval to zero client provider	Dan Finlay	2017-12-10	1	-1/+5
\| \|
* \|	tx-controller - failed state is a finished state	kumavis	2017-12-08	2	-7/+9
\| \|
* \|	Do not allow nonces larger than the next valid nonce	Dan Finlay	2017-12-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \|	To avoid situations where a user signs a transaction that will become surprisingly valid in the future.
* \|	Merge branch 'master' into patch-2	Dan Finlay	2017-12-08	3	-0/+20
\|\ \
\| * \|	Enforce retry tx at minimum gas of previous tx	Dan Finlay	2017-12-07	1	-1/+4
\| \| \|
\| * \|	Fix retry action	Dan Finlay	2017-12-07	1	-1/+9
\| \| \|
\| * \|	Add retry background method and action	Dan Finlay	2017-12-07	3	-0/+9
\| \| \|
* \| \|	A more expressive way	vicnaum	2017-12-07	1	-5/+2
\| \| \| \| \| \| \| \| \|	replaced ifs with ? :
* \| \|	Fix for #2644 - Specified Nonce isn't used	vicnaum	2017-12-07	1	-1/+6
\|/ / \| \| \| \| \| \|	Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
* \|	firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta ↵	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \|	in _resubmitTx
* \|	Correct note for updateTx after block-update event in transaction.js	Dan	2017-12-07	1	-1/+1
\| \|
* \|	Fix undefined latestBlockNumber in _resubmitTx	Dan	2017-12-07	1	-1/+1
\| \|
* \|	Exponentional backoff on transaction retry in pending-tx-tracker	Dan	2017-12-06	2	-2/+20
\|/
*	Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1	Thomas Huang	2017-11-30	4	-16/+84
\|\ \| \| \| \|	Versioned notices
\| *	Fix migration comment	Dan Finlay	2017-11-30	1	-2/+3
\| \|
\| *	Migrate old data to include firstVersion info	Dan Finlay	2017-11-29	2	-0/+41
\| \|
\| *	Linted	Dan Finlay	2017-11-29	2	-2/+2
\| \|
\| *	Add seed phrase bounty award notice	Dan Finlay	2017-11-29	1	-1/+0
\| \| \| \| \| \| \| \|	Only shows to people who installed before or equal to MetaMask 3.12.1
\| *	Get notice version filtering working nicely	Dan Finlay	2017-11-29	2	-24/+28
\| \|
\| *	Add firstVersion field to notices selector	Dan Finlay	2017-11-29	2	-1/+5
\| \|
\| *	Add optional version field to notices	Dan Finlay	2017-11-29	2	-1/+20
\| \| \| \| \| \| \| \|	Allows notices to only show to users who are on a certain version.
* \|	Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix	kumavis	2017-11-30	1	-1/+1
\|\\|
\| *	Merge pull request #2441 from MetaMask/kumavis-patch-3	Dan Finlay	2017-11-28	1	-1/+1
\| \|\ \| \| \| \| \| \|	NetworkController - add warning when aborting lookupNetwork
\| \| *	network controller - warn via log.warn	kumavis	2017-11-28	1	-1/+1
\| \| \|
\| \| *	Update network.js	kumavis	2017-10-24	1	-1/+1
\| \| \|
* \| \|	deps - obs-store@3 + migrate stream plumbing	kumavis	2017-11-29	3	-6/+10
\|/ /
* \|	Prevent creation of multiple vaults	Dan Finlay	2017-11-21	1	-31/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.
* \|	Add reproduction and mutex code	Dan Finlay	2017-11-21	1	-2/+37
\| \|
* \|	Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error	Thomas Huang	2017-11-21	1	-0/+7
\|\ \ \| \| \| \| \| \|	Add useful error when duplicate web3 is detected.
\| * \|	Add useful error when duplicate web3 is detected.	Dan Finlay	2017-11-01	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2507
* \| \|	newUnaprovedTx => newUnapprovedTx	Dora E. Mondrian	2017-11-06	2	-2/+2
\|/ / \| \| \| \| \| \|	This typo tripped me up when I was reading through the code and trying to understand what's going on.
* \|	Merge pull request #2291 from MetaMask/gasPriceSpecified	Kevin Serrano	2017-10-28	1	-0/+1
\|\ \ \| \| \| \| \| \|	Add boolean for specified gas price
\| * \|	Add indicator for specified gas price	Kevin Serrano	2017-10-06	1	-0/+1
\| \| \|
* \| \|	Resolve merge conflicts	Kevin Serrano	2017-10-27	18	-63/+132
\|\ \ \
\| * \| \|	Resolving that ugly merge.	Kevin Serrano	2017-10-26	1	-3/+7
\| \| \| \|
\| * \| \|	Merge pull request #2422 from watilde/fixes-lint	Kevin Serrano	2017-10-25	13	-31/+30
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Fixes lint warnings
\| \| * \|	Fix lint warnings	Daijiro Wachi	2017-10-22	13	-31/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed warnings: ```md app/scripts/controllers/computed-balances.js + 35:27 warning Missing space before function parentheses space-before-function-paren + 41:14 warning 'address' is never reassigned. Use 'const' instead prefer-const + 61:9 warning 'updater' is never reassigned. Use 'const' instead prefer-const + 68:11 warning 'newState' is never reassigned. Use 'const' instead prefer-const app/scripts/controllers/network.js + 104:29 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/createLoggerMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 15:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createOriginMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 9:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createProviderMiddleware.js + 5:34 warning Missing space before function parentheses space-before-function-paren + 13:2 warning Newline required at end of file but not found eol-last app/scripts/lib/events-proxy.js + 1:50 warning Missing space before function parentheses space-before-function-paren + 31:2 warning Newline required at end of file but not found eol-last app/scripts/lib/nodeify.js + 2:22 warning Missing space before function parentheses space-before-function-paren + 2:24 warning Missing space before opening brace space-before-blocks + 5:18 warning Missing space before function parentheses space-before-function-paren + 5:20 warning Missing space before opening brace space-before-blocks app/scripts/lib/pending-balance-calculator.js + 16:19 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/pending-tx-tracker.js + 85:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 87:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 88:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 90:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 91:11 warning '\|\|' should be placed at the end of the line operator-linebreak app/scripts/lib/port-stream.js + 3:22 warning Missing space before function parentheses space-before-function-paren + 3:24 warning Missing space before opening brace space-before-blocks app/scripts/lib/tx-gas-utils.js + 84:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-history-helper.js + 12:37 warning Missing space before function parentheses space-before-function-paren + 23:30 warning Missing space before function parentheses space-before-function-paren + 30:23 warning Missing space before function parentheses space-before-function-paren + 35:28 warning Missing space before function parentheses space-before-function-paren + 41:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-manager.js + 94:13 warning 'value' is never reassigned. Use 'const' instead prefer-const ui/app/reducers.js + 45:7 warning 'state' is never reassigned. Use 'const' instead prefer-const + 53:7 warning 'stateString' is never reassigned. Use 'const' instead prefer-const ui/lib/tx-helper.js + 27:2 warning Newline required at end of file but not found eol-last ui/app/components/account-dropdowns.js + 163:1 warning More than 2 blank lines not allowed no-multiple-empty-lines ui/app/components/menu-droppo.js + 22:7 warning 'style' is never reassigned. Use 'const' instead prefer-const ui/app/components/shapeshift-form.js + 135:11 warning '&&' should be placed at the end of the line operator-linebreak ui/app/components/typed-message-renderer.js + 35:25 warning Missing space before function parentheses space-before-function-paren + 42:2 warning Newline required at end of file but not found eol-last mascara/server/index.js + 11:42 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 12:36 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 13:33 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 14:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 20:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 21:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 26:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat ```
\| * \| \|	Try to fix intermittent test failure in NonceTracker tests	Dan Finlay	2017-10-23	1	-0/+4
\| \|/ /
\| * \|	Linted	Dan Finlay	2017-10-20	2	-2/+1
\| \| \|
\| * \|	Fix bug where new account was not immediately selected	Dan Finlay	2017-10-20	1	-3/+14
\| \| \|
\| * \|	Allow computed balances to enumerate its own view	Dan Finlay	2017-10-20	1	-2/+3
\| \| \|
\| * \|	Remove account-tracker from keyringController	Dan Finlay	2017-10-19	1	-1/+0
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault	Dan Finlay	2017-10-19	6	-90/+72
\| \|\ \
\| \| * \|	Revert "NetworkController refactor for new EthClient interface"	kumavis	2017-10-19	6	-90/+72
\| \| \| \|
\| * \| \|	Make account tracking much more reactive	Dan Finlay	2017-10-19	2	-12/+13
\| \| \| \|
\| * \| \|	Make account tracking more reactive	Dan Finlay	2017-10-19	3	-29/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.
\| * \| \|	Refresh computed balances controller when restoring vault	Dan Finlay	2017-10-19	2	-1/+6
\| \| \| \|
\| * \| \|	Add validation to balance constructor	Dan Finlay	2017-10-19	1	-0/+10
\| \| \| \|
\| * \| \|	Stop tracking old account balances after restore vault	Dan Finlay	2017-10-19	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Per @kgserrano note
\| * \| \|	Promisify metamask-controller vault creating methods	Dan Finlay	2017-10-18	1	-17/+10
\| \| \| \|
\| * \| \|	Select first account when restoring seed	Dan Finlay	2017-10-18	1	-3/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2348
\| * \| \|	Select first account on new vault creation	Dan Finlay	2017-10-18	1	-1/+12
\| \|/ /
\| * \|	contentscript - fix inpage require and bundling	kumavis	2017-10-13	1	-4/+4
\| \| \|
\| * \|	Break up inpage file read into multiple lines	Dan Finlay	2017-10-13	1	-1/+3
\| \| \|
\| * \|	Merge branch 'master' into i1340-SynchronousInjection	Dan Finlay	2017-10-13	11	-79/+316
\| \|\ \
\| \| * \|	nonce-tracker - use blockTracker directly	kumavis	2017-10-12	2	-7/+4
\| \| \| \|
\| \| * \|	network-controller - use obj-proxy for providerProxy	kumavis	2017-10-11	1	-3/+4
\| \| \| \|
\| \| * \|	util - add obj-proxy	kumavis	2017-10-11	1	-0/+19
\| \| \| \|
\| \| * \|	events-proxy - clean up	kumavis	2017-10-11	1	-5/+5
\| \| \| \|
\| \| * \|	lint fixes	kumavis	2017-10-11	2	-8/+3
\| \| \| \|
\| \| * \|	network controller - refactor to use eth-rpc-client	kumavis	2017-10-11	2	-29/+34
\| \| \| \|
\| \| * \|	metamask controller - define this.newTransaction to ease instantiation order	kumavis	2017-10-11	1	-1/+6
\| \| \| \|
\| \| * \|	metamask controller - simplify provider init	kumavis	2017-10-11	1	-22/+16
\| \| \| \|
\| \| * \|	metamask controller - breakout getAccounts method	kumavis	2017-10-11	1	-12/+14
\| \| \| \|
\| * \| \|	Begin implementing sync injection idea	Dan Finlay	2017-10-05	1	-2/+1
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'master' into version-debugging	Kevin Serrano	2017-10-10	7	-4/+221
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #2223 from ukstv/master	Dan Finlay	2017-10-10	3	-1/+182
\| \|\ \ \| \| \| \| \| \| \| \|	Add eth_signTypedData handler
\| \| * \|	Validate data format for eth_signTypedData	Sergey Ukustov	2017-10-07	1	-0/+4
\| \| \| \|
\| \| * \|	Merge branch 'master' into SignTypedData	Dan Finlay	2017-10-07	3	-1/+29
\| \| \|\ \
\| \| * \ \	Merge branch 'master' into SignTypedData	Dan Finlay	2017-10-06	2	-4/+6
\| \| \|\ \ \
\| \| * \| \| \|	Add signTypedData input validations	Dan Finlay	2017-10-06	2	-4/+20
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into SignTypedData	Dan Finlay	2017-10-06	2	-6/+7
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Sergey Ukustov	2017-10-03	8	-78/+80
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Add eth_signTypedData handler	Sergey Ukustov	2017-09-30	3	-1/+162
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #2305 from MetaMask/nodeify	Frankie	2017-10-07	1	-2/+10
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	nodeify - allow callback to be optional
\| \| * \| \| \| \|	lint fix - nodeify	kumavis	2017-10-07	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	nodeify - allow callback to be optional	kumavis	2017-10-07	1	-2/+10
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit	kumavis	2017-10-07	1	-0/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update status of pending transactions on startup
\| \| * \| \| \| \|	Check status of pending transactions on startup	Dan Finlay	2017-10-07	1	-0/+1
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1531
\| * \| \| \| \|	When checking pending txs, check for successful txs with same nonce.	Dan Finlay	2017-10-07	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a successful tx with the same nonce exists, transition tx to the failed state. Fixes #2294
\| * \| \| \| \|	Provide method for tx tracker to refer to all txs	Dan Finlay	2017-10-07	2	-1/+8
\| \|/ / / /
* \| \| \| \|	Make the function callback friendly.	Kevin Serrano	2017-10-10	1	-4/+4
\| \| \| \| \|
* \| \| \| \|	Simplify try catch	Kevin Serrano	2017-10-06	1	-4/+2
\| \| \| \| \|
* \| \| \| \|	Catch an error if this is not defined.	Kevin Serrano	2017-10-06	1	-1/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into version-debugging	Kevin Serrano	2017-10-06	2	-4/+6
\|\\| \| \| \|
\| * \| \| \|	"fix" hours for message	frankiebee	2017-10-06	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	pending-tx - check time stamp instead of block number for resubmit	frankiebee	2017-10-06	2	-4/+5
\| \|/ / /
* \| \| \|	Configured for callback-required function.'	Kevin Serrano	2017-10-05	1	-2/+2
\| \| \| \|
* \| \| \|	Include OS version	Kevin Serrano	2017-10-05	1	-0/+4
\|/ / /
* \| \|	Merge pull request #2250 from interfect/master	Frankie	2017-10-04	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Don't pass origin as an HTTP header
\| * \| \|	Don't pass origin as an HTTP header	Adam Novak	2017-10-02	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requests with this nonstandard header are being blocked by CORS when made against Parity. Not sending it ought to fix #1779.
* \| \| \|	pending tx tracker - on tx:warn append error message instead of error obj	kumavis	2017-10-03	1	-1/+1
\| \| \| \|
* \| \| \|	pending tx tracker - tx:warning event includes err obj	kumavis	2017-10-03	1	-2/+2
\| \| \| \|
* \| \| \|	pending tx tracker - resubmit - warn dont error on unknown error	kumavis	2017-10-03	1	-2/+5
\| \| \| \|
* \| \| \|	pending tx tracker - dont throw on load failure	kumavis	2017-10-03	1	-1/+0
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into ↵	kumavis	2017-10-03	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	history-notes
\| * \ \	Merge branch 'master' into history-notes	frankiebee	2017-10-03	1	-1/+2
\| \|\ \ \
\| \| * \| \|	tx state history - fix bug where initial snapshot was mutated on updateTx	kumavis	2017-10-03	2	-2/+3
\| \| \|/ /
* \| / /	tx state history - append note to first op of diff	kumavis	2017-10-03	1	-2/+5
\|/ / /
* / /	transaction - provide notes for history	frankiebee	2017-10-03	2	-12/+14
\|/ /
* \|	Version 3.10.8 - Fix Currency Conversionv3.10.8	Dan Finlay	2017-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API. Fixes the first part of #2240
* \|	Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions	kumavis	2017-09-30	3	-26/+1
\|\ \ \| \| \| \| \| \|	pending-tx - dont check the balance to rebrodcast
\| * \|	pending-tx - dont check the balance to rebrodcast	frankiebee	2017-09-30	3	-26/+1
\| \| \|
* \| \|	network - make network controller internal network switching explicit	kumavis	2017-09-30	1	-2/+3
\| \| \|
* \| \|	network - convert localhost from custom rpc to network type	kumavis	2017-09-30	3	-7/+3
\| \| \|
* \| \|	network controller - small refactor	kumavis	2017-09-30	2	-35/+50
\|/ /
* /	Ensure selected account is always set if possible	Dan Finlay	2017-09-30	1	-0/+9
\|/ \| \| \| \| \|	Fixes #2218 Subscribes to keyringController, and if only one account exists, sets it as selected.
*	Merge pull request #2124 from MetaMask/breakout-mascara	kumavis	2017-09-28	1	-1/+0
\|\ \| \| \| \|	require metamascara
\| *	re-enabled x-metamask-origin for mascara	frankiebee	2017-09-28	2	-5/+1
\| \|
\| *	platforms: put context for extension in platform extension class	frankiebee	2017-09-22	3	-2/+4
\| \|
\| *	Merge branch 'master' into breakout-mascara	frankiebee	2017-09-20	1	-3/+9
\| \|\
\| * \|	add context to platform to not have X-Metamask-Origin in mascara	frankiebee	2017-09-20	2	-1/+2
\| \| \|
* \| \|	Merge branch 'master' into new-currency-test	kumavis	2017-09-28	17	-1113/+745
\|\ \ \
\| * \ \	Merge pull request #2194 from MetaMask/network-controller-refactor	kumavis	2017-09-28	2	-33/+34
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Network controller refactor
\| \| * \| \|	network controller - move _setProvider to bottom	kumavis	2017-09-28	1	-18/+18
\| \| \| \| \|
\| \| * \| \|	network controller - refactor to use _setProvider	kumavis	2017-09-28	1	-17/+28
\| \| \| \| \|
\| \| * \| \|	network - remove getter/setter	kumavis	2017-09-28	1	-23/+14
\| \| \| \| \|
\| \| * \| \|	metamask - improve comment	kumavis	2017-09-28	1	-2/+1
\| \| \| \| \|
\| * \| \| \|	Commit to the eth-keyring-controller module	Dan Finlay	2017-09-28	1	-599/+0
\| \| \| \| \|
\| * \| \| \|	Remove dead reference	Dan Finlay	2017-09-28	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Fix Account Selection	Dan Finlay	2017-09-28	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not select accounts on restore, only on creation and deliberate selection. Fixes #2164
\| * \| \| \|	account-tracker - remove unused import	kumavis	2017-09-28	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into direct-block-tracker	kumavis	2017-09-28	8	-322/+362
\| \|\ \ \ \
\| \| * \ \ \	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3	kumavis	2017-09-28	6	-319/+356
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transaction controller refractor pt3
\| \| \| * \| \| \|	pending-tx - move incrementing of the retryCount on the txMeta outside ↵	frankiebee	2017-09-27	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pending-tx-tracker
\| \| \| * \| \| \|	transactions: reveal #getFilteredTxList from txStateManage and fix ↵	frankiebee	2017-09-27	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	accountTracker.store reference
\| \| \| * \| \| \|	transactions: make evnt names pretty and eaiser to read	frankiebee	2017-09-27	2	-11/+11
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	transactions: lint fixes and reveal status-update event for balance controller	frankiebee	2017-09-27	5	-13/+23
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-09-27	18	-250/+427
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	ensure that values written to txParams are hex strings	frankiebee	2017-09-14	2	-1/+10
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	linting && format fixing	frankiebee	2017-09-13	2	-12/+7
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	match other controller patterns	frankiebee	2017-09-13	3	-23/+22
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	fix miss type	frankiebee	2017-09-09	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	more tests and craete a getPendingTransactions function	frankiebee	2017-09-09	2	-11/+10
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	fix messy merge	frankiebee	2017-09-07	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	remove unused variable	frankiebee	2017-09-07	1	-1/+0
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	fix merge and errors disaperaing on update	frankiebee	2017-09-07	2	-3/+6
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-09-07	7	-53/+232
\| \| \| \|\ \ \ \ \
\| \| \| * \| \| \| \| \|	add better comments	frankiebee	2017-09-06	2	-32/+41
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	rename tx-utils.js -> tx-gas-utils.js	frankiebee	2017-09-06	1	-4/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	remove #buildEthTxFromParams	frankiebee	2017-09-06	1	-17/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-08-22	6	-13/+110
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Create TxStateManager	frankiebee	2017-08-22	3	-47/+47
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Create tests for TxStateManager	frankiebee	2017-08-19	2	-192/+218
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix accountTracker store references	Dan Finlay	2017-09-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix bug where block gas limit was incorrectly parsed.	Dan Finlay	2017-09-28	1	-1/+3
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	style - small whitespace nitpick	kumavis	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	account-tracker - use new block-tracker block format	kumavis	2017-09-28	1	-4/+2
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'master' into filter-fixes-moar	Dan Finlay	2017-09-28	8	-73/+241
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2017-09-27	6	-39/+641
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	BreakOutKeyringController
\| \| \| * \| \| \| \| \|	Remove duplicate instantiation of account-tracker	Dan Finlay	2017-09-27	1	-5/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Move obs store into account-tracker instead of inheriting	Dan Finlay	2017-09-27	4	-20/+25
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Restore blockGasLimit to account-tracker	Dan Finlay	2017-09-27	1	-0/+3
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Pass blocktracker to balances controller	Dan Finlay	2017-09-27	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Make encryptor configurable for keyring-controller	Dan Finlay	2017-09-26	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Make blockTracker an independent param	Dan Finlay	2017-09-26	2	-3/+6
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin ↵	Dan Finlay	2017-09-26	2	-0/+2
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into AddBalanceController
\| \| \| \| * \ \ \ \ \	Merge branch 'master' into AddBalanceController	Dan Finlay	2017-09-26	2	-0/+2
\| \| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Implemented feedback	Dan Finlay	2017-09-26	2	-7/+5
\| \| \| \|/ / / / / / /
\| \| \| * \| \| \| \| \| \|	Made some requested changes	Dan Finlay	2017-09-26	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Remove keyring controller from project	Dan Finlay	2017-09-23	3	-596/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'AddBalanceController' into BreakOutKeyringController	Dan Finlay	2017-09-23	7	-58/+217
\| \| \|\\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fix accont-tracker merge bug	Dan Finlay	2017-09-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fix account-tracker references	Dan Finlay	2017-09-23	3	-13/+13
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge branch 'master' into AddBalanceController	Dan Finlay	2017-09-23	11	-171/+177
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|_\|/ \| \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Fix computed-balances controller reference	Dan Finlay	2017-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Refactor eth-store into account-tracker	Dan Finlay	2017-09-23	4	-16/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.
\| \| \| * \| \| \| \| \| \|	Remove dead code from eth-store	Dan Finlay	2017-09-23	1	-43/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Add computed balance to account detail view	Dan Finlay	2017-09-14	4	-7/+17
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Got pending balance updating correctly	Dan Finlay	2017-09-14	3	-81/+69
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Add state-labeled events to allow subscribing to any transaction's state change	Dan Finlay	2017-09-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Some progress	Dan Finlay	2017-09-13	3	-1/+143
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	Dan Finlay	2017-09-12	1	-0/+51
\| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Linted	Dan Finlay	2017-09-08	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Make tx calculations account for gas prices	Dan Finlay	2017-09-08	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Remove logs	Dan Finlay	2017-09-08	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Fix balance calc test	Dan Finlay	2017-09-08	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Add constructor comment	Dan Finlay	2017-09-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Fix valueFor test	Dan Finlay	2017-09-08	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Add basic test for valueFor	Dan Finlay	2017-09-08	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	test not passing	Dan Finlay	2017-09-08	1	-1/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Check balances in parallel	Dan Finlay	2017-09-07	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \|	Add first passing balance calc test	Dan Finlay	2017-09-07	1	-0/+18
\| \| \| \| \| \|_\|_\|_\|/ / \| \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Allow metamaskController to define keyring types	Dan Finlay	2017-09-23	1	-1/+1
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	network contoller - clean up unused code	frankiebee	2017-09-27	1	-6/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	listen for the blocke event on the block tracker instead of rawBlock on the ↵	frankiebee	2017-09-27	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provider
\| * \| \| \| \| \| \| \|	wrap block tracker in events proxy	frankiebee	2017-09-27	2	-14/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	metamask - use provider-engines block tracker	kumavis	2017-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	bug - fix event emitter mem leak warning	kumavis	2017-09-22	1	-3/+8
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' into new-currency-test	Kevin Serrano	2017-09-27	2	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Define encryptor in constructor params instead of platform object	Dan Finlay	2017-09-23	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' into ConfigurableEncryption	Dan Finlay	2017-09-22	1	-1/+1
\| \|\\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Allow custom encryptor to be passed to MetaMaskController and ↵	Dan Finlay	2017-09-22	2	-2/+3
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	KeyringControllers.
* \| \| \| \| \| \|	Merge branch 'master' into new-currency-test	Kevin Serrano	2017-09-21	1	-3/+9
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Do not mark a retry tx failed that has been broadcast successfully	Dan Finlay	2017-09-19	1	-3/+9
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2115 If a tx has been braodcast, the only failures we should accept are: - Never mined - On chain failure We had a section of code that would mark a tx failed during any unknown error during a retry. Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
* \| \| \| \| \|	Comply with current currency API and add additional styling.	Kevin Serrano	2017-09-19	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into new-currency-test	Kevin Serrano	2017-09-19	10	-169/+169
\|\\| \| \| \| \|
\| * \| \| \| \|	createOriginMiddleware - fix var name	kumavis	2017-09-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	metamask controller - destroy filter polyfill on disconnect	kumavis	2017-09-14	1	-4/+10
\| \| \| \| \| \|
\| * \| \| \| \|	metamask controller - move middleware into seperate files	kumavis	2017-09-14	4	-34/+44
\| \| \| \| \| \|
\| * \| \| \| \|	debug - prefer logger over console	kumavis	2017-09-14	2	-9/+9
\| \| \| \| \| \|
\| * \| \| \| \|	metamask cont - standardize multiplex stream naming	kumavis	2017-09-14	1	-8/+8
\| \| \| \| \| \|
\| * \| \| \| \|	contentscript - fix obj-multiplex instantiation and use pump for streams	kumavis	2017-09-12	1	-12/+33
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2017-09-12	1	-8/+12
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filter-leak-fix
\| * \| \| \| \|	inpage - use obj-multiplex module	kumavis	2017-09-08	1	-6/+6
\| \| \| \| \| \|