Frankie 97ea7454b3 Merge branch 'master' into networkController		2017-05-23 20:36:11 -04:00
..
account-import-strategies	Fix linting warnings	2017-04-26 21:05:45 -07:00
controllers	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
lib	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
migrations	Add a migration for the network controller	2017-05-23 01:55:20 -04:00
platforms	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
background.js	Rename tx manager to tx controller	2017-05-16 10:35:28 -07:00
chromereload.js	Fix console.error references	2016-08-29 17:32:39 -07:00
config.js	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
contentscript.js	Fix linting warnings	2017-04-26 21:05:45 -07:00
first-time-state.js	Fix for tests	2017-05-23 19:49:57 -04:00
inpage.js	inpage - set web3.eth.defaultAccount correctly	2017-01-30 15:38:32 -08:00
keyring-controller.js	Wrap the provider in a proxy	2017-05-23 01:56:10 -04:00
metamask-controller.js	include ethQuery in txController	2017-05-23 20:06:19 -04: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