Kevin Serrano e66035254f More conflict resolution.		2017-03-01 10:04:25 -08:00
..
accounts	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00
components	Add reset button to reset gas fields.	2017-02-28 16:36:05 -08:00
css	Improve pending tx blue dot style	2017-02-23 17:45:37 -08:00
first-time	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
img	Moved UI into repo with its own dependency stack	2016-04-13 15:28:44 -07:00
keychains/hd	Redirect to seed word screen for forgotten passwords.	2016-12-19 14:54:24 -08:00
reducers	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
account-detail.js	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 13:05:58 -08:00
actions.js	More conflict resolution.	2017-03-01 10:04:25 -08:00
app.js	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
conf-tx.js	Use correct action to update and submit tx	2017-02-28 14:45:21 -08:00
config.js	Connect to actions.	2017-02-21 12:51:56 -08:00
conversion.json	Convert conversion util to pure json.	2016-11-18 16:49:39 -08:00
info.js	Fix test to log out despite number of menu items	2017-01-17 16:49:08 -08:00
new-keychain.js	Linted & added salting to vault	2016-10-20 11:33:18 -07:00
reducers.js	Linting to the max.	2016-11-11 10:26:12 -08:00
root.js	Manually linted	2016-06-21 13:56:04 -07:00
send.js	Linted	2017-02-28 14:13:58 -08:00
settings.js	Add eth classic to provider menu	2016-07-28 10:53:51 -07:00
store.js	Move tos hash logic to build phase. Create dynamic global variables based on build.	2016-10-11 14:32:03 -07:00
template.js	Manually linted	2016-06-21 13:56:04 -07:00
unlock.js	Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu	2017-01-17 13:58:54 -08:00
util.js	Change regex in isHex function	2016-10-21 16:39:14 -07:00