From fba2bf4df907895f65356b5c8da84571c8ebddef Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 7 Apr 2018 17:50:45 +0100 Subject: [PATCH 1/6] Update iframe_editor.css --- src/static/css/iframe_editor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index 757bfa964..36e0b2da9 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -33,7 +33,7 @@ body.grayedout { background-color: #eee !important } #innerdocbody { font-size: 16px; /* overridden by body.style */ font-family:Arial, sans-serif; /* overridden by body.style */ - line-height: 16px; /* overridden by body.style */ + line-height: 22px; /* overridden by body.style */ background-color: white; color: black; } From b16e7ad25ead5f1dbed4664ecb85756622013ec9 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 7 Apr 2018 18:11:24 +0100 Subject: [PATCH 2/6] unbreak Safari iOS line wrapping fixes https://github.com/ether/etherpad-lite/commit/f5810957b4204d06563485953e3efeb1392304c2#diff-f639eb4efeaabf5624f3229daa1e88cd --- src/static/css/iframe_editor.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index 36e0b2da9..0286a5df8 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -62,11 +62,9 @@ body.doesWrap { white-space: normal; } -@-moz-document url-prefix() { - body.doesWrap:not(.noprewrap) > div{ - /* Related to #1766 */ - white-space: pre-wrap; - } +body.doesWrap:not(.noprewrap) > div{ + /* Related to #1766 */ + white-space: pre-wrap; } #innerdocbody { From 1fdb01fd759133b4da001dc5e233420a14cd8d59 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 9 Apr 2018 08:17:36 +0200 Subject: [PATCH 3/6] Localisation updates from https://translatewiki.net. --- src/locales/zh-hant.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/zh-hant.json b/src/locales/zh-hant.json index 175918843..2a7d6d1ef 100644 --- a/src/locales/zh-hant.json +++ b/src/locales/zh-hant.json @@ -117,7 +117,7 @@ "timeslider.month.october": "10月", "timeslider.month.november": "11月", "timeslider.month.december": "12月", - "timeslider.unnamedauthors": "{{num}}匿名{[plural(num) 作者]}", + "timeslider.unnamedauthors": "{{num}} 個匿名{[plural(num) one:作者, other:作者]}", "pad.savedrevs.marked": "標記此修訂版本為已儲存修訂版本。", "pad.savedrevs.timeslider": "您可使用時段滑標來查看先前保存的版本內容", "pad.userlist.entername": "輸入您的姓名", From 5b1e1f0c3556af3315d73edf9163cb528047fe28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20T=C3=A9tard?= Date: Sat, 7 Apr 2018 16:07:38 +0200 Subject: [PATCH 4/6] Fix typo in `apicalls.js` which prevents from importing `isValidJSONPName`. --- src/node/hooks/express/apicalls.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/hooks/express/apicalls.js b/src/node/hooks/express/apicalls.js index e07bbb0be..d6011c97f 100644 --- a/src/node/hooks/express/apicalls.js +++ b/src/node/hooks/express/apicalls.js @@ -3,7 +3,7 @@ var apiLogger = log4js.getLogger("API"); var clientLogger = log4js.getLogger("client"); var formidable = require('formidable'); var apiHandler = require('../../handler/APIHandler'); -var isValidJSONPName = require('./isValidJsonPName'); +var isValidJSONPName = require('./isValidJSONPName'); //This is for making an api call, collecting all post information and passing it to the apiHandler var apiCaller = function(req, res, fields) { From 92eee85f3619a1c0593391bb5dfc57a039b9a4ad Mon Sep 17 00:00:00 2001 From: nashe Date: Mon, 9 Apr 2018 22:08:43 +0200 Subject: [PATCH 5/6] Escape data when listing available plugins --- src/static/js/admin/plugins.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 3f88d9b11..c9a244871 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -79,12 +79,17 @@ $(document).ready(function () { for (attr in plugin) { if(attr == "name"){ // Hack to rewrite URLS into name - row.find(".name").html(""+plugin['name'].substr(3)+""); // remove 'ep_' - }else{ + var link = $(''); + link.attr('href', 'https://npmjs.org/package/'+plugin['name']); + link.attr('plugin', 'Plugin details'); + link.attr('target', '_blank'); + link.text(plugin['name'].substr(3)); + row.find('.name').append(link); + } else { row.find("." + attr).text(plugin[attr]); } } - row.find(".version").html( plugin.version ); + row.find(".version").text(plugin.version); row.addClass(plugin.name) row.data('plugin', plugin.name) container.append(row); From c9b090bdeede6a9f6d97bc0c726b51a2e5caf939 Mon Sep 17 00:00:00 2001 From: muxator Date: Tue, 10 Apr 2018 00:17:34 +0200 Subject: [PATCH 6/6] Release version 1.6.5 --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index bf2f8858c..9813d6ab9 100644 --- a/src/package.json +++ b/src/package.json @@ -55,6 +55,6 @@ "repository" : { "type" : "git", "url" : "http://github.com/ether/etherpad-lite.git" }, - "version" : "1.6.4", + "version" : "1.6.5", "license" : "Apache-2.0" }