Dan Finlay 352bb5cb39 Merge branch 'master' into dev

2017-02-15 15:49:04 -08:00

..

account-import-strategies

Add ability to import v3 JSON wallets

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

keyrings

got hash test passing

2017-02-13 21:25:02 -08:00

lib

Merge branch 'dev' into disclaimer-notify

2017-02-09 19:04:17 -08:00

migrations

Made migrations non-destructive; fixed currency migration.

2017-02-15 11:14:53 -08:00

background.js

Clean up message manger includes:

2017-01-28 20:28:20 -08:00

chromereload.js

Fix console.error references

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

config.js

Delete all code related to disclaimers.

2017-02-09 18:17:50 -08:00

contentscript.js

Linting to the max.

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

first-time-state.js

background - move pojo migrator to outside of metamask controller

2017-01-11 22:47:56 -08:00

inpage.js

inpage - set web3.eth.defaultAccount correctly

2017-01-30 15:38:32 -08:00

keyring-controller.js

keyring - replace getState with memStore

2017-02-02 17:07:52 -08:00

metamask-controller.js

Merge branch 'dev' into disclaimer-notify

2017-02-09 19:04:17 -08:00

notice-controller.js

Fix bugs with notice. Add disclaimer notice.

2017-02-09 17:47:51 -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

txManager - depend on preferencesStore

2017-02-02 21:09:17 -08:00