ether · Gared · Mar 15, 2015 · Jan 25, 2015 · Jan 26, 2015 · Jan 26, 2015
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 1.5.2
+ * NEW: Support for node version 0.12.x
+ * NEW: API endpoint saveRevision, getSavedRevisionCount and listSavedRevisions
+ * NEW: setting to allow load testing
+ * Fix: Rare scroll issue
+ * Fix: Handling of custom pad path
+ * Fix: Better error handling of imports and exports of type "etherpad"
+ * Fix: Walking caret in chrome
+ * Fix: Better handling for changeset problems
+ * SECURITY Fix: Information leak for etherpad exports (CVE-2015-2298)
+
 # 1.5.1
  * NEW: High resolution Icon
  * NEW: Use HTTPS for plugins.json download

diff --git a/README.md b/README.md
@@ -50,8 +50,8 @@ Update to the latest version with `git pull origin`, then run `bin\installOnWind
 
 ## GNU/Linux and other UNIX-like systems
 You'll need gzip, git, curl, libssl develop libraries, python and gcc.  
-- *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`  
-- *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
+- *For Debian/Ubuntu*: `apt-get install gzip git curl python libssl-dev pkg-config build-essential`  
+- *For Fedora/CentOS*: `yum install gzip git curl python openssl-devel && yum groupinstall "Development Tools"`
 - *For FreeBSD*: `portinstall node, npm, git (optional)`
 
 Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, we recommend installing/compiling nodejs from source (avoiding apt).

diff --git a/bin/installDeps.sh b/bin/installDeps.sh
@@ -50,9 +50,9 @@ NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2)
 if hash iojs 2>/dev/null; then
   IOJS_VERSION=$(iojs --version)
 fi
-if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ]; then
+if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.10" ] && [ ! $NODE_V_MINOR = "v0.11" ] && [ ! $NODE_V_MINOR = "v0.12" ]; then
   if [ ! $IOJS_VERSION ]; then
-    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v0.8.x, v0.10.x or v0.11.x" >&2
+    echo "You're running a wrong version of node, or io.js is not installed. You're using $NODE_VERSION, we need v0.8.x, v0.10.x, v0.11.x or v0.12.x" >&2
     exit 1
   fi
 fi

diff --git a/doc/api/hooks_client-side.md b/doc/api/hooks_client-side.md
@@ -203,6 +203,29 @@ Things in context:
 
 This hook is called before the content of a node is collected by the usual methods. The cc object can be used to do a bunch of things that modify the content of the pad. See, for example, the heading1 plugin for etherpad original.
 
+## collectContentImage
+Called from: src/static/js/contentcollector.js
+
+Things in context:
+
+1. cc - the contentcollector object
+2. state - the current state of the change being made
+3. tname - the tag name of this node currently being processed
+4. style - the style applied to the node (probably CSS)
+5. cls - the HTML class string of the node
+6. node - the node being modified
+
+This hook is called before the content of an image node is collected by the usual methods. The cc object can be used to do a bunch of things that modify the content of the pad.
+
+Example:
+
+```
+exports.collectContentImage = function(name, context){
+  context.state.lineAttributes.img = context.node.outerHTML;
+}
+
+```
+
 ## collectContentPost
 Called from: src/static/js/contentcollector.js
 

diff --git a/doc/api/http_api.md b/doc/api/http_api.md
@@ -61,7 +61,7 @@ Portal submits content into new blog post
 ## Usage
 
 ### API version
-The latest version is `1.2.9`
+The latest version is `1.2.11`
 
 The current version can be queried via /api.
 
@@ -402,6 +402,33 @@ returns the number of revisions of this pad
   * `{code: 0, message:"ok", data: {revisions: 56}}`
   * `{code: 1, message:"padID does not exist", data: null}`
 
+#### getSavedRevisionsCount(padID)
+ * API >= 1.2.11
+
+returns the number of saved revisions of this pad
+
+*Example returns:*
+  * `{code: 0, message:"ok", data: {savedRevisions: 42}}`
+  * `{code: 1, message:"padID does not exist", data: null}`
+
+#### listSavedRevisions(padID)
+ * API >= 1.2.11
+
+returns the list of saved revisions of this pad
+
+*Example returns:*
+  * `{code: 0, message:"ok", data: {savedRevisions: [2, 42, 1337]}}`
+  * `{code: 1, message:"padID does not exist", data: null}`
+
+#### saveRevision(padID [, rev])
+ * API >= 1.2.11
+
+saves a revision
+
+*Example returns:*
+  * `{code: 0, message:"ok", data: null}`
+  * `{code: 1, message:"padID does not exist", data: null}`
+
 #### padUsersCount(padID)
  * API >= 1
 

