diff --git a/ChangeLog.md b/ChangeLog.md index 8e593910..1fb9d814 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,9 @@ +Version 1.6.1, January 27th, 2016 +================================== + +- Fixes #132 (crash on empty repos) +- Renames an img so to not have problems with AdBlock + Version 1.6.0, December 28th, 2015 ================================== diff --git a/jingo b/jingo index 463c5687..b3fbe66c 100755 --- a/jingo +++ b/jingo @@ -17,7 +17,7 @@ var program = require("commander"), global.Git = require("./lib/gitmech"); -program.version("1.6.0") +program.version("1.6.1") .option("-c, --config ", "Specify the config file") .option("-#, --hash-string ", "Create an hash for a string") .option("-l, --local", "Listen on localhost only") @@ -63,7 +63,7 @@ Git.setup(config.get("application").git, if (os.platform() == "darwin" && !config.get("application").skipGitCheck && - config.get("pages").title.fromFilename && + config.get("pages").title.fromFilename && !semver.satisfies(version, ">=1.8.5")) { console.log("Your current setup uses the filename of the wiki page as the page title."); console.log("Unfortunately this version of git (" + version + ".x) on OSX doesn't handle"); diff --git a/lib/gitmech.js b/lib/gitmech.js index 56e25879..6c0f801b 100644 --- a/lib/gitmech.js +++ b/lib/gitmech.js @@ -285,7 +285,8 @@ var gitMech = { hashes: function (path, howMany, callback) { gitSpawn(["log", "-" + howMany, "--reverse", "--no-notes", "--pretty=format:%h", "--", docSubdir + path], function (err, data) { - callback(null, data.toString().split("\n")); + var result = (data && !err) ? data.toString().split("\n") : []; + callback(err, result); }); }, diff --git a/package.json b/package.json index a0d98c0d..c9d37044 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jingo", - "version": "1.6.0", + "version": "1.6.1", "description": "A nodejs based wiki engine", "author": "Claudio Cicali ", "keywords": [ diff --git a/public/css/style.css b/public/css/style.css index e673375a..a35864c5 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -601,7 +601,7 @@ li { } a.btn-auth { - background-image: url(../img/social-logins.png); + background-image: url(../img/login-providers.png); background-repeat: no-repeat; display: block; height: 5rem; diff --git a/public/img/social-logins.png b/public/img/login-providers.png similarity index 100% rename from public/img/social-logins.png rename to public/img/login-providers.png