Dan Finlay ed8a71d350 Merge branch 'master' into NewUI		2017-07-05 15:49:51 -07:00
..
account-import-strategies	Fix linting warnings	2017-04-26 21:05:45 -07:00
controllers	Merge pull request #1620 from MetaMask/i1616-AddTokenAdding	2017-06-28 10:07:49 -07:00
lib	Linting	2017-06-12 11:08:32 -07:00
migrations	Create a migration for setting tx's with the message 'Gave up submitting tx.' as failed	2017-06-27 15:09:07 -07:00
platforms	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
background.js	Began creating new UI template	2017-07-03 13:48:18 -07:00
chromereload.js
config.js	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
contentscript.js	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
first-time-state.js	default testnet - fix typo	2017-06-12 13:46:56 -07:00
inpage.js	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
keyring-controller.js	Fix error message for invalid seed words.	2017-06-26 16:14:35 -07:00
metamask-controller.js	metamask - append dapp origin domain to rpc request	2017-07-04 12:48:00 -07:00
notice-controller.js
popup-core.js	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
popup.js	Get duplicate UI template working	2017-07-03 16:16:53 -07:00
responsive-core.js	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
responsive.js	Get duplicate UI template working	2017-07-03 16:16:53 -07:00