Release version 1.8.4

ether · May 15, 2020 · 89a155f · 89a155f
2 parents 6210114 + 4365598
commit 89a155f
Show file tree

Hide file tree

Showing 71 changed files with 425 additions and 295 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.8.4
+* FIX: fix a performance regression on MySQL introduced in 1.8.3
+* FIX: when running behind a reverse proxy and exposed in an inner directory, fonts and toolbar icons should now be visible. This is a regression introduced in 1.8.3
+* FIX: cleanups in the UI after the CSS rehaul of 1.8.3
+* MINOR: protect against bugged/stale UI elements after updates. An explicit cache busting via random query string is performed at each start. This needs to be replaced with hashed names in static assets.
+* MINOR: improved some tests
+* MINOR: fixed long-standing bugs in the maintenance tools in /bin (migrateDirtyDBtoRealDB, rebuildPad, convert, importSqlFile)
+
 # 1.8.3
 * FEATURE: colibris is now the default skin for new installs
 * FEATURE: improved colibris visuals, and migrated to Flexbox layout

diff --git a/bin/convert.js b/bin/convert.js
@@ -1,7 +1,7 @@
 var startTime = Date.now();
 var fs = require("fs");
-var ueberDB = require("../src/node_modules/ueberDB");
-var mysql = require("../src/node_modules/ueberDB/node_modules/mysql");
+var ueberDB = require("../src/node_modules/ueberdb2");
+var mysql = require("../src/node_modules/ueberdb2/node_modules/mysql");
 var async = require("../src/node_modules/async");
 var Changeset = require("ep_etherpad-lite/static/js/Changeset");
 var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;

