Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-29 01:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-07-25 12:28:43 -04:00
parent 36e02780fe e9639833c5
commit 84c1a182e5
177 changed files with 645 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/index.js
View File

@@ -159,7 +159,7 @@ Controllers.login = function (req, res, next) {
return next(err);
}
data.username = allowLoginWith === 'email' ? user.email : user.username;
data.alternate_logins = [];
data.alternate_logins = false;
res.render('login', data);
});
} else {