libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-21 23:09:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge new release into master branch!

Browse source
This commit is contained in:
muxator 2018-04-10 00:17:49 +02:00 committed by GitHub
commit 8c1020f7d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/locales/zh-hant.json
View file

@ -117,7 +117,7 @@
"timeslider.month.october": "10月", "timeslider.month.october": "10月",
"timeslider.month.november": "11月", "timeslider.month.november": "11月",
"timeslider.month.december": "12月", "timeslider.month.december": "12月",
"timeslider.unnamedauthors": "{{num}}匿名{[plural(num) 作者]}", "timeslider.unnamedauthors": "{{num}} 個匿名{[plural(num) one:作者, other:作者]}",
"pad.savedrevs.marked": "標記此修訂版本為已儲存修訂版本。", "pad.savedrevs.marked": "標記此修訂版本為已儲存修訂版本。",
"pad.savedrevs.timeslider": "您可使用時段滑標來查看先前保存的版本內容", "pad.savedrevs.timeslider": "您可使用時段滑標來查看先前保存的版本內容",
"pad.userlist.entername": "輸入您的姓名", "pad.userlist.entername": "輸入您的姓名",

2
src/node/hooks/express/apicalls.js
View file

@ -3,7 +3,7 @@ var apiLogger = log4js.getLogger("API");
var clientLogger = log4js.getLogger("client"); var clientLogger = log4js.getLogger("client");
var formidable = require('formidable'); var formidable = require('formidable');
var apiHandler = require('../../handler/APIHandler'); 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 //This is for making an api call, collecting all post information and passing it to the apiHandler
var apiCaller = function(req, res, fields) { var apiCaller = function(req, res, fields) {

2
src/package.json
View file

@ -55,6 +55,6 @@
"repository" : { "type" : "git", "repository" : { "type" : "git",
"url" : "http://github.com/ether/etherpad-lite.git" "url" : "http://github.com/ether/etherpad-lite.git"
}, },
"version" : "1.6.4", "version" : "1.6.5",
"license" : "Apache-2.0" "license" : "Apache-2.0"
} }

6
src/static/css/iframe_editor.css
View file

@ -33,7 +33,7 @@ body.grayedout { background-color: #eee !important }
#innerdocbody { #innerdocbody {
font-size: 16px; /* overridden by body.style */ font-size: 16px; /* overridden by body.style */
font-family:Arial, sans-serif; /* 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; background-color: white;
color: black; color: black;
} }
@ -62,11 +62,9 @@ body.doesWrap {
white-space: normal; white-space: normal;
} }
@-moz-document url-prefix() { body.doesWrap:not(.noprewrap) > div{
body.doesWrap:not(.noprewrap) > div{
/* Related to #1766 */ /* Related to #1766 */
white-space: pre-wrap; white-space: pre-wrap;
}
} }
#innerdocbody { #innerdocbody {

11
src/static/js/admin/plugins.js
View file

@ -79,12 +79,17 @@ $(document).ready(function () {
for (attr in plugin) { for (attr in plugin) {
if(attr == "name"){ // Hack to rewrite URLS into name if(attr == "name"){ // Hack to rewrite URLS into name
row.find(".name").html("<a target='_blank' title='Plugin details' href='https://npmjs.org/package/"+plugin['name']+"'>"+plugin['name'].substr(3)+"</a>"); // remove 'ep_' var link = $('<a>');
}else{ 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("." + attr).text(plugin[attr]);
} }
} }
row.find(".version").html( plugin.version ); row.find(".version").text(plugin.version);
row.addClass(plugin.name) row.addClass(plugin.name)
row.data('plugin', plugin.name) row.data('plugin', plugin.name)
container.append(row); container.append(row);