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

This commit is contained in:
Julian Lam
2018-02-23 14:48:38 -05:00
453 changed files with 1073 additions and 513 deletions

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]]',