Merge branch 'develop'

.github/workflows/backend-tests.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18, 20]
+        node: [18, 20, 21]
     steps:
       -
         name: Checkout repository
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18, 20]
+        node: [18, 20, 21]
     steps:
       -
         name: Checkout repository

.github/workflows/frontend-admin-tests.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [19, 20]
+        node: [19, 20, 21]
 
     steps:
       -
@@ -78,7 +78,7 @@ jobs:
         name: Remove standard frontend test files, so only admin tests are run
         run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs
       -
-        uses: saucelabs/[email protected].5
+        uses: saucelabs/[email protected].6
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/frontend-tests.yml

@@ -45,7 +45,7 @@ jobs:
         run: |
           sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 100000000/' -i settings.json
       -
-        uses: saucelabs/[email protected].5
+        uses: saucelabs/[email protected].6
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
@@ -133,7 +133,7 @@ jobs:
         name: Remove standard frontend test files, so only plugin tests are run
         run: rm src/tests/frontend/specs/*
       -
-        uses: saucelabs/[email protected].5
+        uses: saucelabs/[email protected].6
         with:
           username: ${{ secrets.SAUCE_USERNAME }}
           accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           close-issue-label: wontfix
           close-pr-label: wontfix

.github/workflows/upgrade-from-latest-release.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18, 20]
+        node: [18, 20, 21]
     steps:
       -
         name: Check out latest release

CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.9.5
+
+### Compability changes
+
+* This version deprecates NodeJS16 as it reached its end of life and won't receive any updates. So to get started with Etherpad v1.9.5 you need NodeJS 18 and above.
+* The bundled windows NodeJS version has been bumped to the current LTS version 20.
+
+### Notable enhancements and fixes
+
+* The support for the tidy program to tidy up HTML files has been removed. This decision was made because it hasn't been updated for years and also caused an incompability when exporting a pad with Abiword. 
+
+
 # 1.9.4
 
 ### Compability changes

doc/docker.adoc

@@ -441,10 +441,6 @@ For the editor container, you can also make it full width by adding `full-width-
 | This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting.
 | `null`
 
-| `TIDY_HTML`
-| Path to the Tidy executable. Tidy is used to improve the quality of exported pads. Setting it to null disables Tidy.
-| `null`
-
 | `ALLOW_UNKNOWN_FILE_ENDS`
 | Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm
 | `true`

settings.json.docker

@@ -322,14 +322,6 @@
    */
   "soffice": "${SOFFICE:null}",
 
-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": "${TIDY_HTML:null}",
-
   /*
    * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm

settings.json.template

@@ -323,14 +323,6 @@
    */
   "soffice": null,
 
