Dan Finlay 9f1884145a Merge branch 'dev' into i715-AddJsonImport

2017-01-18 17:24:12 -08:00

..

account-import-strategies

Add ability to import v3 JSON wallets

2017-01-18 16:45:39 -08:00

keyrings

Allow importing of private key strings

2017-01-17 16:24:45 -08:00

lib

Merge branch 'dev' into conversion-api-err

2017-01-17 12:08:47 -08:00

migrations

Auto linted

2016-06-21 13:18:32 -07:00

background.js

background - txManager - filter txs by network

2017-01-14 21:29:46 -08:00

chromereload.js

Fix console.error references

2016-08-29 17:32:39 -07:00

config.js

Remove morden testnet provider

2016-12-15 16:12:03 -08:00

contentscript.js

Linting to the max.

2016-11-11 10:26:12 -08:00

inpage.js

Merged master into dev

2016-12-19 13:37:27 -08:00

keyring-controller.js

Allow importing of private key strings

2017-01-17 16:24:45 -08:00

metamask-controller.js

Added new modular private key import system

2017-01-18 15:20:48 -08:00

notice-controller.js

Lint.

2016-12-20 16:45:22 -08:00

popup-core.js

Linting to the max.

2016-11-11 10:26:12 -08:00

popup.js

Linting to the max.

2016-11-11 10:26:12 -08:00

transaction-manager.js

Merge branch 'master' into Version-3.1.0

2017-01-18 12:25:35 -08:00