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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\| \|\
\| * \	Merge branch 'network-remove-provider-engine' into network-remove-provider-en...	frankiebee	2018-08-07	1	-1/+1
\| \|\ \
\| \| * \|	network - fix blockTracker reference to return the blockTrackerProxy instead ...	frankiebee	2018-08-07	1	-1/+1
\| * \| \|	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 network...	kumavis	2018-07-04	5	-7/+7
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...	kumavis	2018-07-03	6	-21/+36
\| \|\ \ \ \ \
\| * \| \| \| \| \|	lint - fix lint for network	kumavis	2018-06-13	3	-3/+0
\| * \| \| \| \| \|	network - import createBlockTrackerInspectorMiddleware and rearrange cache mi...	kumavis	2018-06-13	3	-37/+4
\| * \| \| \| \| \|	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 network...	kumavis	2018-06-07	4	-1/+44
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...	kumavis	2018-06-07	4	-13/+113
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	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 bloc...	kumavis	2018-05-26	1	-1/+10
\| * \| \| \| \| \| \| \|	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 github.com:MetaMask/metamask...	kumavis	2018-05-24	2	-9/+24
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker	kumavis	2018-05-24	2	-9/+24
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/...	frankiebee	2018-05-23	4	-53/+41
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	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 network...	kumavis	2018-05-23	1	-15/+7
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...	kumavis	2018-05-23	3	-38/+34
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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	Jenny Pollack	2018-07-25	1	-7/+3
\| * \| \| \| \| \| \| \| \|	network.js: convert rpc protocol to lower case (#4855)	pinkiebell	2018-07-25	1	-0/+3
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...	brunobar79	2018-07-14	1	-13/+0
\| \| \|\ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \	Merge pull request #4669 from MetaMask/removeNonceTrackerFunction	Thomas Huang	2018-07-13	1	-13/+0
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \	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 initial...	brunobar79	2018-07-13	2	-1/+8
\| \| \|\\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge pull request #4691 from MetaMask/i4404-confirm-refactor	Alexander Tseung	2018-07-12	1	-1/+2
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	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 into...	frankiebee	2018-07-11	8	-14/+14
\| \| \| \|\\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	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
* \| \| \| \| \|	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
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge pull request #4414 from scsaba/recipient-blacklist	kumavis	2018-06-07	3	-1/+43
\|\ \ \ \ \
\| * \| \| \| \|	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
* \| \| \| \|	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 merge-ma...	kumavis	2018-05-30	2	-10/+19
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	cleanErrorStack moved to separate library module	Anton	2018-05-29	1	-12/+4
\| * \| \|	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
\| \|\ \ \
\| * \| \| \|	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 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 scsaba-...	kumavis	2018-05-17	3	-140/+43
\|\ \ \
\| * \| \|	network - remove debugging console.log	kumavis	2018-05-17	1	-1/+0
\| * \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...	kumavis	2018-05-17	2	-1/+16
\| \|\ \ \
\| * \| \| \|	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
\|/ /
* \|	Merge pull request #4110 from MetaMask/master	kumavis	2018-04-28	8	-144/+1402
\|\\|
\| *	Merge pull request #4095 from MetaMask/v4.6.0v4.6.0	Thomas Huang	2018-04-27	2	-2/+2
\| \|\
\| * \	Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3	kumavis	2018-04-26	8	-144/+1402
\| \|\ \
\| \| * \|	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
\| \| * \|	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 releva...	frankiebee	2018-04-11	7	-61/+869
* \| \| \| \|	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	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
\| * \| \|	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
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	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 getPreffere...	Dan	2018-04-17	4	-4/+4
* \|	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
*	transactions - remove unnecessary keys on txParams	frankiebee	2018-04-05	1	-0/+12
*	transactions - make #_validateTxParams not async and "linting" wink wink nudg...	frankiebee	2018-04-05	1	-7/+12
*	transactions - normalize txParams	frankiebee	2018-04-05	1	-2/+52
*	app - currency - fix typo + prefer log over console	kumavis	2018-04-04	1	-2/+3
*	app - currency - fix typo	kumavis	2018-04-04	1	-1/+1
*	app - warn on fetch errors instead of spamming sentry	kumavis	2018-04-04	4	-32/+28
*	transactions gasLimit - use the block gasLimit if getCode fails	frankiebee	2018-04-03	1	-2/+3
*	transactions#newUnapprovedTransaction - dont default origin to metamask	frankiebee	2018-03-31	1	-1/+1
*	transactions - put the origing on the txMeta to help with debugging	frankiebee	2018-03-31	1	-1/+3
*	Merge pull request #3777 from MetaMask/etc-fixes	Frankie	2018-03-29	1	-1/+1
\|\
\| *	controllers - currency - warn currency and encountered error	kumavis	2018-03-29	1	-1/+1
* \|	tx controller - explode on non-hex txParams + dont add chainId to txParams + ...	kumavis	2018-03-28	1	-4/+6
\|/
*	Use extension api to get initial locale.	Dan	2018-03-22	1	-1/+1
*	Merge branch 'master' into i18n-translator-redux	Dan	2018-03-22	1	-0/+4
\|\
\| *	Merge pull request #3504 from lazaridiscom/laz/i3427	kumavis	2018-03-21	1	-0/+4
\| \|\
\| \| *	add READMEs to folders, re #3427	Lazaridis	2018-03-14	1	-0/+4
* \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...	kumavis	2018-03-21	1	-21/+32
\|\\| \|
\| * \|	Fix TransactionStateManager spelling.	Dan	2018-03-14	1	-2/+2
\| * \|	transactions - return the txMeta in retryTransaction	frankiebee	2018-03-14	1	-2/+3
\| * \|	Merge branch 'master' into retry-tx-refractor	Dan	2018-03-09	1	-2/+2
\| \|\\|
\| * \|	fix marking of confirmed transaction as dropped	frankiebee	2018-03-09	1	-1/+1
\| * \|	transactions - make _markNonceDuplicatesDropped	frankiebee	2018-03-08	1	-21/+20
\| * \|	refactor retrytx with higher gas price:	frankiebee	2018-03-08	1	-16/+27
* \| \|	Handle i18n with redux.	Dan	2018-03-16	1	-0/+5
\| \|/ \|/\|
* \|	fix typo in transaction.js	Jeffrey Tong	2018-03-07	1	-2/+2
\|/
*	Merge branch 'master' into uat	Dan	2018-02-08	1	-0/+4
\|\
\| *	wipe only transactions for current account	Bruno Barbieri	2018-01-31	1	-2/+2
\| *	added reset account feature	Bruno Barbieri	2018-01-31	1	-0/+4
* \|	Merge branch 'uat' into newmaster	Chi Kei Chan	2018-01-20	3	-6/+75
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'uat' into uat-master-011618	Alexander Tseung	2018-01-17	3	-6/+75
\| \|\
\| \| *	Merge branch 'NewUI-flat' into merge-master	Alexander Tseung	2017-12-23	3	-6/+75
\| \| \|\
\| \| \| *	Track usage of old and new UI (#2794)	Alexander Tseung	2017-12-23	1	-6/+34
\| \| \| *	Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20	Chi Kei Chan	2017-12-21	1	-0/+4
\| \| \| \|\
\| \| \| \| *	Adds updateTransaction to background and used it to update after editing in s...	Dan	2017-12-21	1	-5/+4