diff --git a/ChangeLog.md b/ChangeLog.md index a4fb519c..b1cf60b8 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,13 @@ +Version 1.5.2, December 14th, 2015 +================================= + +- Fixes an authentication bug on 1.5.1 (#120) + +Version 1.5.1, December 12th, 2015 +================================= + +DO NOT USE THIS VERSION + Version 1.5.0, December 12th, 2015 ================================= diff --git a/jingo b/jingo index 9d48a25c..fdfe6af6 100755 --- a/jingo +++ b/jingo @@ -17,7 +17,7 @@ var program = require('commander'), global.Git = require('./lib/gitmech'); -program.version('1.5.1') +program.version('1.5.2') .option('-c, --config ', 'Specify the config file') .option('-#, --hash-string ', 'Create an hash for a string') .option('-l, --local', 'Listen on localhost only') diff --git a/package.json b/package.json index 1a9db459..1606edbb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jingo", - "version": "1.5.1", + "version": "1.5.2", "description": "A nodejs based wiki engine", "author": "Claudio Cicali ", "keywords": [ diff --git a/routes/auth.js b/routes/auth.js index d9639b16..fd2798cb 100644 --- a/routes/auth.js +++ b/routes/auth.js @@ -152,8 +152,6 @@ function _getAuthDone(req, res) { return; } -res.locals.user.email = 'jingouser'; - if (!auth.alone.used && !auth.local.used && !tools.isAuthorized(res.locals.user.email,