krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade ESLint to v3 (#8299)

Browse Source 
* upgraded habitrpg-eslint-config to v2 and eslint to v3

* adapt to eslint3 rules

* update shrinkwrap

* update shrinkwrap again
This commit is contained in:
Matteo Pagliazzi
2016-12-20 22:31:36 +01:00
committed by GitHub
parent 3f96d05365
commit 92cbb4a07d
25 changed files with 247 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/server/controllers/api-v3/auth.js
View File

@@ -534,14 +534,16 @@ api.resetPassword = {
from: 'Habitica <admin@habitica.com>',
to: email,
subject: res.t('passwordResetEmailSubject'),
text: res.t('passwordResetEmailText', { username: user.auth.local.username,
newPassword,
baseUrl: nconf.get('BASE_URL'),
}),
html: res.t('passwordResetEmailHtml', { username: user.auth.local.username,
newPassword,
baseUrl: nconf.get('BASE_URL'),
}),
text: res.t('passwordResetEmailText', {
username: user.auth.local.username,
newPassword,
baseUrl: nconf.get('BASE_URL'),
}),
html: res.t('passwordResetEmailHtml', {
username: user.auth.local.username,
newPassword,
baseUrl: nconf.get('BASE_URL'),
}),
});
await user.save();