Merge new release into master branch!

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.6.3
+ * SECURITY: Update ejs
+ * SECURITY: xss vulnerability when reading window.location.href
+ * SECURITY: sanitize jsonp
+ * NEW: Catch SIGTERM for graceful shutdown
+ * NEW: Show actual applied text formatting for caret position
+ * NEW: Add settings to improve scrolling of viewport on line changes
+
 # 1.6.2
  * NEW: Added pad shortcut disabling feature
  * NEW: Create option to automatically reconnect after a few seconds

bin/doc/package.json

@@ -7,7 +7,7 @@
     "node": ">=0.6.10"
   },
   "dependencies": {
-    "marked": "~0.1.9"
+    "marked": ">=0.3.6"
   },
   "devDependencies": {},
   "optionalDependencies": {},

settings.json.template

@@ -150,6 +150,34 @@
   /* Time (in seconds) to automatically reconnect pad when a "Force reconnect"
      message is shown to user. Set to 0 to disable automatic reconnection */
   "automaticReconnectionTimeout" : 0,
+  /*
+  * By default, when caret is moved out of viewport, it scrolls the minimum height needed to make this
+  * line visible.
+  */
+  "scrollWhenFocusLineIsOutOfViewport": {
+    /*
+    * Percentage of viewport height to be additionally scrolled.
+    * E.g use "percentage.editionAboveViewport": 0.5, to place caret line in the
+    * middle of viewport, when user edits a line above of the viewport
+    * Set to 0 to disable extra scrolling
+   */
+    "percentage": {
+      "editionAboveViewport": 0,
+      "editionBelowViewport": 0
+    },
+    /* Time (in milliseconds) used to animate the scroll transition. Set to 0 to disable animation */
+    "duration": 0,
+    /*
+    * Flag to control if it should scroll when user places the caret in the last line of the viewport
+    */
+    "scrollWhenCaretIsInTheLastLineOfViewport": false,
+    /*
+    * Percentage of viewport height to be additionally scrolled when user presses arrow up
+    * in the line of the top of the viewport.
+    * Set to 0 to let the scroll to be handled as default by the Etherpad
+   */
+    "percentageToScrollWhenUserPressesArrowUp": 0
+  },
 
   /* Users for basic authentication. is_admin = true gives access to /admin.
      If you do not uncomment this, /admin will not be available! */

src/locales/az.json

@@ -6,7 +6,8 @@
 			"Mushviq Abdulla",
 			"Wertuose",
 			"Mastizada",
-			"Archaeodontosaurus"
+			"Archaeodontosaurus",
+			"Neriman2003"
 		]
 	},
 	"index.newPad": "Yeni lövhə",
@@ -61,6 +62,8 @@
 	"pad.modals.connected": "Bağlandı.",
 	"pad.modals.reconnecting": "Sizin lövhə yenidən qoşulur..",
 	"pad.modals.forcereconnect": "Məcbur təkrarən bağlan",
+	"pad.modals.reconnecttimer": "Yenidən qoşulur",
+	"pad.modals.cancel": "Ləğv et",
 	"pad.modals.userdup": "Başqa pəncərədə artıq açıqdır",
 	"pad.modals.userdup.explanation": "Bu lövhə, ola bilsin ki, bu kompüterdəki brauzerin bir neçə pəncərəsində açılmışdır.",
 	"pad.modals.userdup.advice": "Bu pəncərəni istifadə etmək üçün yenidən qoşul.",

src/locales/diq.json

@@ -57,10 +57,11 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Teyna duz metini yana html formati şıma şenê azete dê. Dehana vêşi xısusiyetanê azere kerdışi rê grey <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord'i bar kerên</a>.",
+	"pad.importExport.abiword.innerHTML": "Şıma şenê tenya metınanê zelalan ya zi formatanê HTML-i biyarê. Seba vêşi xısusiyetanê arezekerdışi ra gırey <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord-i bar kerên</a>.",
 	"pad.modals.connected": "Gırediya.",
 	"pad.modals.reconnecting": "Bloknot da şıma rê fına irtibat kewê no",
 	"pad.modals.forcereconnect": "Mecbur anciya gırê de",
