Chi Kei Chan 687d2f755d Fix css merge conflicts

2017-09-07 11:25:31 -07:00

..

accounts/import

Replace ui with responsive-ui

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

components

Fix css merge conflicts

2017-09-07 11:25:31 -07:00

css

Fix css merge conflicts

2017-09-07 11:25:31 -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

Limit max width of seed word conf screen

2017-07-27 18:32:32 -07:00

reducers

Use ternary operator instead of two conditionals.

2017-09-07 10:25:56 -07:00

account-and-transaction-details.js

Lint fixes

2017-08-31 04:16:07 -07:00

account-detail.js

Lint fixes

2017-08-31 04:16:07 -07:00

actions.js

Show confirm transaction screen when clicking a pending transaction in the list.

2017-09-07 10:25:56 -07:00

add-token.js

Isolate routing logic for isUnlocked, remove stray logs

2017-08-03 00:01:38 -07:00

app.js

Send Token screen partial UI

2017-09-07 04:24:03 -07:00

conf-tx.js

Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content..

2017-09-04 18:46:14 -07:00

config.js

Move responsive ui into its own folder for easier merges

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

conversion.json

Move responsive ui into its own folder for easier merges

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

info.js

Restore support link

2017-07-27 14:00:09 -07:00

main-container.js

Lint fixes

2017-08-31 04:16:07 -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

Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial

2017-08-03 15:05:32 -07:00

root.js

Move responsive ui into its own folder for easier merges

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

selectors.js

Add Contract Tx List Item; Update Token Tx on select

2017-09-07 03:14:53 -07:00

send.js

Use .entries() instead of .keys(), and use more destructuring, for simpler code.

2017-09-05 13:00:50 -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

Merge branch 'NewUI' into feat/mm-ui-5-merged

2017-08-06 20:24:04 -07:00

util.js

Lint fixes

2017-08-31 04:16:07 -07:00