diff --git a/bin/importSqlFile.js b/bin/importSqlFile.js
@@ -4,7 +4,7 @@ require("ep_etherpad-lite/node_modules/npm").load({}, function(er,npm) {
 
  var fs = require("fs");
 
- var ueberDB = require("ep_etherpad-lite/node_modules/ueberDB");
+ var ueberDB = require("ep_etherpad-lite/node_modules/ueberdb2");
  var settings = require("ep_etherpad-lite/node/utils/Settings");
  var log4js = require('ep_etherpad-lite/node_modules/log4js');
 

diff --git a/bin/migrateDirtyDBtoRealDB.js b/bin/migrateDirtyDBtoRealDB.js
@@ -11,33 +11,39 @@ require("ep_etherpad-lite/node_modules/npm").load({}, function(er,npm) {
 
 
  var settings = require("ep_etherpad-lite/node/utils/Settings");
- var dirty = require("../src/node_modules/dirty")('var/dirty.db');
+ var dirty = require("../src/node_modules/dirty");
  var ueberDB = require("../src/node_modules/ueberdb2");
  var log4js = require("../src/node_modules/log4js");
  var dbWrapperSettings = {
-  "cache": "0", // The cache slows things down when you're mostly writing.
-  "writeInterval": 0 // Write directly to the database, don't buffer
+ "cache": "0", // The cache slows things down when you're mostly writing.
+ "writeInterval": 0 // Write directly to the database, don't buffer
  };
  var db = new ueberDB.database(settings.dbType, settings.dbSettings, dbWrapperSettings, log4js.getLogger("ueberDB"));
+ var i = 0;
+ var length = 0;
 
  db.init(function() {
- console.log("Waiting for dirtyDB to parse its file.");
- dirty.on("load", function(length) {
- console.log("Loaded " + length + " records, processing now.");
- var remaining = length;
- dirty.forEach(function(key, value) {
- db.set(key, value, function(error) {
- if (typeof error != 'undefined') {
- console.log("Unexpected result handling: ", key, value, " was: ", error);
- }
- remaining -= 1;
- var oldremaining = remaining;
- if ((oldremaining % 100) == 0) {
- console.log("Records not yet flushed to database: ", remaining);
- }
- });
- });
+ console.log("Waiting for dirtyDB to parse its file.");
+ dirty = dirty('var/dirty.db').on("load", function() {
+ dirty.forEach(function(){
+ length++;
+ });
+ console.log(`Found ${length} records, processing now.`);
+
+ dirty.forEach(async function(key, value) {
+ let error = await db.set(key, value);
+ console.log(`Wrote record ${i}`);
+ i++;
+
+ if (i === length) {
+ console.log("finished, just clearing up for a bit...");
+ setTimeout(function() {
+ process.exit(0);
+ }, 5000);
+ }
+ });
  console.log("Please wait for all records to flush to database, then kill this process.");
  });
+ console.log("done?")
  });
 });
diff --git a/bin/rebuildPad.js b/bin/rebuildPad.js
@@ -10,7 +10,7 @@ if(process.argv.length != 4 && process.argv.length != 5) {
 
 var npm = require("../src/node_modules/npm");
 var async = require("../src/node_modules/async");
-var ueberDB = require("../src/node_modules/ueberDB");
+var ueberDB = require("../src/node_modules/ueberdb2");
 
 var padId = process.argv[2];
 var newRevHead = process.argv[3];

diff --git a/doc/api/hooks_server-side.md b/doc/api/hooks_server-side.md
@@ -91,7 +91,7 @@ Available blocks in `pad.html` are:
  * `timesliderEditbarRight`
  * `modals`
 
- `index.html` blocks:
+`index.html` blocks:
 
  * `indexWrapper` - contains the form for creating new pads
 

diff --git a/doc/assets/style.css b/doc/assets/style.css
@@ -44,4 +44,19 @@ a:hover {
  display: block;
  overflow: auto;
  padding: 5px;
-}
+}
+
+table, th, td {
+ text-align: left;
+ border: 1px solid gray;
+ border-collapse: collapse;
+}
+
+th {
+ padding: 0.5em;
+ background: #EEE;
+}
+
+td {
+ padding: 0.5em;
+}
diff --git a/doc/docker.md b/doc/docker.md
@@ -38,7 +38,7 @@ docker build --tag <YOUR_USERNAME>/etherpad .
 
 Include two plugins in the container:
 ```bash
-docker build --build-arg ETHERPAD_PLUGINS="ep_codepad ep_author_neat" --tag <YOUR_USERNAME>/etherpad .
+docker build --build-arg ETHERPAD_PLUGINS="ep_comments_page ep_author_neat" --tag <YOUR_USERNAME>/etherpad .
 ```
 
 ## Running your instance:

diff --git a/src/locales/ar.json b/src/locales/ar.json
@@ -137,5 +137,7 @@
  "pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى",
  "pad.impexp.importfailed": "فشل الاستيراد",
  "pad.impexp.copypaste": "الرجاء نسخ/لصق",
- "pad.impexp.exportdisabled": "تصدير التنسيق {{type}} معطل. يرجى الاتصال بمسؤول النظام الخاص بك للحصول على التفاصيل."
+ "pad.impexp.exportdisabled": "تصدير التنسيق {{type}} معطل. يرجى الاتصال بمسؤول النظام الخاص بك للحصول على التفاصيل.",
+ "pad.impexp.maxFileSize": "الملف كبير جدا. اتصل بإداري الموقع الخاص بك لزيادة حجم الملف المسموح به للاستيراد",
+ "pad.impexp.permission": "الاستيراد معطل لأنك لم تساهم مسبقا لهذه الباد. من فضلك ساهم على الأقل مرة واحدة قبل الاستيراد"
 }
diff --git a/src/locales/ast.json b/src/locales/ast.json
@@ -50,7 +50,7 @@
  "pad.importExport.exportword": "Microsoft Word",
  "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (Open Document Format)",
- "pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o HTML. Pa carauterístiques d'importación más avanzaes <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instala Abiword</a>.",
+ "pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o HTML. Pa carauterístiques d'importación más avanzaes <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instala Abiword o LibreOffice</a>.",
  "pad.modals.connected": "Coneutáu.",
  "pad.modals.reconnecting": "Reconeutando col to bloc...",
  "pad.modals.forcereconnect": "Forzar la reconexón",
@@ -127,5 +127,7 @@
  "pad.impexp.uploadFailed": "Falló la carga del ficheru, intentalo otra vuelta",
  "pad.impexp.importfailed": "Falló la importación",
  "pad.impexp.copypaste": "Por favor, copia y apega",
- "pad.impexp.exportdisabled": "La esportación en formatu {{type}} ta desactivada. Por favor, comunica col alministrador del sistema pa más detalles."
+ "pad.impexp.exportdisabled": "La esportación en formatu {{type}} ta desactivada. Por favor, comunica col alministrador del sistema pa más detalles.",
+ "pad.impexp.maxFileSize": "El ficheru ye demasiao grande. Comunícate col alministrador del sitiu p'aumentar el tamañu de ficheru permitíu na importación",
+ "pad.impexp.permission": "La importación ta desactivada porque nunca contribuisti nesti bloc. Contribuye polo menos una vez antes d'importar"
 }
diff --git a/src/locales/br.json b/src/locales/br.json
@@ -8,7 +8,7 @@
  ]
  },
  "index.newPad": "Pad nevez",
- "index.createOpenPad": "pe krouiñ/digeriñ ur pad gant an anv :",
+ "index.createOpenPad": "pe krouiñ/digeriñ ur Pad gant an anv :",
  "pad.toolbar.bold.title": "Tev (Ctrl-B)",
  "pad.toolbar.italic.title": "Italek (Ctrl-I)",
  "pad.toolbar.underline.title": "Islinennañ (Ctrl-U)",