+	"pad.modals.reconnecttimer": "Anciya gırê beno",
 	"pad.modals.cancel": "Bıtexelne",
 	"pad.modals.userdup": "Zewbina pençere de bi a",
 	"pad.modals.userdup.explanation": "Ena bloknot ena komputer de yew ra zeder penceran dı akerde asena",

src/locales/es.json

@@ -38,7 +38,7 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "La cookie no se pudo encontrar. ¡Habilita las cookies en tu navegador!",
+	"pad.noCookie": "No se pudo encontrar la «cookie». Permite la utilización de «cookies» en el navegador.",
 	"pad.passwordRequired": "Necesitas una contraseña para acceder a este pad",
 	"pad.permissionDenied": "No tienes permiso para acceder a este pad",
 	"pad.wrongPassword": "La contraseña era incorrecta",

src/locales/fi.json

@@ -13,7 +13,8 @@
 			"Macofe",
 			"MrTapsa",
 			"Silvonen",
-			"Espeox"
+			"Espeox",
+			"Pyscowicz"
 		]
 	},
 	"index.newPad": "Uusi muistio",
@@ -68,6 +69,8 @@
 	"pad.modals.connected": "Yhdistetty.",
 	"pad.modals.reconnecting": "Muodostetaan yhteyttä muistioon uudelleen...",
 	"pad.modals.forcereconnect": "Pakota yhdistämään uudelleen",
+	"pad.modals.reconnecttimer": "Yritetään yhdistää uudelleen",
+	"pad.modals.cancel": "Peruuta",
 	"pad.modals.userdup": "Avattu toisessa ikkunassa",
 	"pad.modals.userdup.explanation": "Tämä muistio vaikuttaa olevan avoinna useammassa eri selainikkunassa tällä koneella.",
 	"pad.modals.userdup.advice": "Yhdistä uudelleen, jos haluat käyttää tätä ikkunaa.",

src/locales/fy.json

@@ -0,0 +1,43 @@
+{
+	"@metadata": {
+		"authors": [
+			"Robin van der Vliet"
+		]
+	},
+	"pad.toolbar.bold.title": "Fet (Ctrl+B)",
+	"pad.toolbar.italic.title": "Kursyf (Ctrl+I)",
+	"pad.toolbar.underline.title": "Understreekje (Ctrl+U)",
+	"pad.toolbar.settings.title": "Ynstellingen",
+	"pad.colorpicker.save": "Bewarje",
+	"pad.colorpicker.cancel": "Annulearje",
+	"pad.settings.fontType.normal": "Normaal",
+	"pad.settings.fontType.monospaced": "Monospace",
+	"pad.settings.language": "Taal:",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.modals.connected": "Ferbûn.",
+	"pad.modals.deleted": "Fuortsmiten.",
+	"pad.share.link": "Keppeling",
+	"timeslider.toolbar.authors": "Auteurs:",
+	"timeslider.toolbar.authorsList": "Gjin auteurs",
+	"timeslider.toolbar.exportlink.title": "Eksportearje",
+	"timeslider.version": "Ferzje {{version}}",
+	"timeslider.dateformat": "{{day}}-{{month}}-{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "jannewaris",
+	"timeslider.month.february": "febrewaris",
+	"timeslider.month.march": "maart",
+	"timeslider.month.april": "april",
+	"timeslider.month.may": "maaie",
+	"timeslider.month.june": "juny",
+	"timeslider.month.july": "july",
+	"timeslider.month.august": "augustus",
+	"timeslider.month.september": "septimber",
+	"timeslider.month.october": "oktober",
+	"timeslider.month.november": "novimber",
+	"timeslider.month.december": "desimber",
+	"pad.userlist.unnamed": "sûnder namme",
+	"pad.userlist.guest": "Gast",
+	"pad.userlist.deny": "Wegerje",
+	"pad.userlist.approve": "Goedkarre"
+}

