Merge branch 'develop'

SamTV12345 · SamTV12345 · commit 96fe9768b1c7 · 2024-08-09T11:40:31.000+02:00
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,6 +14,7 @@ permissions:
 
 jobs:
   build-zip:
+    permissions: write-all
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 2.2.1
+# 2.2.2
 
 ### Notable enhancements and fixes
 
diff --git a/admin/package.json b/admin/package.json
@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "2.2.1",
+  "version": "2.2.2",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/bin/package.json b/bin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bin",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {
diff --git a/package.json b/package.json
@@ -49,6 +49,6 @@
     "type": "git",
     "url": "https://github.com/ether/etherpad-lite.git"
   },
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "Apache-2.0"
 }
diff --git a/src/package.json b/src/package.json
@@ -134,6 +134,6 @@
     "test-admin:ui": "cross-env NODE_ENV=production npx playwright test tests/frontend-new/admin-spec --ui --workers 1",
     "debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts"
   },
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "Apache-2.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# 2.2.1`
	`1`	`+# 2.2.2`
`2`	`2`
`3`	`3`	`### Notable enhancements and fixes`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@`
`49`	`49`	`"type": "git",`
`50`	`50`	`"url": "https://github.com/ether/etherpad-lite.git"`
`51`	`51`	`},`
`52`		`- "version": "2.2.1",`
	`52`	`+ "version": "2.2.2",`
`53`	`53`	`"license": "Apache-2.0"`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,6 @@`
`134`	`134`	`"test-admin:ui": "cross-env NODE_ENV=production npx playwright test tests/frontend-new/admin-spec --ui --workers 1",`
`135`	`135`	`"debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts"`
`136`	`136`	`},`
`137`		`- "version": "2.2.1",`
	`137`	`+ "version": "2.2.2",`
`138`	`138`	`"license": "Apache-2.0"`
`139`	`139`	`}`