mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' into improve_cookies

Browse source
This commit is contained in:
Stefan 2016-12-20 21:31:11 +01:00
commit aefa617797
63 changed files with 1191 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/node/hooks/express/adminsettings.js
View file

@ -30,7 +30,13 @@ exports.socketio = function (hook_name, args, cb) {
}
else
{
socket.emit("settings", {results: data});
//if showSettingsInAdminPage is set to false, then return NOT_ALLOWED in the result
if(settings.showSettingsInAdminPage === false) {
socket.emit("settings", {results:'NOT_ALLOWED'});
}
else {
socket.emit("settings", {results: data});
}
}
});
});

4
src/node/hooks/express/padreadonly.js
View file

@ -7,7 +7,7 @@ var exporthtml = require("../../utils/ExportHtml");
exports.expressCreateServer = function (hook_name, args, cb) {
//serve read only pad
args.app.get('/ro/:id', function(req, res)
{
{
var html;
var padId;
@ -40,7 +40,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
hasPadAccess(req, res, function()
{
//render the html document
exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html)
exporthtml.getPadHTMLDocument(padId, null, function(err, _html)
{
if(ERR(err, callback)) return;
html = _html;

7
src/node/hooks/express/specialpages.js
View file

@ -16,6 +16,13 @@ exports.expressCreateServer = function (hook_name, args, cb) {
res.send(eejs.require("ep_etherpad-lite/templates/index.html"));
});
//serve javascript.html
args.app.get('/javascript', function(req, res)
{
res.send(eejs.require("ep_etherpad-lite/templates/javascript.html"));
});
//serve robots.txt
args.app.get('/robots.txt', function(req, res)
{

2
src/node/hooks/i18n.js
View file

@ -5,7 +5,7 @@ var languages = require('languages4translatewiki')
, npm = require('npm')
, plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins.js').plugins
, semver = require('semver')
, existsSync = fs.statSync || fs.existsSync || path.existsSync
, existsSync = require('../utils/path_exists')
;