src/locales/hi.json

@@ -0,0 +1,39 @@
+{
+	"@metadata": {
+		"authors": [
+			"Sfic"
+		]
+	},
+	"pad.toolbar.bold.title": "गहरा (Ctrl+B)",
+	"pad.toolbar.italic.title": "तिरछा (Ctrl+I)",
+	"pad.toolbar.strikethrough.title": "काटें (Ctrl+5)",
+	"pad.colorpicker.save": "सहेजें",
+	"pad.colorpicker.cancel": "रद्द करें",
+	"pad.loading": "लोड हो रहा है...",
+	"pad.settings.language": "भाषा:",
+	"pad.importExport.import_export": "आयात/निर्यात",
+	"pad.importExport.exportpdf": "पीडीएफ़",
+	"pad.modals.cancel": "रद्द करें",
+	"timeslider.toolbar.authors": "लेखक:",
+	"timeslider.toolbar.exportlink.title": "निर्यात",
+	"timeslider.version": "संस्करण {{version}}",
+	"timeslider.saved": "{{day}} {{month}} {{year}} सहेजा गया",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
+	"timeslider.month.january": "जनवरी",
+	"timeslider.month.february": "फ़रवरी",
+	"timeslider.month.march": "मार्च",
+	"timeslider.month.april": "अप्रैल",
+	"timeslider.month.may": "मई",
+	"timeslider.month.june": "जून",
+	"timeslider.month.july": "जुलाई",
+	"timeslider.month.august": "अगस्त",
+	"timeslider.month.september": "सितम्बर",
+	"timeslider.month.october": "अक्टूबर",
+	"timeslider.month.november": "नवम्बर",
+	"timeslider.month.december": "दिसम्बर",
+	"pad.userlist.guest": "अतिथि",
+	"pad.impexp.importbutton": "अभी आयात करें",
+	"pad.impexp.importing": "आयात कर रहा...",
+	"pad.impexp.importfailed": "आयात विफल हुआ",
+	"pad.impexp.copypaste": "कृपया कॉपी पेस्ट करें"
+}

src/locales/ja.json

@@ -3,7 +3,8 @@
 		"authors": [
 			"Shirayuki",
 			"Torinky",
-			"Omotecho"
+			"Omotecho",
+			"Aefgh39622"
 		]
 	},
 	"index.newPad": "新規作成",
@@ -54,7 +55,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、<a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword をインストール</a>してください。",
+	"pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、<a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">AbiWord をインストール</a>してください。",
 	"pad.modals.connected": "接続されました。",
 	"pad.modals.reconnecting": "パッドに再接続中...",
 	"pad.modals.forcereconnect": "強制的に再接続",

src/locales/krc.json

@@ -0,0 +1,41 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ernác"
+		]
+	},
+	"pad.toolbar.settings.title": "Джарашдырыула",
+	"pad.colorpicker.save": "Сакъла",
+	"pad.loading": "Джюклениу...",
+	"pad.settings.fontType.normal": "Нормал",
+	"pad.settings.fontType.monospaced": "Монокенгликли",
+	"pad.settings.globalView": "Глобал кёрюнюу",
+	"pad.settings.language": "Тил:",
+	"pad.importExport.import_export": "Импорт/экспорт",
+	"pad.importExport.importSuccessful": "Тыйыншлы!",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportplain": "Тюз текст",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (OpenOffice'ни документи)",
+	"pad.chat": "Чат",
+	"timeslider.toolbar.returnbutton": "Документге",
+	"timeslider.toolbar.authors": "Авторла:",
+	"timeslider.toolbar.exportlink.title": "Эспорт эт",
+	"timeslider.version": "{{version}} версия",
+	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}.{{minutes}}.{{seconds}}",
+	"timeslider.month.january": "январь",
+	"timeslider.month.february": "февраль",
+	"timeslider.month.march": "март",
+	"timeslider.month.april": "апрель",
+	"timeslider.month.may": "май",
+	"timeslider.month.june": "июнь",
+	"timeslider.month.july": "июль",
+	"timeslider.month.august": "август",
+	"timeslider.month.september": "сентябрь",
+	"timeslider.month.october": "октябрь",
+	"timeslider.month.november": "ноябрь",
+	"timeslider.month.december": "декабрь",
+	"pad.userlist.guest": "Къонакъ",
+	"pad.impexp.importing": "Импорт этиу…"
+}

