Frankie 5811f2ab14 Merge pull request #1051 from MetaMask/hotfix1048 ... hotfix - addNewAccount - dont assume hd keyring position		2017-01-24 13:38:24 -08:00
..
accounts	Implement naieve JSON file importing	2017-01-18 16:15:25 -08:00
components	Merge branch 'dev' into i715-AddJsonImport	2017-01-18 17:24:12 -08:00
css	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	2017-01-17 13:58:54 -08:00
first-time	Merge pull request #937 from MetaMask/i900-forgot-password-flow	2016-12-19 16:01:01 -08:00
img
keychains/hd	Redirect to seed word screen for forgotten passwords.	2016-12-19 14:54:24 -08:00
reducers	Add ability to import v3 JSON wallets	2017-01-18 16:45:39 -08:00
account-detail.js	remove orphaned comment	2017-01-13 11:30:58 -08:00
actions.js	Merge pull request #1051 from MetaMask/hotfix1048	2017-01-24 13:38:24 -08:00
app.js	Add ability to import v3 JSON wallets	2017-01-18 16:45:39 -08:00
conf-tx.js	Fix message signing UI rendering	2017-01-16 23:59:25 -08:00
config.js	Lint.	2016-12-20 16:45:22 -08:00
conversion.json	Convert conversion util to pure json.	2016-11-18 16:49:39 -08:00
info.js	Fix test to log out despite number of menu items	2017-01-17 16:49:08 -08:00
new-keychain.js	Linted & added salting to vault	2016-10-20 11:33:18 -07:00
reducers.js	Linting to the max.	2016-11-11 10:26:12 -08:00
root.js
send.js	Fix up wording	2016-10-19 17:39:41 -07:00
settings.js
store.js
template.js
unlock.js	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	2017-01-17 13:58:54 -08:00
util.js	Change regex in isHex function	2016-10-21 16:39:14 -07:00