@@ -53,7 +53,7 @@
  "pad.importExport.exportword": "Microsoft Word",
  "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (Open Document Format)",
- "pad.importExport.abiword.innerHTML": "Ne c'hallit ket enporzhiañ furmadoù testennoù kriz pe HTML hepken. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">staliañ Abiword</a> mar plij.",
+ "pad.importExport.abiword.innerHTML": "Ne c'hallit enporzhiañ nemet furmadoù testennoù plaen pe HTML. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">Abiword pe LibreOffice</a>.",
  "pad.modals.connected": "Kevreet.",
  "pad.modals.reconnecting": "Adkevreañ war-zu ho pad...",
  "pad.modals.forcereconnect": "Adkevreañ dre heg",
@@ -130,5 +130,7 @@
  "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",
- "pad.impexp.exportdisabled": "Diweredekaet eo ezporzhiañ d'ar furmad {{type}}. Kit e darempred gant merour ar reizhiad evit gouzout hiroc'h."
+ "pad.impexp.exportdisabled": "Diweredekaet eo ezporzhiañ d'ar furmad {{type}}. Kit e darempred gant merour ar reizhiad evit gouzout hiroc'h.",
+ "pad.impexp.maxFileSize": "Re vras eo ar restr. Kit e daremrepd gant merour ho lec'hienn evit kreskiñ ment aoteet ar restroù evit enporzhiañ",
+ "pad.impexp.permission": "Diweredekaet eo an enporzhiañ peogwir n'hoc'h eus ket kemeret perzh gwech ebet er bloc'had-se. Kemerit perzh ur wech da nebeutañ a-raok enporzhiañ."
 }
diff --git a/src/locales/da.json b/src/locales/da.json
@@ -120,7 +120,7 @@
  "pad.userlist.guest": "Gæst",
  "pad.userlist.deny": "Nægt",
  "pad.userlist.approve": "Godkend",
- "pad.editbar.clearcolors": "Fjern farver for ophavsmand i hele dokumentet?",
+ "pad.editbar.clearcolors": "Fjern farver for ophavsmand i hele dokumentet? Dette kan ikke fortrydes",
  "pad.impexp.importbutton": "Importer nu",
  "pad.impexp.importing": "Importerer...",
  "pad.impexp.confirmimport": "At importere en fil, vil overskrives den aktuelle pad tekst. Er du sikker på du vil fortsætte?",