src/locales/map-bms.json

@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"StefanusRA"
+			"StefanusRA",
+			"Empu"
 		]
 	},
 	"index.newPad": "Pad Anyar",
@@ -30,7 +31,7 @@
 	"pad.permissionDenied": "Rika ora duwe idin kanggo ngakses pad kiye",
 	"pad.wrongPassword": "Tembung sandhine Rika salah",
 	"pad.settings.padSettings": "Pangaturan Pad",
-	"pad.settings.myView": "Delengane Inyong",
+	"pad.settings.myView": "Delengané Inyong",
 	"pad.settings.stickychat": "Dopokan mesti nang layar",
 	"pad.settings.colorcheck": "Authorship colors",
 	"pad.settings.linenocheck": "Nomer baris",

src/locales/nah.json

@@ -0,0 +1,42 @@
+{
+	"@metadata": {
+		"authors": [
+			"Akapochtli",
+			"Taresi"
+		]
+	},
+	"index.newPad": "Yancuic Pad",
+	"index.createOpenPad": "auh xicchīhua/xictlapo cē Pad in ītōcā:",
+	"pad.toolbar.bold.title": "Tilāhuac (Ctrl+B)",
+	"pad.toolbar.italic.title": "Coltic (Ctrl+I)",
+	"pad.toolbar.underline.title": "Tlahuahuantli (Ctrl+U)",
+	"pad.toolbar.strikethrough.title": "Tlīlhuahuantli (Ctrl+5)",
+	"pad.toolbar.undo.title": "Xicmācuepa (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Occeppa (Ctrl+Y)",
+	"pad.toolbar.settings.title": "Tlatlālīliztli",
+	"pad.colorpicker.save": "Xicpiya",
+	"pad.colorpicker.cancel": "Xiccāhua",
+	"pad.settings.padSettings": "Pad Ītlatlālīliz",
+	"pad.settings.myView": "Notlachiyaliz",
+	"pad.settings.language": "Tlahtōlli:",
+	"pad.importExport.exportetherpad": "Etherpad",
+	"pad.importExport.exporthtml": "HTML",
+	"pad.importExport.exportword": "Microsoft Word",
+	"pad.importExport.exportpdf": "PDF",
+	"pad.importExport.exportopen": "ODF (Open Document Format)",
+	"pad.modals.deleted": "Omopohpoloh.",
+	"pad.modals.deleted.explanation": "Ōmopoloh inīn Pad.",
+	"timeslider.version": "Inīc {{version}} Cuepaliztli",
+	"timeslider.month.january": "Īccēmētztli",
+	"timeslider.month.february": "Īcōmemētztli",
+	"timeslider.month.march": "Īcyēyimētztli",
+	"timeslider.month.april": "Īcnāhuimētztli",
+	"timeslider.month.may": "Īcmācuīllimētztli",
+	"timeslider.month.june": "Īcchicuacemmētztli",
+	"timeslider.month.july": "Īcchicōmemētztli",
+	"timeslider.month.august": "Īcchicuēyimētztli",
+	"timeslider.month.september": "Īcchiucnāhuimētztli",
+	"timeslider.month.october": "Īcmahtlactlimētztli",
+	"timeslider.month.november": "Īcmahtlactlioncēmētztli",
+	"timeslider.month.december": "Īcmahtlactliomōmemētztli"
+}

src/locales/nb.json

@@ -56,7 +56,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">installer abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installer AbiWord</a>.",
 	"pad.modals.connected": "Tilkoblet.",
 	"pad.modals.reconnecting": "Kobler til din blokk på nytt...",
 	"pad.modals.forcereconnect": "Tving gjenoppkobling",