diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index 5015cc5a4..c49d6621e 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -4,6 +4,7 @@ var installer = require('ep_etherpad-lite/static/js/pluginfw/installer'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); var _ = require('underscore'); var semver = require('semver'); +var epVersion = require('ep_etherpad-lite/package.json').version; exports.expressCreateServer = function (hook_name, args, cb) { args.app.get('/admin/plugins', function(req, res) { @@ -17,7 +18,12 @@ exports.expressCreateServer = function (hook_name, args, cb) { }); args.app.get('/admin/plugins/info', function(req, res) { var gitCommit = settings.getGitCommit(); - res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", {gitCommit:gitCommit}) ); + res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", + { + gitCommit: gitCommit, + epVersion: epVersion + }) + ); }); } diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 536c088b2..07f5055c0 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -199,7 +199,6 @@ exports.getGitCommit = function() { var refPath = rootPath + "/.git/" + ref.substring(5, ref.indexOf("\n")); version = fs.readFileSync(refPath, "utf-8"); version = version.substring(0, 7); - console.log("Your Etherpad git version is " + version); } catch(e) { diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 1b328a894..5d39c3889 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -22,8 +22,9 @@
Version number: <%= epVersion %>
+Git sha: <%= gitCommit %>
<%- plugins.formatPlugins().replace(", ","\n") %>