Kevin Serrano 16ba2e6a30 Merge branch 'master' into new-currency-test		2017-09-26 09:51:20 -07:00
..
account-import-strategies	Fix linting warnings	2017-04-26 21:05:45 -07:00
controllers	Comply with current currency API and add additional styling.	2017-09-18 16:09:01 -07:00
lib	Do not mark a retry tx failed that has been broadcast successfully	2017-09-18 14:34:25 -07:00
migrations	Make method return a number	2017-08-23 23:24:01 -07:00
platforms	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
background.js	debug - prefer logger over console	2017-09-13 10:28:29 -07:00
chromereload.js	Fix console.error references	2016-08-29 17:32:39 -07:00
config.js	ui - buy eth - formatting and moved network names to config	2017-08-09 12:25:38 -07:00
contentscript.js	contentscript - fix obj-multiplex instantiation and use pump for streams	2017-09-11 14:30:30 -07:00
first-time-state.js	default testnet - fix typo	2017-06-12 13:46:56 -07:00
inpage.js	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
keyring-controller.js	Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.	2017-09-21 15:47:25 -07:00
metamask-controller.js	Define encryptor in constructor params instead of platform object	2017-09-22 13:25:08 -07:00
notice-controller.js	Remove notice body after reading.	2017-03-23 09:58:57 -04:00
popup-core.js	deps - use stream-subprovider from provider-engine	2017-05-22 15:59:07 -07:00
popup.js	Fix linting warnings	2017-04-26 21:05:45 -07:00