diff --git a/settings.json.template b/settings.json.template
@@ -108,6 +108,9 @@
 
   // restrict socket.io transport methods
   "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"],
+
+  // Allow Load Testing tools to hit the Etherpad Instance.  Warning this will disable security on the instance.
+  "loadTest": false,
 
   /* The toolbar buttons configuration.
   "toolbar": {

diff --git a/src/locales/ar.json b/src/locales/ar.json
@@ -4,7 +4,8 @@
 			"Ali1",
 			"Tux-tn",
 			"Alami",
-			"Meno25"
+			"Meno25",
+			"Test Create account"
 		]
 	},
 	"index.newPad": "باد جديد",
@@ -29,6 +30,7 @@
 	"pad.colorpicker.save": "تسجيل",
 	"pad.colorpicker.cancel": "إلغاء",
 	"pad.loading": "جاري التحميل...",
+	"pad.noCookie": "الكوكيز غير متاحة. الرجاء السماح بتحميل الكوكيز على متصفحك!",
 	"pad.passwordRequired": "تحتاج إلى كلمة مرور للوصول إلى هذا الباد",
 	"pad.permissionDenied": "ليس لديك إذن لدخول هذا الباد",
 	"pad.wrongPassword": "كانت كلمة المرور خاطئة",
@@ -118,6 +120,7 @@
 	"pad.impexp.importing": "الاستيراد...",
 	"pad.impexp.confirmimport": "استيراد ملف سيؤدي للكتابة فوق النص الحالي بالباد. هل أنت متأكد من أنك تريد المتابعة؟",
 	"pad.impexp.convertFailed": "لم نتمكن من استيراد هذا الملف. يرجى استخدام تنسيق مستند مختلف، أو النسخ واللصق يدوياً",
+	"pad.impexp.padHasData": "لا يمكننا استيراد هذا الملف لأن هذه اللوحة تم بالفعل تغييره, الرجاء استيراد لوحة جديد",
 	"pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى",
 	"pad.impexp.importfailed": "فشل الاستيراد",
 	"pad.impexp.copypaste": "الرجاء نسخ/لصق",

diff --git a/src/locales/awa.json b/src/locales/awa.json
@@ -0,0 +1,69 @@
+{
+	"@metadata": {
+		"authors": [
+			"1AnuraagPandey"
+		]
+	},
+	"index.newPad": "नयाँ प्याड",
+	"pad.toolbar.bold.title": "मोट (Ctrl-B)",
+	"pad.toolbar.italic.title": "तिरछा (Ctrl+I)",
+	"pad.toolbar.underline.title": "निम्न रेखाङ्कन (Ctrl-U)",
+	"pad.toolbar.indent.title": "इन्डेन्ट (TAB)",
+	"pad.toolbar.unindent.title": "आउटडेन्ट (Shift+TAB)",
+	"pad.toolbar.undo.title": "रद्द (Ctrl-Z)",
+	"pad.toolbar.redo.title": "पुन:लागु (Ctrl-Y)",
+	"pad.toolbar.timeslider.title": "टाइमस्लाइडर",
+	"pad.toolbar.savedRevision.title": "पुनरावलोकन संग्रह किहा जाय",
+	"pad.toolbar.settings.title": "सेटिङ्ग",
+	"pad.colorpicker.save": "सहेजा जाय",
+	"pad.colorpicker.cancel": "रद्द करा जाय",
+	"pad.loading": "लोड होत है...",
+	"pad.wrongPassword": "आप कय पासवर्ड गलत रहा",
+	"pad.settings.padSettings": "प्याड सेटिङ्ग",
+	"pad.settings.myView": "हमार दृष्य",
+	"pad.settings.colorcheck": "लेखकीय रङ्ग",
+	"pad.settings.linenocheck": "हरफ संख्या",
+	"pad.settings.fontType": "फन्ट प्रकार:",
+	"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": "माइक्रोसफ्ट वर्ड",
+	"pad.importExport.exportpdf": "पिडिएफ",
+	"pad.importExport.exportopen": "ओडिएफ(खुल्ला कागजात ढाँचा)",
+	"pad.modals.unauth": "अनाधिकृत",
+	"pad.modals.initsocketfail": "सर्भरमा पहुँच से बहरे है ।",
+	"pad.share.readonly": "पढय वाला खाली",
+	"pad.share.link": "लिङ्क",
+	"pad.share.emebdcode": "URL जोडा जाय",
+	"pad.chat": "बातचीत",
+	"timeslider.pageTitle": "{{appTitle}} समय रेखा",
+	"timeslider.toolbar.authors": "लेखक:",
+	"timeslider.toolbar.exportlink.title": "निर्यात",
+	"timeslider.version": "संस्करण {{version}}",
+	"timeslider.dateformat": "{{month}}/{{day}}/{{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": "डिसेम्बर",
+	"timeslider.unnamedauthors": "{{num}} unnamed {[plural(num) one: author, other: authors ]}",
+	"pad.userlist.unnamed": "बेनामी",
+	"pad.userlist.guest": "पहुना",
+	"pad.userlist.deny": "अस्वीकार",
+	"pad.userlist.approve": "स्वीकृत",
+	"pad.impexp.importing": "आयात होत है...",
+	"pad.impexp.importfailed": "आयात असफल रहा",
+	"pad.impexp.copypaste": "कृपया कपी पेस्ट कीन जाय"
+}
diff --git a/src/locales/az.json b/src/locales/az.json
@@ -59,7 +59,7 @@
 	"pad.modals.forcereconnect": "Məcbur təkrarən bağlan",
 	"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ədən istifadəylə yenidən qoşulun.",
+	"pad.modals.userdup.advice": "Bu pəncərəni istifadə etmək üçün yenidən qoşul.",
 	"pad.modals.unauth": "İcazəli deyil",
 	"pad.modals.unauth.explanation": "Bu səhifəyə baxdığınız vaxt sizin icazəniz  dəyişilib. Bərpa etmək üşün yenidən cəhd edin.",
 	"pad.modals.looping.explanation": "Sinxronlaşdırma serveri ilə kommunikasiya xətası var.",

diff --git a/src/locales/be-tarask.json b/src/locales/be-tarask.json
@@ -35,6 +35,7 @@
 	"pad.settings.padSettings": "Налады дакумэнта",
 	"pad.settings.myView": "Мой выгляд",
 	"pad.settings.stickychat": "Заўсёды паказваць чат",
+	"pad.settings.chatandusers": "Паказаць чат і ўдзельнікаў",
 	"pad.settings.colorcheck": "Колеры аўтарства",
 	"pad.settings.linenocheck": "Нумары радкоў",
 	"pad.settings.rtlcheck": "Тэкст справа-налева",
@@ -108,6 +109,7 @@
 	"timeslider.month.december": "сьнежань",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: безыменны аўтар, few: безыменныя аўтары, many: безыменных аўтараў, other: безыменных аўтараў ]}",
 	"pad.savedrevs.marked": "Гэтая вэрсія цяпер пазначаная як захаваная",
+	"pad.savedrevs.timeslider": "Вы можаце пабачыць захаваныя вэрсіі з дапамогай шкалы часу",
 	"pad.userlist.entername": "Увядзіце вашае імя",
 	"pad.userlist.unnamed": "безыменны",
 	"pad.userlist.guest": "Госьць",

diff --git a/src/locales/br.json b/src/locales/br.json
@@ -29,6 +29,7 @@
 	"pad.colorpicker.save": "Enrollañ",
 	"pad.colorpicker.cancel": "Nullañ",
 	"pad.loading": "O kargañ...",
+	"pad.noCookie": "N'eus ket gallet kavout an toupin. Aotreit an toupinoù en ho merdeer, mar plij !",
 	"pad.passwordRequired": "Ezhomm ho peus ur ger-tremen evit mont d'ar Pad-se",
 	"pad.permissionDenied": "\nN'oc'h ket aotreet da vont d'ar pad-mañ",
 	"pad.wrongPassword": "Fazius e oa ho ker-tremen",
@@ -47,6 +48,7 @@
 	"pad.importExport.import": "Enkargañ un destenn pe ur restr",
 	"pad.importExport.importSuccessful": "Deuet eo ganeoc'h !",
 	"pad.importExport.export": "Ezporzhiañ ar pad bremañ evel :",
+	"pad.importExport.exportetherpad": "Etherpad",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "Testenn blaen",
 	"pad.importExport.exportword": "Microsoft Word",
@@ -117,6 +119,7 @@
 	"pad.impexp.importing": "Oc'h enporzhiañ...",
 	"pad.impexp.confirmimport": "Ma vez enporzhiet ur restr e vo diverket ar pezh zo en teul a-vremañ. Ha sur oc'h e fell deoc'h mont betek penn ?",
 	"pad.impexp.convertFailed": "N'eus ket bet gallet enporzhiañ ar restr. Ober gant ur furmad teul all pe eilañ/pegañ gant an dorn.",
+	"pad.impexp.padHasData": "N'hon eus ket gallet enporzhiañ ar restr-mañdre ma'z eus bet degaset kemmoù er bloc'h-se ; enporzhiit anezhi war-zu ur bloc'h nevez, mar plij.",
 	"pad.impexp.uploadFailed": "C'hwitet eo bet an enporzhiañ. Klaskit en-dro.",
 	"pad.impexp.importfailed": "C'hwitet eo an enporzhiadenn",
 	"pad.impexp.copypaste": "Eilit/pegit, mar plij",

diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -13,11 +13,11 @@
 	"pad.toolbar.bold.title": "Tučný text (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kurzíva (Ctrl-I)",
 	"pad.toolbar.underline.title": "Podtržené písmo (Ctrl-U)",
-	"pad.toolbar.strikethrough.title": "Přeskrtnuté písmo",
+	"pad.toolbar.strikethrough.title": "Přeškrtnuto (Ctrl+5)",
 	"pad.toolbar.ol.title": "Číslovaný seznam",
 	"pad.toolbar.ul.title": "Nečíslovaný seznam",
-	"pad.toolbar.indent.title": "Odsazení",
-	"pad.toolbar.unindent.title": "Předsazení",
+	"pad.toolbar.indent.title": "Odsazení (TAB)",
+	"pad.toolbar.unindent.title": "Předsazení (Shift+TAB)",
 	"pad.toolbar.undo.title": "Zpět (Ctrl-Z)",
 	"pad.toolbar.redo.title": "Opakovat (Ctrl-Y)",
 	"pad.toolbar.clearAuthorship.title": "Vymazat barvy autorů",
@@ -30,12 +30,14 @@
 	"pad.colorpicker.save": "Uložit",
 	"pad.colorpicker.cancel": "Zrušit",
 	"pad.loading": "Načítání...",
+	"pad.noCookie": "Nelze nalézt cookie. Povolte prosím cookie ve Vašem prohlížeči.",
 	"pad.passwordRequired": "Pro přístup k tomuto Padu je třeba znát heslo",
 	"pad.permissionDenied": "Nemáte oprávnění pro přístup k tomuto Padu",
 	"pad.wrongPassword": "Nesprávné heslo",
 	"pad.settings.padSettings": "Nastavení Padu",
 	"pad.settings.myView": "Vlastní pohled",
 	"pad.settings.stickychat": "Chat vždy na obrazovce",
+	"pad.settings.chatandusers": "Ukázat Chat a Uživatele",
 	"pad.settings.colorcheck": "Barvy autorů",
 	"pad.settings.linenocheck": "Čísla řádků",
 	"pad.settings.rtlcheck": "Číst obsah zprava doleva?",
@@ -109,6 +111,7 @@
 	"timeslider.month.december": "prosinec",
 	"timeslider.unnamedauthors": "{{num}} {[ plural(num) one: nejmenovaný Autor, few: nejmenovaní Autoři, other: nejmenovaných Autorů ]}",
 	"pad.savedrevs.marked": "Tato revize je nyní označena jako uložená",
+	"pad.savedrevs.timeslider": "Návštěvou časové osy zobrazíte uložené revize",
 	"pad.userlist.entername": "Zadejte své jméno",
 	"pad.userlist.unnamed": "nejmenovaný",
 	"pad.userlist.guest": "Host",
@@ -119,6 +122,7 @@
 	"pad.impexp.importing": "Importování…",
 	"pad.impexp.confirmimport": "Import souboru přepíše aktuální text v padu. Opravdu chcete tuto akci provést?",
 	"pad.impexp.convertFailed": "Tento soubor nelze importovat. Použijte prosím jiný formát dokumentu nebo nakopírujte text ručně",
+	"pad.impexp.padHasData": "Tento soubor jsme nebyly schopni importovat, protože tento Pad již obsahoval změny. Importujte ho prosím do nového padu",
 	"pad.impexp.uploadFailed": "Nahrávání selhalo, zkuste to znovu",
 	"pad.impexp.importfailed": "Import selhal",
 	"pad.impexp.copypaste": "Vložte prosím kopii",

diff --git a/src/locales/de.json b/src/locales/de.json
@@ -36,6 +36,7 @@
 	"pad.settings.padSettings": "Pad Einstellungen",
 	"pad.settings.myView": "Eigene Ansicht",
 	"pad.settings.stickychat": "Chat immer anzeigen",
+	"pad.settings.chatandusers": "Chat und Benutzer anzeigen",
 	"pad.settings.colorcheck": "Autorenfarben anzeigen",
 	"pad.settings.linenocheck": "Zeilennummern",
 	"pad.settings.rtlcheck": "Inhalt von rechts nach links lesen?",
@@ -109,6 +110,7 @@
 	"timeslider.month.december": "Dezember",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: unbenannter Autor, other: unbenannte Autoren ]}",
 	"pad.savedrevs.marked": "Diese Version wurde jetzt als gespeicherte Version gekennzeichnet",
+	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch das Besuchen der Pad-Versionsgeschichte ansehen",
 	"pad.userlist.entername": "Geben Sie Ihren Namen ein",
 	"pad.userlist.unnamed": "unbenannt",
 	"pad.userlist.guest": "Gast",
@@ -119,7 +121,7 @@
 	"pad.impexp.importing": "Importiere …",
 	"pad.impexp.confirmimport": "Das Importieren einer Datei überschreibt den aktuellen Text des Pads. Wollen Sie wirklich fortfahren?",
 	"pad.impexp.convertFailed": "Wir können diese Datei nicht importieren. Bitte verwenden Sie ein anderes Dokumentformat oder übertragen Sie den Text manuell.",
-	"pad.impexp.padHasData": "Wir konnten diese Datei nicht importieren, da dieses Pad bereits Änderungen hat. Bitte importiere zu einem neuen Pad.",
+	"pad.impexp.padHasData": "Wir konnten diese Datei nicht importieren, da dieses Pad bereits Änderungen enthält. Bitte importiere sie in ein neues Pad.",
 	"pad.impexp.uploadFailed": "Der Upload ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
 	"pad.impexp.importfailed": "Import fehlgeschlagen",
 	"pad.impexp.copypaste": "Bitte kopieren und einfügen",

diff --git a/src/locales/el.json b/src/locales/el.json
@@ -37,6 +37,7 @@
 	"pad.settings.padSettings": "Ρυθμίσεις Pad",
 	"pad.settings.myView": "Η προβολή μου",
 	"pad.settings.stickychat": "Να είναι πάντα ορατή η συνομιλία",
+	"pad.settings.chatandusers": "Εμφάνιση Συνομιλίας και Χρηστών",
 	"pad.settings.colorcheck": "Χρώματα συντάκτη",
 	"pad.settings.linenocheck": "Αριθμοί γραμμών",
 	"pad.settings.rtlcheck": "Διαβάζεται το περιεχόμενο από δεξιά προς τα αριστερά;",
@@ -110,6 +111,7 @@
 	"timeslider.month.december": "Δεκεμβρίου",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: ανώνυμος συντάκτης, other: ανώνυμοι συντάκτες]}",
 	"pad.savedrevs.marked": "Αυτή η έκδοση επισημάνθηκε ως αποθηκευμένη έκδοση",
+	"pad.savedrevs.timeslider": "Μπορείτε να δείτε αποθηκευμένες αναθεωρήσεις στο χρονοδιάγραμμα",
 	"pad.userlist.entername": "Εισάγετε το όνομά σας",
 	"pad.userlist.unnamed": "ανώνυμος",
 	"pad.userlist.guest": "Επισκέπτης",