Dan Finlay bd117d6b71 Merge branch 'master' into ConfigurableEncryption

2017-09-21 15:56:24 -07:00

..

account-import-strategies

…

controllers

Fail transactions after a day of retries

2017-08-23 22:29:08 -07:00

lib

Do not mark a retry tx failed that has been broadcast successfully

2017-09-18 14:34:25 -07:00

migrations

Make method return a number

2017-08-23 23:24:01 -07:00

platforms

…

background.js

debug - prefer logger over console

2017-09-13 10:28:29 -07:00

chromereload.js

…

config.js

…

contentscript.js

contentscript - fix obj-multiplex instantiation and use pump for streams

2017-09-11 14:30:30 -07:00

first-time-state.js

…

inpage.js

…

keyring-controller.js

Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.

2017-09-21 15:47:25 -07:00

metamask-controller.js

Merge branch 'master' into ConfigurableEncryption

2017-09-21 15:56:24 -07:00

notice-controller.js

…

popup-core.js

…

popup.js

…