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 'develop' into sentry-enhancements2	kumavis	2018-10-30	3	-32/+132
\|\
\| *	Merge pull request #5552 from EthersocialNetwork/eth_chainid	kumavis	2018-10-30	1	-4/+14
\| \|\ \| \| \| \| \| \|	network - check eth_chainId and fallback to net_version
\| \| *	Merge branch 'develop' into eth_chainid	hackyminer	2018-10-26	3	-49/+135
\| \| \|\
\| \| * \|	Update network.js	kumavis	2018-10-21	1	-0/+1
\| \| \| \|
\| \| * \|	network - improve logging and type conversion	kumavis	2018-10-21	1	-4/+6
\| \| \| \|
\| \| * \|	support both eth_chainId and net_version	hackyminer	2018-10-20	1	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	get the real chainId using eth_chainId and use net_version as a fallback
\| * \| \|	preferences - fix typo	kumavis	2018-10-30	1	-1/+1
\| \| \|/ \| \|/\|
\| * \|	Add support for RPC endpoints with custom chain IDs (#5134)	HackyMiner	2018-10-26	3	-28/+115
\| \| \|
\| * \|	Merge pull request #5555 from MetaMask/support-wallet-watch-asset	kumavis	2018-10-21	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Support for prefix wallet_watchAsset
\| \| * \|	add support for wallet_watchAsset	Esteban MIno	2018-10-20	1	-1/+1
\| \| \|/
* \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-10-21	1	-26/+25
\|\\| \| \| \| \| \| \| \| \| \| \|	sentry-enhancements2
\| * \|	specific add and remove methods for frequentRpcList (#5554)	Esteban Miño	2018-10-20	1	-26/+25
\| \|/
* \|	blacklist + currency - report error via log instead of throw	kumavis	2018-10-19	2	-5/+12
\| \|
* \|	lint fix	kumavis	2018-10-19	2	-3/+1
\| \|
* \|	currency - throw errors on failure	kumavis	2018-10-19	1	-3/+17
\| \|
* \|	blacklist - throw errors on request/parse failure	kumavis	2018-10-19	1	-4/+19
\|/
*	Adds toggle for primary currency (#5421)	Alexander Tseung	2018-10-17	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add UnitInput component * Add CurrencyInput component * Add UserPreferencedCurrencyInput component * Add UserPreferencedCurrencyDisplay component * Add updatePreferences action * Add styles for CurrencyInput, CurrencyDisplay, and UnitInput * Update SettingsTab page with Primary Currency toggle * Refactor currency displays and inputs to use UserPreferenced displays and inputs * Add TokenInput component * Add UserPreferencedTokenInput component * Use TokenInput in the send screen * Fix unit tests * Fix e2e and integration tests * Remove send/CurrencyDisplay component * Replace diamond unicode character with Eth logo. Fix typos
*	Add txReceipt data to transaction details (#5513)	Alexander Tseung	2018-10-16	2	-1/+39
\|
*	Ensure that new transactions added are using the selected address	Whymarrh Whitby	2018-10-11	1	-0/+4
\|
*	Revert "transactions - add txReceipt to the txMeta body for confirmed txs ↵	Whymarrh Whitby	2018-10-11	1	-23/+1
\| \| \| \| \| \|	(#5375)" This reverts commit ff67293a8ef61308d602d09f26b163b9b9ec90d3.
*	transactions - add txReceipt to the txMeta body for confirmed txs (#5375)	Frankie	2018-10-10	1	-1/+23
\|
*	Merge pull request #5458 from MetaMask/provider-subs	Bruno Barbieri	2018-10-10	3	-8/+10
\|\ \| \| \| \|	Feature: Subscription support
\| *	provider - network - restore block-ref-rewrite middleware references	kumavis	2018-10-09	2	-4/+4
\| \|
\| *	provider - enable subscription support (newHeads, logs)	kumavis	2018-10-08	1	-4/+6
\| \|
* \|	Fix updating of pending transactions	Dan Finlay	2018-10-06	1	-0/+1
\|/ \| \| \| \| \| \| \| \|	Transaction statuses were not being properly updated when: - MetaMask was unlocked - The network was changed This PR fixes both of those. Fixes #5174
*	Add ability to whitelist a blacklisted domain at runtime	Whymarrh Whitby	2018-10-02	1	-0/+22
\|
*	support editable customRPC (#5267)	HackyMiner	2018-09-29	1	-7/+6
\| \| \| \| \| \|	* support editable customRPC #5246 * remove rpcList size restriction
*	Merge pull request #5282 from MetaMask/tx-cancel-ui	Alexander Tseung	2018-09-25	1	-2/+3
\|\ \| \| \| \|	Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
\| *	Switch existing modals from using Notification to Modal. Remove Notification ↵	Alexander Tseung	2018-09-20	1	-2/+3
\| \| \| \| \| \| \| \|	component. Add CancelTransaction modal
* \|	Adds getPendingNonce method to provider initialization options in ↵	Dan Miller	2018-09-22	1	-1/+1
\|/ \| \| \|	metamask-controller.
*	Delete ConfigManager, replacing its usages with PreferencesController	Whymarrh Whitby	2018-09-12	1	-0/+18
\|
*	Merge pull request #5216 from MetaMask/tx-cancel	Frankie	2018-09-11	2	-2/+59
\|\ \| \| \| \|	Add createCancelTransaction method
\| *	Add createCancelTransaction method	Alexander Tseung	2018-09-11	2	-2/+59
\| \|
* \|	Attach the RPC error value to txMeta	Whymarrh Whitby	2018-09-09	1	-0/+1
\|/
*	fix conflicts	Esteban MIno	2018-08-29	1	-2/+2
\|\
\| *	updated docs, small improvement of recent RPC rendering	Evgeniy Filatov	2018-08-23	1	-1/+1
\| \|
\| *	implemented improvements to RPC history	Evgeniy Filatov	2018-08-23	1	-1/+1
\| \|
* \|	watchAsset small changes	Esteban MIno	2018-08-28	1	-1/+1
\| \|
* \|	typo watchAsset imageUrl to image	Esteban MIno	2018-08-24	1	-6/+6
\| \|
* \|	Merge branch 'develop' into WatchTokenFeature	Esteban MIno	2018-08-22	1	-1/+1
\|\\|
\| *	bugfix - prevents old blocktracker from getting internal hooks migrated	kumavis	2018-08-22	1	-1/+1
\| \|
* \|	returning error in watchAsset	Esteban MIno	2018-08-22	1	-4/+12
\| \|
* \|	refactor watchToken related functions	Esteban MIno	2018-08-21	1	-37/+36
\| \|
* \|	watchAsset returns result wether token was added or not	Esteban MIno	2018-08-21	1	-7/+9
\| \|
* \|	Merge branch 'develop' into WatchTokenFeature	Esteban MIno	2018-08-21	12	-188/+285
\|\\|
\| *	Merge branch 'develop' into network-remove-provider-engine	Thomas	2018-08-15	2	-17/+79
\| \|\ \| \| \| \| \| \| \| \| \|	Override package-lock and fix merge conflicts
\| * \	Merge branch 'network-remove-provider-engine' into ↵	frankiebee	2018-08-07	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine-tests
\| \| * \|	network - fix blockTracker reference to return the blockTrackerProxy instead ↵	frankiebee	2018-08-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of the direct blockTracker reference
\| * \| \|	Merge branch 'develop' into network-remove-provider-engine-tests	Thomas Huang	2018-08-02	1	-7/+3
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into network-remove-provider-engine	Thomas	2018-07-26	5	-14/+162
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-07-04	5	-7/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine
\| * \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-07-03	6	-21/+36
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine
\| * \| \| \| \| \|	lint - fix lint for network	kumavis	2018-06-13	3	-3/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	network - import createBlockTrackerInspectorMiddleware and rearrange cache ↵	kumavis	2018-06-13	3	-37/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	middleware order
\| * \| \| \| \| \|	nonce-tracker - wrap nonce calculations in try-catch and release lock on error	kumavis	2018-06-13	1	-22/+28
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	lint - controllers - whitepace fix	kumavis	2018-06-12	1	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	network - provider - infura - use block-reemit middleware	kumavis	2018-06-08	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-06-07	4	-1/+44
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine
\| * \ \ \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-06-07	4	-13/+113
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine
\| * \| \| \| \| \| \| \|	controllers - transactions - fix tx status update on boot	kumavis	2018-05-29	2	-2/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	controllers - transactions - fix tx confirmation	kumavis	2018-05-29	2	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	controllers - transaction - pending-tx-tracker - lint fix	kumavis	2018-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	controllers - transactions - merge @frankiebee's work with mine	kumavis	2018-05-29	3	-96/+55
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	controllers - transactions - pending-tx-tracker - _getBlock - poll until ↵	kumavis	2018-05-26	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	block is truthy
\| * \| \| \| \| \| \| \|	tx-gas-utils - query for block without tx bodies	kumavis	2018-05-26	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	controllers - recent-blocks - guard against empty block	kumavis	2018-05-25	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	controllers - recent-blocks - wrap block-tracker event in try-catch	kumavis	2018-05-24	1	-1/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'network-remove-provider-engine' of ↵	kumavis	2018-05-24	2	-9/+24
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:MetaMask/metamask-extension into network-remove-provider-engine
\| \| * \ \ \ \ \ \ \	Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker	kumavis	2018-05-24	2	-9/+24
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transactions use new block tracker
\| \| \| * \ \ \ \ \ \ \	Merge branch 'network-remove-provider-engine' of ↵	frankiebee	2018-05-23	4	-53/+41
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker
\| \| \| * \| \| \| \| \| \| \| \|	transactions - update pending-tx-tracker to use the new block tracker	frankiebee	2018-05-23	1	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	remove dependance on the even tx:confirmed	frankiebee	2018-05-23	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	controllers - recent-blocks - ensure full blocks	kumavis	2018-05-24	1	-2/+2
\| \|/ / / / / / / / / /
\| * \| / / / / / / / /	controllers - recent-blocks - doc update	kumavis	2018-05-24	1	-4/+4
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-23	1	-15/+7
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine
\| * \ \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-23	3	-38/+34
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-remove-provider-engine
\| * \| \| \| \| \| \| \| \| \|	recent-blocks - fix backfill blockNumber tracking	kumavis	2018-05-17	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	controllers - recent-blocks - fix pifyd setTimeout args	kumavis	2018-05-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	deps - fix incorrect dep paths and versions	kumavis	2018-05-17	4	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	controllers - balance - update for eth-block-tracker@4	kumavis	2018-05-17	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	recent-blocks - update for eth-block-tracker@4	kumavis	2018-05-17	1	-27/+14
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	remove unused events-proxy, was replaced with module swappable-obj-proxy	kumavis	2018-05-17	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	lint fix	kumavis	2018-05-17	5	-13/+18
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	network - create provider and block-tracker via json-rpc-engine	kumavis	2018-05-17	7	-67/+213
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	delete according image when token added with watchToken deleted	Esteban MIno	2018-08-17	1	-13/+14
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	correct behavior when notification is closed when popup	Esteban MIno	2018-08-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	show watch asset image from hide token modal	Esteban MIno	2018-08-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	change watchAsset to new spec for type ERC20	Esteban MIno	2018-08-16	1	-15/+27
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	add suggested tokens objects in metamask state	Esteban MIno	2018-08-16	1	-6/+16
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	watchToken to watchAsset	Esteban MIno	2018-08-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	add support for images base64 and urls on new ui	Esteban MIno	2018-08-15	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	update method to metamask_watchToken	Esteban MIno	2018-08-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	refactor unused code	Esteban MIno	2018-08-08	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix merge	Esteban MIno	2018-08-08	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into WatchTokenFeature	Esteban Miño	2018-08-08	2	-17/+79
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix doc tag	Esteban MIno	2018-08-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	tokens related functions refactor	Esteban MIno	2018-08-01	1	-15/+22
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix undefined for tokens on tests	Esteban MIno	2018-08-01	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix double state update when account changed	Esteban MIno	2018-07-31	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	create tokens storage when setadresses	Esteban MIno	2018-07-31	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	isolation of tokens related methods in preferences	Esteban MIno	2018-07-31	1	-43/+42
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into TokensPerAccountBasis	Esteban Miño	2018-07-28	1	-7/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	refactor to accountTokens	Esteban MIno	2018-07-28	1	-53/+47
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	add & delete tokens per network	Esteban MIno	2018-07-27	1	-10/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	tokens per network for individual account	Esteban MIno	2018-07-27	1	-15/+51
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	preferences test fixes for tokens per account	Esteban MIno	2018-07-26	1	-9/+16
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	add & delete tokens per account	Esteban MIno	2018-07-26	2	-8/+27
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	add suggested token params validation	Esteban MIno	2018-08-07	1	-4/+25
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	eth_watchToken working	Esteban MIno	2018-08-04	1	-0/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	rpc-engine not crashing when eth_watchToken	Esteban MIno	2018-08-04	1	-5/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	merge develop	Esteban MIno	2018-08-04	12	-35/+182
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #4871 from MetaMask/3519-new-contract-gas	Frankie	2018-07-26	1	-7/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|	tx-gas-utils - catch all errors from gas estimation
\| \| * \| \| \| \| \| \| \|	tx-gas-utils - catch all errors from gas estimation	Jenny Pollack	2018-07-25	1	-7/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	network.js: convert rpc protocol to lower case (#4855)	pinkiebell	2018-07-25	1	-0/+3
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4253
\| * \| \| \| \| \| \| \|	run linter	brunobar79	2018-07-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into detectTokenFeature	Esteban Miño	2018-07-21	5	-15/+37
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Auto-detect tokens #3034 (#4683)	Esteban Miño	2018-07-21	1	-0/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* detect tokens polling * network store to detect token * tests for spec * passtest-lint * fix lint * improve tests * detect tokens through infura * detect tokens when submit password and new account selected * keyring unlocked detect and unit tests * add changelog
\| \| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	brunobar79	2018-07-14	1	-13/+0
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initial-trezor-support
\| \| \| * \ \ \ \ \ \ \	Merge pull request #4669 from MetaMask/removeNonceTrackerFunction	Thomas Huang	2018-07-13	1	-13/+0
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unsued nonce tracker function
\| \| \| \| * \ \ \ \ \ \ \	Merge branch 'develop' into removeNonceTrackerFunction	Thomas	2018-07-11	8	-14/+14
\| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \| \| \|/\| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Remove unsued nonce tracker function	tmashuang	2018-06-26	1	-13/+0
\| \| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	brunobar79	2018-07-13	2	-1/+8
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	initial-trezor-support
\| \| \| * \| \| \| \| \| \| \|	Merge pull request #4691 from MetaMask/i4404-confirm-refactor	Alexander Tseung	2018-07-12	1	-1/+2
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and redesign confirm transaction views
\| \| \| \| * \| \| \| \| \| \| \|	Various fixes from PR comments	Alexander Tseung	2018-07-07	1	-10/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Use eth-method-registry to get method data	Alexander Tseung	2018-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Display newest transaction	Alexander Tseung	2018-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	Refactor and redesign confirm transaction views	Alexander Tseung	2018-07-07	2	-13/+12
\| \| \| \| \| \|/ / / / / / \| \| \| \| \|/\| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵	frankiebee	2018-07-11	8	-14/+14
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into i#3896
\| \| \| * \| \| \| \| \| \| \|	trandsactions - remove rejected transactions from history	frankiebee	2018-06-26	1	-0/+6
\| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	account removal is working	brunobar79	2018-07-11	1	-0/+24
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix detection on submit password	Esteban MIno	2018-07-21	1	-5/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	keyring unlocked detect and unit tests	Esteban MIno	2018-07-20	1	-12/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	detect tokens when submit password and new account selected	Esteban MIno	2018-07-20	1	-13/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	detect tokens through infura	Esteban MIno	2018-07-13	1	-21/+24
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	improve tests	Esteban MIno	2018-07-12	1	-16/+13
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into detectTokenFeature	Esteban MIno	2018-07-04	8	-14/+14
\| \|\\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	eslint --fix .	brunobar79	2018-07-03	8	-14/+14
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	passtest-lint	Esteban MIno	2018-07-04	1	-6/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	tests for spec	Esteban MIno	2018-06-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	network store to detect token	Esteban MIno	2018-06-28	1	-8/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	detect tokens polling	Esteban MIno	2018-06-28	1	-0/+97
\| \|/ / / / / /
* \| \| \| \| \| \|	Improved rpc-engine usage	Dan Finlay	2018-06-19	1	-5/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Get popup appearing when suggesting new token	Dan Finlay	2018-06-19	1	-1/+3
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Begin letting UI show suggested tokens	Dan Finlay	2018-06-19	1	-6/+24
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Begin adding eth_watchToken	Dan Finlay	2018-06-19	1	-0/+25
\|/ / / / / /
* \| \| \| \| \|	lint - fix recipient-blacklist.js	kumavis	2018-06-16	1	-13/+13
\| \| \| \| \| \|
* \| \| \| \| \|	blacklist - recipient blacklist as js for inline comments	kumavis	2018-06-16	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Update recipient-blacklist-config.json	kumavis	2018-06-16	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Add apparent phishing address to block list	Dan Finlay	2018-06-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In [this reddit post](https://www.reddit.com/r/Metamask/comments/8r3nsu/help_me_please_somebody_stole_my_ethers/) a user suggests they got some ether stolen after visiting IDEX. Their ether was sent to [this address](https://etherscan.io/address/0x9bcb0a9d99d815bb87ee3191b1399b1bcc46dc77), which is full of comments of people telling similar stories of being phished on IDEX. I think we can safely block this, and probably safe some people some money.
* \| \| \| \| \|	controllers - transaction - prefer log over console	kumavis	2018-06-13	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	metamask - ensure all nonce locks are released	kumavis	2018-06-13	3	-5/+10
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - wrap nonce calculations in try-catch and release lock on error	kumavis	2018-06-13	1	-22/+28
\| \| \| \| \| \|
* \| \| \| \| \|	Fix bug where reset account would not work.	Dan Finlay	2018-06-07	1	-2/+9
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4462 Ensures that resetAccount() can work on non-stock providers. I'm unclear how this was ever working, this code hasn't moved in months, but users report it recently breaking. Maybe we only recently pushed it to prod.
* \| \| \| \|	Merge pull request #4414 from scsaba/recipient-blacklist	kumavis	2018-06-07	3	-1/+43
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Disallow sending to ganache default accounts on main net
\| * \| \| \| \|	remove generating blocked accounts and use a config file instead	Csaba Solya	2018-05-31	3	-18/+20
\| \| \| \| \| \|
\| * \| \| \| \|	fix documentation	Csaba Solya	2018-05-30	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	adding tests for recipient blacklist checker	Csaba Solya	2018-05-30	2	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	adding transaction controller tests	Csaba Solya	2018-05-30	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	initial implementation	Csaba Solya	2018-05-30	2	-1/+41
\| \| \| \| \| \|
* \| \| \| \| \|	Add account type assertion to PreferencesController#setAccountLabel	Whymarrh Whitby	2018-06-06	1	-0/+1
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	diagnostics - rewrite bug-notifier as diagnostics-reporter	kumavis	2018-06-06	1	-15/+4
\| \| \| \| \|
* \| \| \| \|	Record identity before deleting it	Dan Finlay	2018-06-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Mock notifier in test	Dan Finlay	2018-06-05	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Add comment	Dan Finlay	2018-06-05	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	Do not alert to user	Dan Finlay	2018-06-05	1	-5/+0
\| \| \| \| \|
* \| \| \| \|	Linted	Dan Finlay	2018-06-05	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Add bug info under metadata key	Dan Finlay	2018-06-05	1	-1/+7
\| \| \| \| \|
* \| \| \| \|	Add first time info to bug report	Dan Finlay	2018-06-05	1	-1/+4
\| \| \| \| \|
* \| \| \| \|	Add version to report	Dan Finlay	2018-06-05	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Fine tune error posting	Dan Finlay	2018-06-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Only notify first time lost ids are detected	Dan Finlay	2018-06-05	1	-2/+8
\| \| \| \| \|
* \| \| \| \|	Add reporting uri	Dan Finlay	2018-06-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Begin adding unconfigured notifier	Dan Finlay	2018-06-05	1	-4/+17
\| \| \| \| \|
* \| \| \| \|	Persist lost identities to storage for later analysis	Dan Finlay	2018-06-05	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Add minimal user notification of issue.	Dan Finlay	2018-06-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Add identity synchronizing code	Dan Finlay	2018-06-05	1	-0/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user.
* \| \| \| \|	preferences controller - jsdoc fix	kumavis	2018-06-04	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	metamask - update preferences controller identities on keyring controller update	kumavis	2018-06-04	1	-3/+28
\| \| \| \| \|
* \| \| \| \|	Version 4.7.1v4.7.1	Dan Finlay	2018-06-02	1	-0/+17
\|/ / / /
* \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-30	2	-10/+19
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \|	merge-master
\| * \| \|	cleanErrorStack moved to separate library module	Anton	2018-05-29	1	-12/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	more errors traces cleaned up
\| * \| \|	error message fix	Anton	2018-05-29	1	-2/+1
\| \| \| \|
\| * \| \|	Clean up user rejection error message	Anton	2018-05-28	1	-3/+14
\| \| \| \|
\| * \| \|	Merge pull request #4140 from MetaMask/v4.6.1	Thomas Huang	2018-05-01	1	-1/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Version 4.6.1
\| * \| \| \|	require log	frankiebee	2018-05-01	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	log emitter errors	frankiebee	2018-04-30	1	-6/+10
\| \| \| \| \|
\| * \| \| \|	transactions - run event emitters outside context of _setTxStatus	frankiebee	2018-04-30	1	-7/+9
\| \| \| \| \|
* \| \| \| \|	controllers - recent-blocks - pull first historical blocks in parallel	kumavis	2018-05-22	1	-15/+7
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Reveal get filtered tx list (#4332)	Frankie	2018-05-22	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken)
* \| \| \|	Add PreferencesController#setAddresses to update ids	Whymarrh Whitby	2018-05-17	1	-0/+10
\| \| \| \|
* \| \| \|	Update AddressBookController to read from preferences store	Whymarrh Whitby	2018-05-17	1	-21/+6
\| \| \| \|
* \| \| \|	Move setAccountLabel into PreferencesController	Whymarrh Whitby	2018-05-17	1	-2/+18
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-17	3	-140/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	scsaba-transaction-history-timestamps
\| * \| \|	network - remove debugging console.log	kumavis	2018-05-17	1	-1/+0
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-17	2	-1/+16
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-controller-remove-setNetworkEndpoints
\| * \| \| \|	lint - cleanup some unused variables	kumavis	2018-05-03	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	controllers - network - move default config out of first-time-state	kumavis	2018-05-03	1	-2/+15
\| \| \| \| \|
\| * \| \| \|	network - refactor to remove unnecesary code	kumavis	2018-05-01	3	-124/+29
\| \| \| \| \|
\| * \| \| \|	network - remove setNetworkEndpoints	kumavis	2018-05-01	1	-13/+0
\| \| \| \| \|
\| * \| \| \|	controllers - network - more semantic assert	kumavis	2018-05-01	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	tx-state-history-helper - use more readable Date.now method	kumavis	2018-05-17	1	-1/+1
\| \| \| \|
* \| \| \|	fix lint issues	Csaba Solya	2018-05-10	2	-2/+2
\| \| \| \|
* \| \| \|	remove unnecessary lib	Csaba Solya	2018-05-10	1	-1/+0
\| \| \| \|
* \| \| \|	revert unnecessary change in state manager	Csaba Solya	2018-05-10	1	-13/+7
\| \| \| \|
* \| \| \|	add time stamps to transaction history log entries	Csaba Solya	2018-05-10	2	-16/+28
\| \|/ / \|/\| \|
* \| \|	Fix documentation typo	bitpshr	2018-05-08	1	-1/+1
\| \| \|
* \| \|	transactions - add a nonce check utility for ui use	frankiebee	2018-05-02	1	-0/+15
\| \| \|
* \| \|	fix - getTxsByMetaData check if the key is in the object not if the value is ↵	frankiebee	2018-05-02	1	-1/+1
\|/ / \| \| \| \| \| \|	truthy
* \|	Merge pull request #4110 from MetaMask/master	kumavis	2018-04-28	8	-144/+1402
\|\\| \| \| \| \|	Develop - Add commits to develop that are already in Master
\| *	Merge pull request #4095 from MetaMask/v4.6.0v4.6.0	Thomas Huang	2018-04-27	2	-2/+2
\| \|\ \| \| \| \| \| \|	Version 4.6.0
\| * \	Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3	kumavis	2018-04-26	8	-144/+1402
\| \|\ \ \| \| \| \| \| \| \| \|	docs and file organization for txController
\| \| * \|	transactions - more docs and clean ups	frankiebee	2018-04-26	6	-55/+116
\| \| \| \|
\| \| * \|	Cleaned up some typos and JSDocs in Transactions	Dan Finlay	2018-04-24	3	-38/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nonce tracker is not fully documented yet. Have not yet touched: - tx-state-manager - tx-state-history-helper - util - tx-gas-utils - pending-tx-tracker
\| \| * \|	transactions - fix refernces	frankiebee	2018-04-20	2	-1/+2
\| \| \| \|
\| \| * \|	Merge branch 'master' into tx-controller-rewrite-v3	frankiebee	2018-04-20	10	-17/+398
\| \| \|\ \
\| \| * \| \|	meta - transactions - docs yo!	frankiebee	2018-04-20	8	-73/+351
\| \| \| \| \|
\| \| * \| \|	fix up - more docs	frankiebee	2018-04-14	3	-38/+77
\| \| \| \| \|
\| \| * \| \|	meta - transactions - code clean up and jsDoc	frankiebee	2018-04-14	1	-41/+109
\| \| \| \| \|
\| \| * \| \|	transactions - code cleanup	frankiebee	2018-04-13	2	-58/+59
\| \| \| \| \|
\| \| * \| \|	transactions - lint fixes	frankiebee	2018-04-11	3	-12/+12
\| \| \| \| \|
\| \| * \| \|	meta - transactions - create a transactions dir in controller and move ↵	frankiebee	2018-04-11	7	-61/+869
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	relevant files into it
* \| \| \| \|	Return 0 for token rate fetch failures	bitpshr	2018-04-27	1	-1/+5
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	rpc - bump provider-engine + eth-json-rpc-filters	kumavis	2018-04-26	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #4069 from MetaMask/i4056-LatestPriceApi	Dan Finlay	2018-04-26	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Use latest balanc3 api for prices
\| * \| \|	Use latest balanc3 api for prices	Dan Finlay	2018-04-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into dm-docs-2	Dan	2018-04-24	6	-17/+186
\|\\| \| \|
\| * \| \|	Use the metamask balanc3 dev price api	Dan Finlay	2018-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4056
\| * \| \|	Clean up network config	Alexander Tseung	2018-04-24	4	-12/+138
\| \| \| \|
\| * \| \|	Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr	Dan Finlay	2018-04-21	2	-4/+47
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Documentation
\| \| * \|	Clean up JSDoc for background scripts	bitpshr	2018-04-20	1	-2/+10
\| \| \| \|
\| \| * \|	Add more documentation to computed balances controller	bitpshr	2018-04-20	1	-1/+36
\| \| \| \|
\| \| * \|	Add generated docs	bitpshr	2018-04-19	1	-3/+3
\| \| \| \|
* \| \| \|	Fix nits.	Dan	2018-04-24	1	-1/+1
\| \| \| \|
* \| \| \|	Minor fixes in a number of docs.	Dan	2018-04-21	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' into dm-docs-2	Dan	2018-04-20	8	-136/+219
\|\\| \| \|
\| * \| \|	Missing bracket in docblock.	Dan	2018-04-19	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into dm-docs-1	Dan	2018-04-19	8	-0/+84
\| \|\\| \|
\| \| * \|	Merge branch 'master' into i3981-contract-rates	Dan Finlay	2018-04-17	7	-0/+7
\| \| \|\ \
\| \| \| * \|	Require loglevel singleton in each module that uses it	bitpshr	2018-04-14	7	-0/+7
\| \| \| \|/
\| \| * \|	Disable token price polling when no client is active	bitpshr	2018-04-17	1	-0/+1
\| \| \| \|
\| \| * \|	Maintain token prices using a background service	bitpshr	2018-04-16	1	-0/+76
\| \| \|/
\| * \|	NO MIXED TABS AND SPACES	Dan	2018-04-19	3	-137/+137
\| \| \|
\| * \|	Documentation fix: @constant -> @property	Dan	2018-04-19	1	-1/+1
\| \| \|
* \| \|	Even more documentation for various controllers and libs.	Dan	2018-04-19	4	-9/+171
\|/ /
* \|	Improve documentation of promises that return undefined.	Dan	2018-04-17	2	-4/+4
\| \|
* \|	Typo fixes, type fixes on the return clauses of the buyEthUrl and ↵	Dan	2018-04-17	4	-4/+4
\| \| \| \| \| \| \| \|	getPrefferedLangCode functions.
* \|	Spell deprecated correctly.	Dan	2018-04-17	1	-2/+2
\| \|
* \|	@params -> @param fix	Dan	2018-04-17	2	-6/+6
\| \|
* \|	Documentation for various controllers and libs	Dan	2018-04-17	4	-16/+313
\|/
*	transactions - _normalizeTxParams will now return a new object for txParams	frankiebee	2018-04-06	1	-31/+18
\|