mirror of
https://github.com/ether/etherpad-lite.git
synced 2026-05-05 20:26:49 +02:00
Merge branch 'develop'
This commit is contained in:
Etherpad Release Bot
commit
fad0297ced
12
CHANGELOG.md
12
CHANGELOG.md
@ -1,3 +1,15 @@
|
||||
# 2.6.1
|
||||
|
||||
For those wondering where the new updates are and why it was very quite throughout the last 1 1/2 years – I've been working on a new implementation of Etherpad from scratch in Go. It's called Etherpad-Go and you can find it here: `https://github.com/ether/etherpad-go`
|
||||
and a short FAQ about it here: https://github.com/ether/etherpad-go/wiki/FAQ . I'd love to hear your feedback about it either on Discord or issue tracker. There is a README.md that explains how to get started and try it out and also the FAQ can be quite fruitful. Latest release can be found here: https://github.com/ether/etherpad-go/releases/tag/v0.0.4
|
||||
|
||||
|
||||
### Notable enhancements and fixes of this release
|
||||
|
||||
- Minor fixes and improvements to the session transfer feature introduced in 2.6.0
|
||||
- Dependencies upgrades
|
||||
|
||||
|
||||
# 2.6.0
|
||||
|
||||
### Notable enhancements and fixes
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "admin",
|
||||
"private": true,
|
||||
"version": "2.6.0",
|
||||
"version": "2.6.1",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
@ -16,29 +16,29 @@
|
||||
"devDependencies": {
|
||||
"@radix-ui/react-dialog": "^1.1.15",
|
||||
"@radix-ui/react-toast": "^1.2.15",
|
||||
"@types/react": "^19.2.7",
|
||||
"@types/react": "^19.2.9",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@typescript-eslint/eslint-plugin": "^8.50.1",
|
||||
"@typescript-eslint/parser": "^8.50.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.53.1",
|
||||
"@typescript-eslint/parser": "^8.53.1",
|
||||
"@vitejs/plugin-react": "^5.1.2",
|
||||
"babel-plugin-react-compiler": "19.1.0-rc.3",
|
||||
"eslint": "^9.39.2",
|
||||
"eslint-plugin-react-hooks": "^7.0.1",
|
||||
"eslint-plugin-react-refresh": "^0.4.26",
|
||||
"i18next": "^25.7.3",
|
||||
"i18next": "^25.8.0",
|
||||
"i18next-browser-languagedetector": "^8.2.0",
|
||||
"lucide-react": "^0.562.0",
|
||||
"lucide-react": "^0.563.0",
|
||||
"react": "^19.2.3",
|
||||
"react-dom": "^19.2.3",
|
||||
"react-hook-form": "^7.69.0",
|
||||
"react-i18next": "^16.5.0",
|
||||
"react-router-dom": "^7.11.0",
|
||||
"react-hook-form": "^7.71.1",
|
||||
"react-i18next": "^16.5.3",
|
||||
"react-router-dom": "^7.13.0",
|
||||
"socket.io-client": "^4.8.3",
|
||||
"typescript": "^5.9.3",
|
||||
"vite": "npm:rolldown-vite@7.2.10",
|
||||
"vite-plugin-babel": "^1.3.2",
|
||||
"vite-plugin-static-copy": "^3.1.4",
|
||||
"zustand": "^5.0.9"
|
||||
"vite-plugin-babel": "^1.4.1",
|
||||
"vite-plugin-static-copy": "^3.1.6",
|
||||
"zustand": "^5.0.10"
|
||||
},
|
||||
"overrides": {
|
||||
"vite": "npm:rolldown-vite@7.2.10"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{
|
||||
"name": "bin",
|
||||
"version": "2.6.0",
|
||||
"version": "2.6.1",
|
||||
"description": "",
|
||||
"main": "checkAllPads.js",
|
||||
"directories": {
|
||||
"doc": "doc"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.13.2",
|
||||
"axios": "^1.13.3",
|
||||
"ep_etherpad-lite": "workspace:../src",
|
||||
"log4js": "^6.9.1",
|
||||
"semver": "^7.7.3",
|
||||
@ -15,7 +15,7 @@
|
||||
"ueberdb2": "^5.0.23"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^25.0.3",
|
||||
"@types/node": "^25.0.10",
|
||||
"@types/semver": "^7.7.1",
|
||||
"typescript": "^5.9.3"
|
||||
},
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
services:
|
||||
app:
|
||||
user: "0:0"
|
||||
user: "5001:0"
|
||||
image: etherpad/etherpad:latest
|
||||
tty: true
|
||||
stdin_open: true
|
||||
|
||||
@ -49,6 +49,6 @@
|
||||
"url": "https://github.com/ether/etherpad-lite.git"
|
||||
},
|
||||
"engineStrict": true,
|
||||
"version": "2.6.0",
|
||||
"version": "2.6.1",
|
||||
"license": "Apache-2.0"
|
||||
}
|
||||
|
||||
1096
pnpm-lock.yaml
generated
1096
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -44,6 +44,16 @@
|
||||
"admin_settings.current_save.value": "Αποθήκευση Ρυθμίσεων",
|
||||
"admin_settings.page-title": "Ρυθμίσεις - Etherpad",
|
||||
"index.newPad": "Νέος Κοινόχρηστος Πίνακας",
|
||||
"index.settings": "Ρυθμίσεις",
|
||||
"index.transferSessionTitle": "Μεταφορά συνεδρίας",
|
||||
"index.receiveSessionTitle": "Λήψη συνεδρίας",
|
||||
"index.transferSession": "1. Μεταφορά συνεδρίας",
|
||||
"index.transferSessionNow": "Μεταφορά συνεδρίας τώρα",
|
||||
"index.copyLink": "2. Αντιγραφή συνδέσμου",
|
||||
"index.copyLinkDescription": "Πατήστε στο παρακάτω κουμπί για να αντιγράψετε τον σύνδεσμο στο πρόχειρό σας.",
|
||||
"index.copyLinkButton": "Αντιγραφή συνδέσμου στο πρόχειρο",
|
||||
"index.transferToSystem": "3. Αντιγραφή συνεδρίας στο νέο σύστημα",
|
||||
"index.transferToSystemDescription": "Ανοίξτε τον αντιγραμμένο σύνδεσμο στο πρόγραμμα περιήγησης ή στη συσκευή προορισμού για να μεταφέρετε την συνεδρία σας.",
|
||||
"index.createOpenPad": "ή δημιουργία/άνοιγμα ενός κοινόχρηστου πίνακα με όνομα:",
|
||||
"index.openPad": "άνοιγμα υπάρχοντος κοινόχρηστού πίνακα με όνομα:",
|
||||
"pad.toolbar.bold.title": "Έντονα (Ctrl-B)",
|
||||
|
||||
@ -20,6 +20,9 @@
|
||||
"admin_settings.current_save.value": "ਤਰਜੀਹਾਂ ਸੰਭਾਲੋ",
|
||||
"admin_settings.page-title": "ਤਰਜੀਹਾਂ - ਈਥਰਪੈਡ",
|
||||
"index.newPad": "ਨਵਾਂ ਪੈਡ",
|
||||
"index.settings": "ਤਰਜੀਹਾਂ",
|
||||
"index.copyLink": "2. ਕੜੀ ਦੀ ਨਕਲ ਕਰੋ",
|
||||
"index.copyLinkButton": "ਕੜੀ ਦਾ ਉਤਾਰਾ ਚੂੰਢੀ-ਤਖਤੀ 'ਤੇ ਲਿਖੋ",
|
||||
"index.createOpenPad": "ਜਾਂ ਨਾਂ ਨਾਲ ਨਵਾਂ ਪੈਡ ਬਣਾਓ/ਖੋਲ੍ਹੋ:",
|
||||
"pad.toolbar.bold.title": "ਗੂੜ੍ਹਾ (Ctrl-B)",
|
||||
"pad.toolbar.italic.title": "ਤਿਰਛਾ (Ctrl-I)",
|
||||
@ -37,10 +40,11 @@
|
||||
"pad.toolbar.savedRevision.title": "ਦੁਹਰਾਅ ਸਾਂਭੋ",
|
||||
"pad.toolbar.settings.title": "ਪਸੰਦਾਂ",
|
||||
"pad.toolbar.embed.title": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਤੇ ਇੰਬੈੱਡ ਕਰੋ",
|
||||
"pad.toolbar.home.title": "ਮੁੱਢਲੇ ਵਰਕੇ 'ਤੇ ਵਾਪਸ ਜਾਓ",
|
||||
"pad.toolbar.showusers.title": "ਇਸ ਫੱਟੀ ਉੱਤੇ ਵਰਤੋਂਕਾਰ ਵਿਖਾਓ",
|
||||
"pad.colorpicker.save": "ਸੰਭਾਲੋ",
|
||||
"pad.colorpicker.save": "ਸਾਂਭੋ",
|
||||
"pad.colorpicker.cancel": "ਰੱਦ ਕਰੋ",
|
||||
"pad.loading": "…ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
|
||||
"pad.loading": "ਲੱਦ ਰਿਹਾ ਏ...",
|
||||
"pad.noCookie": "ਕੂਕੀਜ਼ ਨਹੀਂ ਲੱਭੀਅਾਂ। ਕਿਰਪਾ ਕਰਕੇ ਬ੍ਰਾੳੂਜ਼ਰ ਵਿੱਚ ਕੂਕੀਜ਼ ਲਾਗੂ ਕਰੋ।",
|
||||
"pad.permissionDenied": "ਇਹ ਪੈਡ ਵਰਤਨ ਲਈ ਤੁਹਾਨੂੰ ਅਧਿਕਾਰ ਨਹੀਂ ਹਨ",
|
||||
"pad.settings.padSettings": "ਪੈਡ ਸੈਟਿੰਗ",
|
||||
@ -65,9 +69,10 @@
|
||||
"pad.importExport.exportpdf": "PDF",
|
||||
"pad.importExport.exportopen": "ODF (ਓਪਨ ਡੌਕੂਮੈਂਟ ਫਾਰਮੈਟ)",
|
||||
"pad.importExport.abiword.innerHTML": "ਤੁਸੀਂ ਸਿਰਫ਼ ਸਾਦੀਆਂ ਲਿਖਤੀ ਜਾਂ ਐੱਚ.ਟੀ.ਐੱਮ.ਐੱਲ. ਰੂਪ-ਰੇਖਾਵਾਂ ਤੋਂ ਦਰਾਮਦ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਉੱਨਤ ਦਰਾਮਦੀ ਗੁਣਾਂ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ <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\">ਐਬੀਵਰਡ ਥਾਪੋ</a>।",
|
||||
"pad.modals.connected": "ਕੁਨੈਕਟ ਹੈ।",
|
||||
"pad.modals.connected": "ਜੁੜਿਆ ਹੋਇਆ।",
|
||||
"pad.modals.reconnecting": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
|
||||
"pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ",
|
||||
"pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਜੁੜੋ",
|
||||
"pad.modals.reconnecttimer": "ਮੁਡ਼ ਜੋੜਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਏ",
|
||||
"pad.modals.cancel": "ਰੱਦ ਕਰੋ",
|
||||
"pad.modals.userdup": "ਹੋਰ ਵਿੰਡੋ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਹੈ",
|
||||
"pad.modals.userdup.explanation": "ਇਹ ਪੈਡ ਇਸ ਕੰਪਿਊਟਰ 'ਤੇ ਇੱਕ ਤੋਂ ਵੱਧ ਫਰੋਲੂ ਬਾਰੀ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਜਾਪਦਾ ਹੈ।",
|
||||
@ -91,7 +96,7 @@
|
||||
"pad.modals.disconnected.explanation": "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ ਹੈ",
|
||||
"pad.modals.disconnected.cause": "ਸਰਵਰ ਨਾਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ। ਜੇਕਰ ਇਹ ਹੁੰਦਾ ਰਹੇ ਤਾਂ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਸੇਵਾ ਪ੍ਰਬੰਧਕ ਨੂੰ ਖ਼ਬਰ ਕਰੋ।",
|
||||
"pad.share": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਕਰੋ",
|
||||
"pad.share.readonly": "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ",
|
||||
"pad.share.readonly": "ਸਿਰਫ਼ ਪੜ੍ਹਨ ਲਈ",
|
||||
"pad.share.link": "ਕੜੀ",
|
||||
"pad.share.emebdcode": "ਇੰਬੈੱਡ URL",
|
||||
"pad.chat": "ਗੱਲਬਾਤ",
|
||||
@ -104,7 +109,7 @@
|
||||
"timeslider.toolbar.authorsList": "ਕੋਈ ਲੇਖਕ ਨਹੀਂ",
|
||||
"timeslider.toolbar.exportlink.title": "ਬਰਾਮਦ",
|
||||
"timeslider.exportCurrent": "ਮੌਜੂਦਾ ਵਰਜਨ ਇੰਝ ਐਕਸਪੋਰਟ ਕਰੋ:",
|
||||
"timeslider.version": "ਵਰਜ਼ਨ {{version}}",
|
||||
"timeslider.version": "ਰੂਪ {{version}}",
|
||||
"timeslider.saved": "{{day}} {{month}} {{year}} ਨੂੰ ਸੰਭਾਲਿਆ",
|
||||
"timeslider.playPause": "ਪੈਡ ਸਮੱਗਰੀ ਚਲਾਓ / ਵਿਰਾਮ ਕਰੋ",
|
||||
"timeslider.backRevision": "ਇਸ ਪੈਡ ਵਿੱਚ ਪਿਛਲੇ ਰੀਵਿਜ਼ਨ ਤੇ ਜਾਓ",
|
||||
@ -129,7 +134,7 @@
|
||||
"pad.userlist.unnamed": "ਬੇਨਾਮ",
|
||||
"pad.editbar.clearcolors": "ਪੂਰੇ ਦਸਾਤਵੇਜ਼ ਉੱਤੇ ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰਨੇ ਹਨ?",
|
||||
"pad.impexp.importbutton": "ਹੁਣੇ ਦਰਾਮਦ ਕਰੋ",
|
||||
"pad.impexp.importing": "...ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
|
||||
"pad.impexp.importing": "ਦਰਾਮਦ ਜਾਰੀ ਏ...",
|
||||
"pad.impexp.confirmimport": "ਕੋਈ ਫ਼ਾਈਲ ਦਰਾਮਦ ਕਾਰਨ ਨਾਲ਼ ਪੈਡ ਦੀ ਮੌਜੂਦਾ ਲਿਖਤ ਉੱਤੇ ਲਿਖਿਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਸੱਚੀਂ ਇਹ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
|
||||
"pad.impexp.convertFailed": "ਅਸੀਂ ਇਸ ਫ਼ਾਈਲ ਦੀ ਦਰਾਮਦ ਨਹੀਂ ਕਰ ਸਕੇ। ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਕੋਈ ਵੱਖਰੀ ਦਸਤਾਵੇਜ਼ੀ ਰੂਪ-ਰੇਖਾ ਵਰਤੋ ਜਾਂ ਹੱਥੀਂ ਨਕਲ-ਚੇਪੀ ਕਰੋ।",
|
||||
"pad.impexp.padHasData": "ਅਸੀ ਇਸ ਫਾਈਲ ਨੂੰ ਦਰਾਮਦ ਨਹੀੰ ਕਰ ਸਕੇ ਕਿਉੰਕਿ ਇਸ ਕਾਗਜ਼ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਜਾ ਚੁਕੀਆਂ ਹਨ, ਕਿਰਪਾ ਕਰਕੇ ਨਵੇਂ ਕਾਗਜ਼ ਵਿਚ ਦਰਾਮਦ ਕਰੋ",
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
"admin_settings.current_save.value": "Zapisz ustawienia",
|
||||
"admin_settings.page-title": "Ustawienia - Etherpad",
|
||||
"index.newPad": "Nowy dokument",
|
||||
"index.createOpenPad": "Otwórz dokument po nazwie",
|
||||
"index.createOpenPad": "Otwórz dokument znając nazwę",
|
||||
"index.openPad": "otwórz istniejący dokument o nazwie:",
|
||||
"index.recentPads": "Ostatnie dokumenty",
|
||||
"index.recentPadsEmpty": "Nie znaleziono ostatnio używanych dokumentów.",
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
"admin_settings.current_save.value": "Зберегти налаштування",
|
||||
"admin_settings.page-title": "Налаштування — Etherpad",
|
||||
"index.newPad": "Створити",
|
||||
"index.createOpenPad": "або створити/відкрити документ з назвою:",
|
||||
"index.createOpenPad": "Відкрити документ з іменем",
|
||||
"index.openPad": "відкрити наявний документ з назвою:",
|
||||
"pad.toolbar.bold.title": "Напівжирний (Ctrl-B)",
|
||||
"pad.toolbar.italic.title": "Курсив (Ctrl-I)",
|
||||
|
||||
@ -31,15 +31,15 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"async": "^3.2.6",
|
||||
"axios": "^1.13.2",
|
||||
"axios": "^1.13.3",
|
||||
"cookie-parser": "^1.4.7",
|
||||
"cross-env": "^10.1.0",
|
||||
"cross-spawn": "^7.0.6",
|
||||
"ejs": "^3.1.10",
|
||||
"ejs": "^4.0.1",
|
||||
"esbuild": "^0.27.2",
|
||||
"express": "^5.2.1",
|
||||
"express-rate-limit": "^8.2.1",
|
||||
"express-session": "^1.18.2",
|
||||
"express-session": "^1.19.0",
|
||||
"find-root": "1.1.0",
|
||||
"formidable": "^3.5.4",
|
||||
"http-errors": "^2.0.1",
|
||||
@ -53,7 +53,7 @@
|
||||
"live-plugin-manager": "^1.1.0",
|
||||
"lodash.clonedeep": "4.5.0",
|
||||
"log4js": "^6.9.1",
|
||||
"lru-cache": "^11.2.4",
|
||||
"lru-cache": "^11.2.5",
|
||||
"measured-core": "^2.0.0",
|
||||
"mime-types": "^3.0.2",
|
||||
"oidc-provider": "9.6.0",
|
||||
@ -69,7 +69,7 @@
|
||||
"semver": "^7.7.3",
|
||||
"socket.io": "^4.8.3",
|
||||
"socket.io-client": "^4.8.3",
|
||||
"superagent": "10.2.3",
|
||||
"superagent": "10.3.0",
|
||||
"swagger-ui-express": "^5.0.1",
|
||||
"tinycon": "0.6.8",
|
||||
"tsx": "4.21.0",
|
||||
@ -83,7 +83,7 @@
|
||||
"etherpad-lite": "node/server.ts"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@playwright/test": "^1.57.0",
|
||||
"@playwright/test": "^1.58.0",
|
||||
"@types/async": "^3.2.25",
|
||||
"@types/cookie-parser": "^1.4.10",
|
||||
"@types/cross-spawn": "^6.0.6",
|
||||
@ -99,7 +99,7 @@
|
||||
"@types/jsonwebtoken": "^9.0.10",
|
||||
"@types/mime-types": "^3.0.1",
|
||||
"@types/mocha": "^10.0.9",
|
||||
"@types/node": "^25.0.3",
|
||||
"@types/node": "^25.0.10",
|
||||
"@types/oidc-provider": "^9.5.0",
|
||||
"@types/semver": "^7.7.1",
|
||||
"@types/sinon": "^21.0.0",
|
||||
@ -115,12 +115,12 @@
|
||||
"mocha-froth": "^0.2.10",
|
||||
"nodeify": "^1.0.1",
|
||||
"openapi-schema-validation": "^0.4.2",
|
||||
"set-cookie-parser": "^2.7.2",
|
||||
"set-cookie-parser": "^3.0.1",
|
||||
"sinon": "^21.0.1",
|
||||
"split-grid": "^1.0.11",
|
||||
"supertest": "^7.1.3",
|
||||
"supertest": "^7.2.2",
|
||||
"typescript": "^5.9.3",
|
||||
"vitest": "^4.0.16"
|
||||
"vitest": "^4.0.18"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18.18.2",
|
||||
@ -147,6 +147,6 @@
|
||||
"debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts",
|
||||
"test:vitest": "vitest"
|
||||
},
|
||||
"version": "2.6.0",
|
||||
"version": "2.6.1",
|
||||
"license": "Apache-2.0"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user