Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-05 22:29:13 +02: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
2018-02-23 14:48:38 -05:00
parent d8b86dc850 d65ce41879
commit c25d752573
453 changed files with 1073 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/edit.js
View File

@@ -89,7 +89,7 @@ function renderRoute(name, req, res, next) {
if (name === 'password') {
userData.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10);
userData.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 0, 10);
userData.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 1, 10);
}
userData.title = '[[pages:account/edit/' + name + ', ' + userData.username + ']]';

13
src/controllers/admin/plugins.js
View File

@@ -33,11 +33,18 @@ pluginsController.get = function (req, res, next) {
var compatiblePkgNames = payload.compatible.map(function (pkgData) {
return pkgData.name;
});
var installedPlugins = payload.compatible.filter(function (plugin) {
return plugin && plugin.installed;
});
var activePlugins = payload.all.filter(function (plugin) {
return plugin && plugin.installed && plugin.active;
});
res.render('admin/extend/plugins', {
installed: payload.compatible.filter(function (plugin) {
return plugin.installed;
}),
installed: installedPlugins,
installedCount: installedPlugins.length,
activeCount: activePlugins.length,
inactiveCount: Math.max(0, installedPlugins.length - activePlugins.length),
upgradeCount: payload.compatible.reduce(function (count, current) {
if (current.installed && current.outdated) {
count += 1;

2
src/controllers/index.js
View File

@@ -166,7 +166,7 @@ Controllers.register = function (req, res, next) {
data.minimumUsernameLength = parseInt(meta.config.minimumUsernameLength, 10);
data.maximumUsernameLength = parseInt(meta.config.maximumUsernameLength, 10);
data.minimumPasswordLength = parseInt(meta.config.minimumPasswordLength, 10);
data.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 0, 10);
data.minimumPasswordStrength = parseInt(meta.config.minimumPasswordStrength || 1, 10);
data.termsOfUse = termsOfUse.postData.content;
data.breadcrumbs = helpers.buildBreadcrumbs([{
text: '[[register:register]]',