-  /*
-   * Path to the Tidy executable.
-   *
-   * Tidy is used to improve the quality of exported pads.
-   * Setting it to null disables Tidy.
-   */
-  "tidyHtml": null,
-
   /*
    * Allow import of file types other than the supported ones:
    * txt, doc, docx, rtf, odt, html & htm

src/bin/buildForWindows.sh

@@ -54,7 +54,7 @@ try rm -rf node_modules
 try mv node_modules_resolved node_modules
 
 log "download windows node..."
-try wget "https://nodejs.org/dist/latest-v16.x/win-x64/node.exe" -O node.exe
+try wget "https://nodejs.org/dist/latest-v20.x/win-x64/node.exe" -O node.exe
 
 log "create the zip..."
 try zip -9 -r "${OUTPUT}" ./*

src/bin/doc/package.json

@@ -7,7 +7,7 @@
     "node": ">=12.17.0"
   },
   "dependencies": {
-    "marked": "^9.1.2"
+    "marked": "^11.0.1"
   },
   "devDependencies": {},
   "optionalDependencies": {},

src/bin/release.js

@@ -160,6 +160,7 @@ try {
   run('git merge --no-ff --no-edit develop');
   console.log(`Creating ${newVersion} tag...`);
   run(`git tag -s '${newVersion}' -m '${newVersion}'`);
+  run(`git tag -s 'v${newVersion}' -m 'v${newVersion}'`);
   console.log('Switching back to develop...');
   run('git checkout develop');
   console.log('Merging master into develop...');
@@ -176,6 +177,8 @@ try {
   console.warn(`Deleting ${newVersion} tag...`);
   run(`git rev-parse -q --verify refs/tags/'${newVersion}' >/dev/null || exit 0; ` +
       `git tag -d '${newVersion}'`);
+  run(`git rev-parse -q --verify refs/tags/'v${newVersion}' >/dev/null || exit 0; ` +
+      `git tag -d 'v${newVersion}'`);
   throw err;
 }
 

src/locales/ast.json

@@ -28,7 +28,7 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Zarrar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies  nun se guarden ente visites. Esto pué debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que la iFrame padre",
+	"pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies  nun se guarden ente visites. Esto pue debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que l'iFrame padre",
 	"pad.permissionDenied": "Nun tienes permisu pa entrar a esti bloc",
 	"pad.settings.padSettings": "Configuración del bloc",
 	"pad.settings.myView": "la mio vista",

src/locales/ja.json

@@ -3,11 +3,32 @@
 		"authors": [
 			"Aefgh39622",
 			"Afaz",
+			"Chqaz",
 			"Omotecho",
 			"Shirayuki",
 			"Torinky"
 		]
 	},
+	"admin.page-title": "管理者ダッシュボード - Etherpad",
+	"admin_plugins": "プラグインマネージャー",
+	"admin_plugins.available": "利用可能なプラグイン",
+	"admin_plugins.available_not-found": "プラグインが見つかりません。",
+	"admin_plugins.available_fetching": "読み込み中…",
+	"admin_plugins.available_install.value": "インストール",
+	"admin_plugins.available_search.placeholder": "インストールするプラグインを検索する",
+	"admin_plugins.description": "説明",
+	"admin_plugins.installed": "インストール済みプラグイン",
+	"admin_plugins.installed_fetching": "インストール済みのプラグインを読み込んでいます…",
+	"admin_plugins.installed_nothing": "まだプラグインをインストールしていません。",
+	"admin_plugins.installed_uninstall.value": "アンインストール",
+	"admin_plugins.last-update": "最終更新",
+	"admin_plugins.name": "名前",
+	"admin_plugins.page-title": "プラグインマネージャー - Etherpad",
+	"admin_plugins.version": "バージョン",
+	"admin_plugins_info": "トラブルシューティングの情報",
+	"admin_plugins_info.hooks": "インストール済みフック",
+	"admin_plugins_info.hooks_client": "クライアント側のフック",
+	"admin_plugins_info.hooks_server": "サーバー側のフック",
 	"index.newPad": "新規作成",
 	"index.createOpenPad": "または作成/編集するパッド名を入力:",
 	"index.openPad": "次の名称の既存の Pad を開く:",

src/locales/mnw.json

@@ -1,9 +1,11 @@
 {
 	"@metadata": {
 		"authors": [
-			"Aue Nai"
+			"Aue Nai",
+			"咽頭べさ"
 		]
 	},
+	"admin_plugins.description": "တၚ်ထမံက်ထ္ၜး",
 	"index.newPad": "တၞးတၟိ",
 	"pad.toolbar.bold.title": "လ္စံက် (Ctrl+B)",
 	"pad.toolbar.italic.title": "ဒစေၚ် (Ctrl+I)",

src/locales/sco.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"AmaryllisGardener",
+			"CiphriusKane",
 			"John Reid",
 			"Nintendofan885"
 		]
@@ -50,7 +51,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Ye can yinly import fae plain tex or HTML formats. Fer mair advanced import features please <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\">install abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Ye can anely import fae plain tex or HTML formats. Fur mair advanced import features please <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\">install abiword</a>.",
 	"pad.modals.connected": "Connected.",
 	"pad.modals.reconnecting": "Reconnectin til yer pad..",
 	"pad.modals.forcereconnect": "Force reconnect",
@@ -70,13 +71,13 @@
 	"pad.modals.badChangeset.cause": "This coud be cause o ae wrang server confeeguration or some ither onexpected behavior. Please contact the service admeenistrator, gif ye feel that this is ae mistak. Try tae reconnect in order tae continue editing.",
 	"pad.modals.corruptPad.explanation": "The pad ye'r trying te access is mingin.",
 	"pad.modals.corruptPad.cause": "This micht be cause o ae wrang server confeeguration or some ither onexpected behavior. Please contact the service admeenistrater.",
-	"pad.modals.deleted": "Delytit.",
+	"pad.modals.deleted": "Deletit.",
 	"pad.modals.deleted.explanation": "This pad has been hif't.",
 	"pad.modals.disconnected": "Ye'v been disconnected.",
 	"pad.modals.disconnected.explanation": "The connection til the server wis loast",
 	"pad.modals.disconnected.cause": "The server micht be onavailable. Please notify the service admeenistrater gif this continues tae happen.",
 	"pad.share": "Share this pad",
-	"pad.share.readonly": "Read yinly",
+	"pad.share.readonly": "Read anely",
 	"pad.share.link": "Airtin",
 	"pad.share.emebdcode": "Embed URL",
 	"pad.chat": "Chait",
@@ -91,8 +92,8 @@
 	"timeslider.version": "Version {{version}}",
 	"timeslider.saved": "Saved {{day}} {{month}}, {{year}}",
 	"timeslider.playPause": "Playback / Pause Pad Contents",
-	"timeslider.backRevision": "Gae back a reveesion in this Pad",
-	"timeslider.forwardRevision": "Gae forwart a reveesion in this Pad",
+	"timeslider.backRevision": "Gang back ae revision in this Pad",
+	"timeslider.forwardRevision": "Gang forrit ae revision in this pad",
 	"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
 	"timeslider.month.january": "Januair",
 	"timeslider.month.february": "Febuair",

src/node/handler/ExportHandler.js

@@ -27,7 +27,6 @@ const fs = require('fs');
 const settings = require('../utils/Settings');
 const os = require('os');
 const hooks = require('../../static/js/pluginfw/hooks');
-const TidyHtml = require('../utils/TidyHtml');
 const util = require('util');
 const { checkValidRev } = require('../utils/checkValidRev');
 
@@ -93,10 +92,8 @@ exports.doExport = async (req, res, padId, readOnlyId, type) => {
     const srcFile = `${tempDirectory}/etherpad_export_${randNum}.html`;
     await fsp_writeFile(srcFile, html);
 
-    // Tidy up the exported HTML
     // ensure html can be collected by the garbage collector
     html = null;
-    await TidyHtml.tidy(srcFile);
 
     // send the convert job to the converter (abiword, libreoffice, ..)
     const destFile = `${tempDirectory}/etherpad_export_${randNum}.${type}`;

src/node/utils/Cli.js

@@ -45,7 +45,7 @@ for (let i = 0; i < argv.length; i++) {
     exports.argv.sessionkey = arg;
   }
 
-  // Override location of settings.json file
+  // Override location of APIKEY.txt file
   if (prevArg === '--apikey') {
     exports.argv.apikey = arg;
   }

src/node/utils/Settings.js

@@ -260,11 +260,6 @@ exports.abiword = null;
  */
 exports.soffice = null;
 
-/**
- * The path of the tidy executable
- */
-exports.tidyHtml = null;
-
 /**
  * Should we support none natively supported file types on import?
  */