diff --git a/src/locales/de.json b/src/locales/de.json
@@ -1,6 +1,7 @@
 {
  "@metadata": {
  "authors": [
+ "Bjarncraft",
  "Metalhead64",
  "Mklehr",
  "Nipsky",
@@ -56,7 +57,7 @@
  "pad.importExport.exportword": "Microsoft Word",
  "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (Open Document Format)",
- "pad.importExport.abiword.innerHTML": "Sie können nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installieren Sie bitte AbiWord</a>.",
+ "pad.importExport.abiword.innerHTML": "Sie können nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installieren Sie bitte AbiWord oder LibreOffice</a>.",
  "pad.modals.connected": "Verbunden.",
  "pad.modals.reconnecting": "Wiederherstellen der Verbindung …",
  "pad.modals.forcereconnect": "Erneutes Verbinden erzwingen",
@@ -133,5 +134,7 @@
  "pad.impexp.uploadFailed": "Das Hochladen ist fehlgeschlagen. Bitte versuchen Sie es erneut.",
  "pad.impexp.importfailed": "Import fehlgeschlagen",
  "pad.impexp.copypaste": "Bitte kopieren und einfügen",
- "pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheiten kontaktieren Sie bitte Ihren Systemadministrator."
+ "pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheiten kontaktieren Sie bitte Ihren Systemadministrator.",
+ "pad.impexp.maxFileSize": "Datei zu groß.Kontaktiere deinen Administrator um das datei Limit für Imports zu erhöhen.",
+ "pad.impexp.permission": "Importieren ist deaktiviert weil du nichts zu diesem Pad beigeteagen hast.Bitte trage etwas bei bevor du importierst."
 }
diff --git a/src/locales/diq.json b/src/locales/diq.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": "Şı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.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\">AbiWordi ya zi LibreOfficeyi bar kerên</a>.",
  "pad.modals.connected": "Gıre diya.",
  "pad.modals.reconnecting": "Bloknot da şıma rê fına irtibat kewê no",
  "pad.modals.forcereconnect": "Mecbur anciya gırê de",
@@ -133,5 +133,7 @@
  "pad.impexp.uploadFailed": "Barkerdış nêbi, kerem ke anciya bıcerebne",
  "pad.impexp.importfailed": "Zer kerdış mıwafaq nebı",
  "pad.impexp.copypaste": "Reca keme kopya pronayış bıkeri",
- "pad.impexp.exportdisabled": "Formatta {{type}} ya ateber kerdış dewra vıciya yo. Qandé teferruati idarekarana irtibat kewê"
+ "pad.impexp.exportdisabled": "Formatta {{type}} ya ateber kerdış dewra vıciya yo. Qandé teferruati idarekarana irtibat kewê",
+ "pad.impexp.maxFileSize": "Dosya zêde gırsa, azere kerdışi rê mısade deyaye ebatê dosyay zeydınayışi rê idarekarê siteya irtibat kewê",
+ "pad.impexp.permission": "Şıma ena ped rê qet iştirak nêkerdo coki ra azere kerdış dewre ra veto. Vêre azere kerdışi minimum yû iştirak bıkerê"
 }
diff --git a/src/locales/el.json b/src/locales/el.json
@@ -54,7 +54,7 @@
  "pad.importExport.exportword": "Microsoft Word",
  "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (Μορφή Open Document)",
- "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.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 ή το LibreOffice</a>.",
  "pad.modals.connected": "Συνδεμένοι.",
  "pad.modals.reconnecting": "Επανασύνδεση στο pad σας...",
  "pad.modals.forcereconnect": "Επιβολή επανασύνδεσης",
@@ -122,7 +122,7 @@
  "pad.userlist.guest": "Επισκέπτης",
  "pad.userlist.deny": "Άρνηση",
  "pad.userlist.approve": "Έγκριση",
- "pad.editbar.clearcolors": "Να γίνει εκκαθάριση χρωμάτων σύνταξης σε ολόκληρο το έγγραφο;",
+ "pad.editbar.clearcolors": "Να γίνει εκκαθάριση χρωμάτων σύνταξης σε ολόκληρο το έγγραφο; Αυτό δεν μπορεί να αναιρεθεί",
  "pad.impexp.importbutton": "Εισαγωγή Τώρα",
  "pad.impexp.importing": "Εισάγεται...",
  "pad.impexp.confirmimport": "Η εισαγωγή ενός αρχείου θα αντικαταστήσει το κείμενο του pad. Είστε βέβαιοι ότι θέλετε να συνεχίσετε;",

diff --git a/src/locales/eu.json b/src/locales/eu.json
@@ -78,7 +78,7 @@
  "pad.modals.corruptPad.explanation": "Sartzen saiatzen ari zaren Pad-a hondatuta dago.",
  "pad.modals.corruptPad.cause": "Baliteke zerbitzari okerreko konfigurazioa edo beste ustekabeko portaera batzuk izatea. Jarri harremanetan zerbitzu-administratzailearekin.",
  "pad.modals.deleted": "Ezabatua.",
- "pad.modals.deleted.explanation": "Pad hau ezabatua izan da.",
+ "pad.modals.deleted.explanation": "Pad hau ezabatu da.",
  "pad.modals.disconnected": "Deskonektatua izan zara.",
  "pad.modals.disconnected.explanation": "Zerbitzariaren konexioa galdu da",
  "pad.modals.disconnected.cause": "Baliteke zerbitzaria eskuragarri ez egotea. Mesedez, jakinarazi zerbitzuko administrariari honek gertatzen jarraitzen badu.",

diff --git a/src/locales/fr.json b/src/locales/fr.json
@@ -74,7 +74,7 @@
  "pad.importExport.exportword": "Microsoft Word",
  "pad.importExport.exportpdf": "PDF",
  "pad.importExport.exportopen": "ODF (Open Document Format)",
- "pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou HTML. Pour des fonctionnalités d’importation plus évoluées, veuillez  <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installer AbiWord</a>.",
+ "pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou HTML. Pour des fonctionnalités d’importation plus évoluées, veuillez <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installer AbiWord ou LibreOffice</a>.",
  "pad.modals.connected": "Connecté.",
  "pad.modals.reconnecting": "Reconnexion à votre bloc-notes...",
  "pad.modals.forcereconnect": "Forcer la reconnexion",
@@ -151,5 +151,7 @@
  "pad.impexp.uploadFailed": "Le téléversement a échoué, veuillez réessayer",
  "pad.impexp.importfailed": "Échec de l’importation",
  "pad.impexp.copypaste": "Veuillez copier-coller",
- "pad.impexp.exportdisabled": "L’exportation au format {{type}} est désactivée. Veuillez contacter votre administrateur système pour plus de détails."
+ "pad.impexp.exportdisabled": "L’exportation au format {{type}} est désactivée. Veuillez contacter votre administrateur système pour plus de détails.",
+ "pad.impexp.maxFileSize": "Fichier trop gros. Contactez votre administrateur de site pour augmenter la taille maximale des fichiers importés",
+ "pad.impexp.permission": "L’importation est désactivée parce que vous n’avez jamais contribué à ce bloc. Veuillez contribuer au moins une fois avant d’importer"
 }