Roman Rodov f6f7798828

Resolve merge conflicts for currency sort merge.

2017-09-18 11:51:17 -07:00

..

accounts/import

Replace ui with responsive-ui

2017-07-24 17:05:07 -07:00

components

Merge branch 'master' into fix-tooltip

2017-09-18 11:20:00 -07:00

css

Readd loose label onto accounts.

2017-08-09 17:40:01 -07:00

first-time

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

img

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

keychains/hd

Add ability to save seed words as file.

2017-09-11 16:48:02 -07:00

reducers

lint fixes

2017-08-03 14:48:19 -07:00

account-detail.js

ReEnable Token List

2017-08-16 09:49:18 -07:00

actions.js

Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved

2017-09-07 13:20:14 -07:00

add-token.js

Fix typo.

2017-09-07 18:01:39 -07:00

app.js

Resolve merge conflict from master

2017-09-05 09:03:44 -07:00

conf-tx.js

Show reject all only when tx count is > 1

2017-09-11 14:12:35 -07:00

config.js

Resolve merge conflicts for currency sort merge.

2017-09-18 11:51:17 -07:00

conversion.json

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

info.js

Fix support link

2017-09-12 15:07:08 -07:00

infura-conversion.json

Modify conversion to new api.

2017-09-14 09:14:57 -07:00

new-keychain.js

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

reducers.js

Add version to state logs

2017-08-29 11:42:44 -07:00

root.js

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

send.js

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

settings.js

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

store.js

Updated commonjs require path for redux-logger and redux-thunk modules

2017-08-08 14:15:45 -07:00

template.js

Move responsive ui into its own folder for easier merges

2017-07-20 12:38:38 -07:00

unlock.js

Reword forgot password to restore seed phrase

2017-09-07 15:27:40 -07:00

util.js

Move function as util function.

2017-09-11 16:22:20 -07:00