build(deps-dev): bump the dev-dependencies group across 1 directory with 4 updates (#7294)

Bumps the dev-dependencies group with 4 updates in the / directory: [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [vite-plugin-static-copy](https://github.com/sapphi-red/vite-plugin-static-copy).


Updates `@types/node` from 25.0.8 to 25.0.9
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Updates `@typescript-eslint/eslint-plugin` from 8.53.0 to 8.53.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.53.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 8.53.0 to 8.53.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.53.1/packages/parser)

Updates `vite-plugin-static-copy` from 3.1.4 to 3.1.5
- [Release notes](https://github.com/sapphi-red/vite-plugin-static-copy/releases)
- [Changelog](https://github.com/sapphi-red/vite-plugin-static-copy/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sapphi-red/vite-plugin-static-copy/compare/vite-plugin-static-copy@3.1.4...vite-plugin-static-copy@3.1.5)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 25.0.9
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.53.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.53.1
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
- dependency-name: vite-plugin-static-copy
  dependency-version: 3.1.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.dockerignore

@@ -25,3 +25,5 @@ Dockerfile
 settings.json
 src/node_modules
 admin/node_modules
+ui/node_modules
+node_modules

.github/workflows/backend-tests.yml

@@ -12,8 +12,11 @@ on:
 permissions:
   contents: read
 
+
 jobs:
   withoutpluginsLinux:
+    env:
+      PNPM_HOME: ~/.pnpm-store
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
@@ -24,53 +27,52 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 21]
+        node: [">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: ${{ matrix.node }}
+          path: |
-      - uses: pnpm/action-setup@v3
+             ${{ env.PNPM_HOME }}
-        name: Install pnpm
+             ~/.local/share/gnpm
-        with:
+             /usr/local/bin/gnpm
-            version: 9.0.4
+             /usr/local/bin/gnpm-0.0.12
-            run_install: false
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-            echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+                  ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.6.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm i --frozen-lockfile --runtimeVersion="${{ matrix.node }}"
       - name: Install admin ui
         working-directory: admin
-        run: pnpm install
+        run: gnpm install  --runtimeVersion="${{ matrix.node }}"
       - name: Build admin ui
         working-directory: admin
-        run: pnpm build
+        run: gnpm build  --runtimeVersion="${{ matrix.node }}"
       -
         name: Run the backend tests
-        run: pnpm test
+        run: gnpm test  --runtimeVersion="${{ matrix.node }}"
+      - name: Run the new vitest tests
+        working-directory: src
+        run: gnpm run test:vitest  --runtimeVersion="${{ matrix.node }}"
 
   withpluginsLinux:
+    env:
+      PNPM_HOME: ~/.pnpm-store
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
@@ -81,112 +83,101 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 21]
+        node: [">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
         name: Setup pnpm cache
+        if: always()
         with:
-          path: ${{ env.STORE_PATH }}
+          path: |
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            ${{ env.PNPM_HOME }}
+            ~/.local/share/gnpm
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.6.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile --runtimeVersion="${{ matrix.node }}"
-      - name: Install admin ui
-        working-directory: admin
-        run: pnpm install
       - name: Build admin ui
         working-directory: admin
-        run: pnpm build
+        run: gnpm build   --runtimeVersion="${{ matrix.node }}"
       -
         name: Install Etherpad plugins
         run: >
-          pnpm install --workspace-root
+          gnpm install --workspace-root
           ep_align
           ep_author_hover
           ep_cursortrace
           ep_font_size
           ep_hash_auth
           ep_headings2
-          ep_image_upload
           ep_markdown
           ep_readonly_guest
           ep_set_title_on_pad
           ep_spellcheck
           ep_subscript_and_superscript
-          ep_table_of_contents
+          ep_table_of_contents   --runtimeVersion="${{ matrix.node }}"
       -
         name: Run the backend tests
-        run: pnpm test
+        run: gnpm test   --runtimeVersion="${{ matrix.node }}"
+      - name: Run the new vitest tests
+        working-directory: src
+        run: gnpm run test:vitest   --runtimeVersion="${{ matrix.node }}"
 
   withoutpluginsWindows:
+    env:
+      PNPM_HOME: ~\\.pnpm-store
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
       (github.event_name != 'pull_request')
       || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]
     name: Windows without plugins
     runs-on: windows-latest
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
         name: Setup pnpm cache
+        if: always()
         with:
-          path: ${{ env.STORE_PATH }}
+          path: |
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            ${{ env.PNPM_HOME }}
+            C:\gnpm\
+            C:\Users\runneradmin\AppData\Roaming\gnpm\
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installOnWindows.bat
+        run: gnpm install --frozen-lockfile   --runtimeVersion="${{ matrix.node }}"
-      - name: Install admin ui
-        working-directory: admin
-        run: pnpm install
       - name: Build admin ui
         working-directory: admin
-        run: pnpm build
+        run: gnpm build   --runtimeVersion="${{ matrix.node }}"
       -
         name:  Fix up the settings.json
         run: |
@@ -194,68 +185,69 @@ jobs:
           powershell -Command "(gc settings.json.holder) -replace '\"points\": 10', '\"points\": 1000' | Out-File -encoding ASCII settings.json"
       -
         name: Run the backend tests
-        run: cd src && pnpm test
+        working-directory: src
+        run: gnpm test  --runtimeVersion="${{ matrix.node }}"
+      - name: Run the new vitest tests
+        working-directory: src
+        run: gnpm run test:vitest  --runtimeVersion="${{ matrix.node }}"
 
   withpluginsWindows:
+    env:
+      PNPM_HOME: ~\\.pnpm-store
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
       (github.event_name != 'pull_request')
       || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [">=20.0.0 <21.0.0", ">=22.0.0 <23.0.0", ">=24.0.0 <25.0.0"]
     name: Windows with Plugins
     runs-on: windows-latest
 
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
-        with:
-          node-version: 21
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
         name: Setup pnpm cache
+        if: always()
         with:
-          path: ${{ env.STORE_PATH }}
+          path: |
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            ${{ env.PNPM_HOME }}
+            C:\gnpm\
+            C:\Users\runneradmin\AppData\Roaming\gnpm\
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
-      - name: Install admin ui
+        with:
-        working-directory: admin
+          version: 0.0.12
-        run: pnpm install
+      - name: Install dependencies
+        run: gnpm install --runtimeVersion="${{ matrix.node }}"
       - name: Build admin ui
         working-directory: admin
-        run: pnpm build
+        run: gnpm build --runtimeVersion="${{ matrix.node }}"
       -
         name: Install Etherpad plugins
         # The --legacy-peer-deps flag is required to work around a bug in npm
         # v7: https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --workspace-root
+          gnpm install --workspace-root
           ep_align
           ep_author_hover
           ep_cursortrace
           ep_font_size
           ep_hash_auth
           ep_headings2
-          ep_image_upload
           ep_markdown
           ep_readonly_guest
           ep_set_title_on_pad
           ep_spellcheck
           ep_subscript_and_superscript
-          ep_table_of_contents
+          ep_table_of_contents   --runtimeVersion="${{ matrix.node }}"
       # Etherpad core dependencies must be installed after installing the
       # plugin's dependencies, otherwise npm will try to hoist common
       # dependencies by removing them from src/node_modules and installing them
@@ -267,7 +259,7 @@ jobs:
       # rules.
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installOnWindows.bat
+        run: gnpm install --frozen-lockfile   --runtimeVersion="${{ matrix.node }}"
       -
         name:  Fix up the settings.json
         run: |
@@ -275,4 +267,8 @@ jobs:
           powershell -Command "(gc settings.json.holder) -replace '\"points\": 10', '\"points\": 1000' | Out-File -encoding ASCII settings.json"
       -
         name: Run the backend tests
-        run: cd src && pnpm test
+        working-directory: src
+        run: gnpm test   --runtimeVersion="${{ matrix.node }}"
+      - name: Run the new vitest tests
+        working-directory: src
+        run: gnpm run test:vitest   --runtimeVersion="${{ matrix.node }}"

.github/workflows/build-and-deploy-docs.yml

@@ -32,36 +32,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - uses: actions/cache@v5
+        name: Setup gnpm cache
+        if: always()
+        with:
+          path: |
+            ${{ env.STORE_PATH }}
+            ~/.local/share/gnpm
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       - name: Setup Pages
         uses: actions/configure-pages@v5
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-      - name: Only install direct dependencies
-        run: pnpm config set auto-install-peers false
       - name: Install dependencies
-        run: pnpm install
+        run: gnpm install
       - name: Build app
         working-directory: doc
-        run: pnpm run docs:build
+        run: gnpm run docs:build
         env:
           COMMIT_REF: ${{ github.sha }}
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           # Upload entire repository
           path: './doc/.vitepress/dist'

.github/workflows/codeql-analysis.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
@@ -37,10 +37,10 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
       -
         name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
       -
         name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
       -
         name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Docker
+name: "Docker"
 on:
   pull_request:
     paths-ignore:
@@ -18,10 +18,15 @@ permissions:
 jobs:
   docker:
     runs-on: ubuntu-latest
+    env:
+      PNPM_HOME: ~/.pnpm-store
     steps:
       -
         name: Check out
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          path: etherpad
+
       -
         name: Set up QEMU
         if: github.event_name == 'push'
@@ -31,37 +36,33 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Build and export to Docker
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
-          context: .
+          context: ./etherpad
           target: production
           load: true
           tags: ${{ env.TEST_TAG }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-      -
+      - uses: actions/cache@v5
-        name: Set up Node.js
+        name: Setup gnpm cache
-        uses: actions/setup-node@v4
+        if: always()
         with:
-          node-version: 'lts/*'
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.PNPM_HOME }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            /usr/local/bin/gnpm
-          version: 9.0.4
+            /usr/local/bin/gnpm-0.0.12
-          run_install: false
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Test
+        working-directory: etherpad
         run: |
           docker run --rm -d -p 9001:9001 --name test ${{ env.TEST_TAG }}
           ./bin/installDeps.sh
@@ -75,7 +76,7 @@ jobs:
               *) printf %s\\n "unexpected status: ${status}" >&2; exit 1;;
             esac
           done
-          (cd src && pnpm run test-container)
+          (cd src && gnpm run test-container)
           git clean -dxf .
       -
         name: Docker meta
@@ -98,20 +99,43 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push
+        id: build-docker
         if: github.event_name == 'push'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
-          context: .
+          context: ./etherpad
           target: production
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
       - name: Update repo description
-        uses: peter-evans/dockerhub-description@v4
+        uses: peter-evans/dockerhub-description@v5
         if: github.ref == 'refs/heads/master'
         with:
+          readme-filepath: ./etherpad/README.md
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: etherpad/etherpad
           enable-url-completion: true
+      - name: Check out
+        if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+        uses: actions/checkout@v6
+        with:
+          path: ether-charts
+          repository: ether/ether-charts
+          token: ${{ secrets.ETHER_CHART_TOKEN }}
+      - name: Update tag in values-dev.yaml
+        if: success() && github.ref == 'refs/heads/develop'
+        working-directory: ether-charts
+        run: |
+          sed -i 's/tag: ".*"/tag: "${{ steps.build-docker.outputs.digest }}"/' values-dev.yaml
+      - name: Commit and push changes
+        working-directory: ether-charts
+        if: success() && github.ref == 'refs/heads/develop'
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add values-dev.yaml
+          git commit -m 'Update develop image tag'
+          git push

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

@@ -1,5 +1,5 @@
 # Leave the powered by Sauce Labs bit in as this means we get additional concurrency
-name: "Frontend admin tests powered by Sauce Labs"
+name: "Frontend admin tests"
 
 on:
   push:
@@ -11,14 +11,15 @@ permissions:
 
 jobs:
   withplugins:
-    if: ${{ github.actor != 'dependabot[bot]' }}
+    env:
+      PNPM_HOME: ~/.pnpm-store
     name: with plugins
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        node: [20, 21]
+        node: [20, 22, 24]
 
     steps:
       -
@@ -29,29 +30,30 @@ jobs:
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}-node${{ matrix.node }}'
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: ${{ matrix.node }}
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.PNPM_HOME }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            /usr/local/bin/gnpm
-          version: 9.0.4
+            /usr/local/bin/gnpm-0.0.12
-          run_install: false
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
+      - name: Cache playwright binaries
+        uses: actions/cache@v5
+        id: playwright-cache
+        with:
+          path: |
+            ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}
       #-
       #  name: Install etherpad plugins
       #  # We intentionally install an old ep_align version to test upgrades to
@@ -69,7 +71,7 @@ jobs:
       # rules.
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm i --runtimeVersion="${{ matrix.node }}"
       #-
       #  name: Install etherpad plugins
       #  run: rm -Rf node_modules/ep_align/static/tests/*
@@ -85,7 +87,7 @@ jobs:
         run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme1\",\"is_admin\":true}}/' settings.json"
       -
         name: increase maxHttpBufferSize
-        run: "sed -i 's/\"maxHttpBufferSize\": 10000/\"maxHttpBufferSize\": 10000000/' settings.json"
+        run: "sed -i 's/\"maxHttpBufferSize\": 50000/\"maxHttpBufferSize\": 10000000/' settings.json"
       -
         name: Disable import/export rate limiting
         run: |
@@ -93,8 +95,7 @@ jobs:
       - name: Build admin frontend
         working-directory: admin
         run: |
-            pnpm install
+            gnpm run build --runtimeVersion="${{ matrix.node }}"
-            pnpm run build
       #  name: Run the frontend admin tests
       #  shell: bash
       #  env:
@@ -125,7 +126,7 @@ jobs:
       - name: Run the frontend admin tests
         shell: bash
         run: |
-          pnpm run dev &
+          gnpm run prod --runtimeVersion="${{ matrix.node }}" &
           connected=false
           can_connect() {
           curl -sSfo /dev/null http://localhost:9001/ || return 1
@@ -137,10 +138,10 @@ jobs:
           sleep 1
           done
           cd src
-          pnpm exec playwright install
+          gnpm exec playwright install --runtimeVersion="${{ matrix.node }}"
-          pnpm exec playwright install-deps
+          gnpm exec playwright install-deps --runtimeVersion="${{ matrix.node }}"
-          pnpm run test-admin
+          gnpm run test-admin --runtimeVersion="${{ matrix.node }}"
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report-${{ matrix.node }}

.github/workflows/frontend-tests.yml

@@ -11,6 +11,8 @@ permissions:
 
 jobs:
   playwright-chrome:
+    env:
+      PNPM_HOME: ~/.pnpm-store
     name: Playwright Chrome
     runs-on: ubuntu-latest
     steps:
@@ -22,33 +24,27 @@ jobs:
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
-        with:
-          node-version: 21
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
         if: always()
         with:
-          path: ${{ env.STORE_PATH }}
+          path: |
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            ${{ env.PNPM_HOME }}
+            ~/.cache/ms-playwright
+            ~/.local/share/gnpm
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       -
         name: export GIT_HASH to env
         id: environment
@@ -59,7 +55,7 @@ jobs:
       - name: Run the frontend tests
         shell: bash
         run: |
-          pnpm run dev &
+          gnpm run prod  &
           connected=false
           can_connect() {
           curl -sSfo /dev/null http://localhost:9001/ || return 1
@@ -71,15 +67,17 @@ jobs:
           sleep 1
           done
           cd src
-          pnpm exec playwright install chromium  --with-deps
+          gnpm exec playwright install chromium  --with-deps
-          pnpm run test-ui --project=chromium
+          gnpm run test-ui --project=chromium
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report-${{ matrix.node }}-chrome
           path: src/playwright-report/
           retention-days: 30
   playwright-firefox:
+    env:
+        PNPM_HOME: ~/.pnpm-store
     name: Playwright Firefox
     runs-on: ubuntu-latest
     steps:
@@ -89,31 +87,26 @@ jobs:
           printf %s\\n '::set-output name=name::${{ github.workflow }} - ${{ github.job }}'
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      - uses: actions/setup-node@v4
+      - uses: actions/cache@v5
-        with:
+        name: Setup gnpm cache
-          node-version: 21
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
         if: always()
         with:
-          path: ${{ env.STORE_PATH }}
+          path: |
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            ${{ env.PNPM_HOME }}
+            ~/.local/share/gnpm
+            ~/.cache/ms-playwright
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       - name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       - name: export GIT_HASH to env
         id: environment
         run: echo "::set-output name=sha_short::$(git rev-parse --short ${{ github.sha }})"
@@ -122,7 +115,7 @@ jobs:
       - name: Run the frontend tests
         shell: bash
         run: |
-          pnpm run dev &
+          gnpm run prod &
           connected=false
           can_connect() {
           curl -sSfo /dev/null http://localhost:9001/ || return 1
@@ -134,9 +127,9 @@ jobs:
           sleep 1
           done
           cd src
-          pnpm exec playwright install firefox  --with-deps
+          gnpm exec playwright install firefox  --with-deps
-          pnpm run test-ui --project=firefox
+          gnpm run test-ui --project=firefox
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report-${{ matrix.node }}-firefox
@@ -145,7 +138,8 @@ jobs:
   playwright-webkit:
     name: Playwright Webkit
     runs-on: ubuntu-latest
-
+    env:
+      PNPM_HOME: ~/.pnpm-store
     steps:
       -
         name: Generate Sauce Labs strings
@@ -155,33 +149,26 @@ jobs:
           printf %s\\n '::set-output name=tunnel_id::${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}'
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
-        with:
-          node-version: 21
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
         if: always()
         with:
-          path: ${{ env.STORE_PATH }}
+          path: |
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            ${{ env.PNPM_HOME }}
-          restore-keys: |
+            ~/.local/share/gnpm
-            ${{ runner.os }}-pnpm-store-
+            ~/.cache/ms-playwright
-      - name: Only install direct dependencies
+            /usr/local/bin/gnpm
-        run: pnpm config set auto-install-peers false
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       -
         name: export GIT_HASH to env
         id: environment
@@ -192,7 +179,7 @@ jobs:
       - name: Run the frontend tests
         shell: bash
         run: |
-          pnpm run dev &
+          gnpm run prod &
           connected=false
           can_connect() {
           curl -sSfo /dev/null http://localhost:9001/ || return 1
@@ -204,9 +191,9 @@ jobs:
           sleep 1
           done
           cd src
-          pnpm exec playwright install webkit --with-deps
+          gnpm exec playwright install webkit --with-deps
-          pnpm run test-ui --project=webkit || true
+          gnpm run test-ui --project=webkit || true
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         if: always()
         with:
           name: playwright-report-${{ matrix.node }}-webkit

.github/workflows/handleRelease.yml

@@ -0,0 +1,61 @@
+name: "Handle release"
+
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  # allow manual triggering of the workflow
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  PNPM_HOME: ~/.pnpm-store
+
+jobs:
+  create-release:
+    permissions: write-all
+    # run on pushes to any branch
+    # run on PRs from external forks
+    if: |
+      (github.event_name != 'pull_request')
+      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    name: Handle the release
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout repository
+        uses: actions/checkout@v6
+      - uses: actions/cache@v5
+        name: Setup gnpm cache
+        if: always()
+        with:
+          path: |
+            ${{ env.STORE_PATH }}
+            ~/.local/share/gnpm
+            ~/.cache/ms-playwright
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
+      - name: Install all dependencies and symlink for ep_etherpad-lite
+        run: gnpm install --frozen-lockfile
+      - name: Build etherpad
+        run: gnpm run build:etherpad
+      # On release, create release
+      - name: Generate Changelog
+        working-directory: bin
+        run: gnpm run generateChangelog ${{ github.ref }} > ${{ github.workspace }}-CHANGELOG.txt
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{startsWith(github.ref, 'refs/tags/v') }}
+        with:
+          body_path: ${{ github.workspace }}-CHANGELOG.txt
+          make_latest: true

.github/workflows/load-test.yml

@@ -12,6 +12,10 @@ on:
 permissions:
   contents: read
 
+env:
+  PNPM_HOME: ~/.pnpm-store
+  LOG_LEVEL: DEBUG
+
 jobs:
   withoutplugins:
     # run on pushes to any branch
@@ -24,38 +28,37 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: 20
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.STORE_PATH }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            ~/.cache/ms-playwright
-          version: 9.0.4
+            /usr/local/bin/gnpm
-          run_install: false
+            /usr/local/bin/gnpm-0.0.12
-      - name: Get pnpm store directory
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       -
         name: Install etherpad-load-test
         run: sudo npm install -g etherpad-load-test-socket-io
       -
         name: Run load test
-        run: src/tests/frontend/travis/runnerLoadTest.sh 25 50
+        run: |
+          gnpm --gnpmEnv
+          eval "$(gnpm --gnpmEnv)"
+          echo $PATH
+          src/tests/frontend/travis/runnerLoadTest.sh 25 50
 
   withplugins:
     # run on pushes to any branch
@@ -68,38 +71,33 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: 20
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.STORE_PATH }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            ~/.cache/ms-playwright
-          version: 9.0.4
+            /usr/local/bin/gnpm
-          run_install: false
+            /usr/local/bin/gnpm-0.0.12
-      - name: Get pnpm store directory
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install etherpad-load-test
-        run:  pnpm install -g etherpad-load-test-socket-io
+        run:  sudo npm install -g etherpad-load-test-socket-io
       -
         name: Install etherpad plugins
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
         # https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --workspace-root
+          gnpm install --workspace-root
           ep_align
           ep_author_hover
           ep_cursortrace
@@ -123,10 +121,12 @@ jobs:
       # rules.
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       -
         name: Run load test
-        run: src/tests/frontend/travis/runnerLoadTest.sh 25 50
+        run: |
+          eval "$(gnpm --gnpmEnv)"
+          src/tests/frontend/travis/runnerLoadTest.sh 25 50
 
   long:
     # run on pushes to any branch
@@ -139,35 +139,34 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: 20
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.STORE_PATH }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            ~/.cache/ms-playwright
-          version: 9.0.4
+            /usr/local/bin/gnpm
-          run_install: false
+            /usr/local/bin/gnpm-0.0.12
-      - name: Get pnpm store directory
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       -
         name: Install etherpad-load-test
         run: sudo npm install -g etherpad-load-test-socket-io
       -
         name: Run load test
-        run: src/tests/frontend/travis/runnerLoadTest.sh 5000 5
+        run: |
+          gnpm --gnpmEnv
+          eval "$(gnpm --gnpmEnv)"
+          echo $PATH
+          src/tests/frontend/travis/runnerLoadTest.sh 5000 5

.github/workflows/perform-type-check.yml

@@ -12,6 +12,8 @@ on:
 permissions:
   contents: read
 
+env:
+  PNPM_HOME: ~/.pnpm-store
 
 jobs:
   performTypeCheck:
@@ -22,31 +24,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      - uses: actions/setup-node@v4
+      - uses: actions/cache@v5
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: 20
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.STORE_PATH }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            ~/.cache/ms-playwright
-          version: 9.0.4
+            /usr/local/bin/gnpm
-          run_install: false
+            /usr/local/bin/gnpm-0.0.12
-      - name: Get pnpm store directory
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
-      - name: Only install direct dependencies
+      - name: Setup gnpm
-        run: pnpm config set auto-install-peers false
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: ./bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       - name: Perform type check
         working-directory: ./src
-        run: npm run ts-check
+        run: gnpm run ts-check

.github/workflows/rate-limit.yml

@@ -12,6 +12,9 @@ on:
 permissions:
   contents: read
 
+env:
+  PNPM_HOME: ~/.pnpm-store
+
 jobs:
   ratelimit:
     # run on pushes to any branch
@@ -24,31 +27,28 @@ jobs:
     steps:
       -
         name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: 20
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.STORE_PATH }}
-        name: Install pnpm
+            ~/.local/share/gnpm
-        with:
+            ~/.cache/ms-playwright
-          version: 9.0.4
+            /usr/local/bin/gnpm
-          run_install: false
+            /usr/local/bin/gnpm-0.0.12
-      - name: Get pnpm store directory
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+            ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
 
       -
         name: docker network
-        run: docker network create --subnet=172.23.42.0/16 ep_net
+        run: docker network create --subnet=172.23.0.0/16 ep_net
       -
         name: build docker image
         run: |
@@ -63,7 +63,7 @@ jobs:
           docker run --rm --network ep_net --ip 172.23.42.3 --name anotherip -dt anotherip
       -
         name: install dependencies and create symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile
       -
         name: run rate limit test
         run: |

.github/workflows/release.yml

@@ -0,0 +1,90 @@
+permissions:
+  contents: read
+name: Release etherpad
+on:
+  workflow_dispatch:
+    inputs:
+      release_type:
+        description: 'Choose the type of release to create'
+        required: true
+        default: 'patch'
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+
+env:
+  PNPM_HOME: ~/.pnpm-store
+
+jobs:
+  releases:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+            repository: ether/etherpad-lite
+            path: etherpad
+            token: '${{ secrets.ETHER_RELEASE_TOKEN }}'
+            fetch-depth: '0'
+            fetch-tags: 'true'
+      - name: Checkout master
+        working-directory: etherpad
+        run: |
+          git fetch origin master
+          git checkout master
+          git reset --hard origin/master
+      - name: Checkout develop
+        working-directory: etherpad
+        run: |
+          git fetch origin develop
+          git checkout develop
+          git reset --hard origin/develop
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          repository: ether/ether.github.com
+          path: ether.github.com
+          token: '${{ secrets.ETHER_RELEASE_TOKEN }}'
+      - uses: actions/cache@v5
+        name: Setup gnpm cache
+        if: always()
+        with:
+          path: |
+            ${{ env.STORE_PATH }}
+            ~/.local/share/gnpm
+            ~/.cache/ms-playwright
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
+        with:
+          version: 0.0.12
+      - name: Install dependencies ether.github.com
+        run: gnpm install --frozen-lockfile
+        working-directory: ether.github.com
+      - name: Set git user
+        run: |
+          git config --global user.name "Etherpad Release Bot"
+          git config --global user.email "noreply@etherpad.org"
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+
+      - uses: reitzig/actions-asciidoctor@v2.0.2
+        with:
+          version: 2.0.18
+      - name: Prepare release
+        working-directory: etherpad
+        run: |
+          cd bin
+          gnpm install
+          gnpm run release ${{ inputs.release_type }}
+      - name: Push after release
+        working-directory: etherpad
+        run: |
+          ./bin/push-after-release.sh

.github/workflows/releaseEtherpad.yml

@@ -0,0 +1,45 @@
+name: releaseEtherpad.yaml
+permissions:
+  contents: read
+on:
+  workflow_dispatch:
+
+env:
+  PNPM_HOME: ~/.pnpm-store
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+        - name: Checkout repository
+          uses: actions/checkout@v6
+        - name: Get pnpm store directory
+          shell: bash
+          run: |
+            echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+        - uses: actions/cache@v5
+          name: Setup pnpm cache
+          if: always()
+          with:
+            path: |
+              ${{ env.STORE_PATH }}
+              ~/.local/share/gnpm
+              /usr/local/bin/gnpm
+              /usr/local/bin/gnpm-0.0.12
+            key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+            restore-keys: |
+              ${{ runner.os }}-gnpm-store-
+        - name: Setup gnpm
+          uses: SamTV12345/gnpm-setup@main
+          with:
+            version: 0.0.12
+        - name: Install dependencies
+          run: gnpm install --frozen-lockfile
+        - name: Rename etherpad
+          working-directory: ./src
+          run: sed -i 's/ep_etherpad-lite/ep_etherpad/g' package.json
+        - name: Release to npm
+          run: gnpm publish --no-git-checks
+          working-directory: ./src
+          env:
+            NODE_AUTH_TOKEN: ${{ secrets.NPM_PRIVATE_TOKEN }}

.github/workflows/stale.yml

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

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

@@ -12,6 +12,9 @@ on:
 permissions:
   contents: read
 
+env:
+  PNPM_HOME: ~/.pnpm-store
+
 jobs:
   withpluginsLinux:
     # run on pushes to any branch
@@ -24,81 +27,70 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 21]
+        node: [20, 22, 24]
     steps:
       -
         name: Check out latest release
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
-          ref: master
+          ref: develop #FIXME change to master when doing release
-      -
+      - uses: actions/cache@v5
-        uses: actions/setup-node@v4
+        name: Setup gnpm cache
+        if: always()
         with:
-          node-version: ${{ matrix.node }}
+          path: |
-      - uses: pnpm/action-setup@v3
+            ${{ env.STORE_PATH }}
-        name: Install pnpm
+            ~/.local/share/gnpm
+            ~/.cache/ms-playwright
+            /usr/local/bin/gnpm
+            /usr/local/bin/gnpm-0.0.12
+          key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-gnpm-store-
+      - name: Setup gnpm
+        uses: SamTV12345/gnpm-setup@main
         with:
-          version: 9.0.4
+          version: 0.0.12
-          run_install: false
-      - name: Only install direct dependencies
-        run: pnpm config set auto-install-peers false
       - name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.6.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-      - name: Only install direct dependencies
-        run: pnpm config set auto-install-peers false
       -
         name: Install libreoffice
-        uses: awalsh128/cache-apt-pkgs-action@v1.4.2
+        uses: awalsh128/cache-apt-pkgs-action@v1.6.0
         with:
           packages: libreoffice libreoffice-pdfimport
           version: 1.0
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: bin/installDeps.sh
+        run: gnpm install --frozen-lockfile --runtimeVersion="${{ matrix.node }}"
-      - name: Install admin ui
-        working-directory: admin
-        run: pnpm install
       - name: Build admin ui
         working-directory: admin
-        run: pnpm build
+        run: gnpm build --runtimeVersion="${{ matrix.node }}"
       -
         name: Install Etherpad plugins
         run: >
-          pnpm run install-plugins
+          gnpm run install-plugins
           ep_align
           ep_author_hover
           ep_cursortrace
           ep_font_size
           ep_hash_auth
           ep_headings2
-          ep_image_upload
           ep_markdown
           ep_readonly_guest
           ep_set_title_on_pad
           ep_spellcheck
           ep_subscript_and_superscript
-          ep_table_of_contents
+          ep_table_of_contents --runtimeVersion="${{ matrix.node }}"
       -
         name: Run the backend tests
-        run: pnpm run test
+        run: gnpm run test --runtimeVersion="${{ matrix.node }}"
       -
         name: Install all dependencies and symlink for ep_etherpad-lite
-        run: ./bin/installDeps.sh
+        run: gnpm install --frozen-lockfile --runtimeVersion="${{ matrix.node }}"
-      # Because actions/checkout@v4 is called with "ref: master" and without
+      # Because actions/checkout@v6 is called with "ref: master" and without
       # "fetch-depth: 0", the local clone does not have the ${GITHUB_SHA}
       # commit. Fetch ${GITHUB_REF} to get the ${GITHUB_SHA} commit. Note that a
       # plain "git fetch" only fetches "normal" references (refs/heads/* and
@@ -114,4 +106,4 @@ jobs:
         # commit that merges the PR's source branch to its destination branch.
         run: git checkout "${GITHUB_SHA}"
       - name: Run the backend tests
-        run: pnpm run test
+        run: gnpm run test --runtimeVersion="${{ matrix.node }}"

.github/workflows/windows.yml

@@ -1,171 +0,0 @@
-name: "Windows Build"
-
-# any branch is useful for testing before a PR is submitted
-on:
-  push:
-    paths-ignore:
-      - "doc/**"
-  pull_request:
-    paths-ignore:
-      - "doc/**"
-
-permissions:
-  contents: read
-
-jobs:
-  build-zip:
-    # run on pushes to any branch
-    # run on PRs from external forks
-    if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Build .zip
-    runs-on: windows-latest
-    steps:
-      -
-        uses: msys2/setup-msys2@v2
-        with:
-          path-type: inherit
-          install: >-
-            zip
-      -
-        name: Checkout repository
-        uses: actions/checkout@v4
-      -
-        uses: actions/setup-node@v4
-        with:
-          node-version: 21
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-      - name: Only install direct dependencies
-        run: pnpm config set auto-install-peers false
-      -
-        name: Install all dependencies and symlink for ep_etherpad-lite
-        shell: msys2 {0}
-        run: bin/installDeps.sh
-      -
-        name: Run the backend tests
-        shell: msys2 {0}
-        run: cd src && pnpm test
-      -
-        name: Build the .zip
-        shell: msys2 {0}
-        run: bin/buildForWindows.sh
-      -
-        name: Archive production artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: etherpad-win.zip
-          path: etherpad-win.zip
-
-  build-exe:
-    if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Build .exe
-    needs: build-zip
-    runs-on: windows-latest
-    steps:
-      -
-        name: Checkout repository
-        uses: actions/checkout@v4
-      -
-        name: Download .zip
-        uses: actions/download-artifact@v4
-        with:
-          name: etherpad-win.zip
-          path: ..
-      -
-        name: Extract .zip
-        working-directory: ..
-        run: 7z x etherpad-win.zip -oetherpad-zip
-      -
-        name: Create installer
-        uses: joncloud/makensis-action@v4.1
-        with:
-          script-file: 'bin/nsis/etherpad.nsi'
-      -
-        name: Archive production artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: etherpad-win.exe
-          path: etherpad-win.exe
-
-  deploy-zip:
-    # run on pushes to any branch
-    # run on PRs from external forks
-    permissions:
-      contents: write
-    if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Deploy
-    needs: build-zip
-    runs-on: windows-latest
-    steps:
-      -
-        name: Download zip
-        uses: actions/download-artifact@v4
-        with:
-          name: etherpad-win.zip
-      -
-        name: Extract Etherpad
-        run: 7z x etherpad-win.zip -oetherpad
-      -
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 9.0.4
-          run_install: false
-      - name: Get pnpm store directory
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-      - uses: actions/cache@v4
-        name: Setup pnpm cache
-        with:
-          path: ${{ env.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-      - name: Only install direct dependencies
-        run: pnpm config set auto-install-peers false
-      - name: Install all dependencies and symlink for ep_etherpad-lite
-        run: .\bin\installOnWindows.bat
-        working-directory: etherpad
-      -
-        name: Run Etherpad
-        working-directory: etherpad/src
-        run: |
-          pnpm install cypress
-          .\node_modules\.bin\cypress.cmd install --force
-          pnpm run prod &
-          curl --connect-timeout 10 --max-time 20 --retry 5 --retry-delay 10 --retry-max-time 60 --retry-connrefused http://127.0.0.1:9001/p/test
-          pnpm exec cypress run --config-file ./tests/frontend/cypress/cypress.config.js
-      # On release, upload windows zip to GitHub release tab
-      -
-        name: Rename to etherpad-lite-win.zip
-        shell: powershell
-        run: mv etherpad-win.zip etherpad-lite-win.zip
-      - name: upload binaries to release
-        uses: softprops/action-gh-release@v2
-        if: ${{startsWith(github.ref, 'refs/tags/v') }}
-        with:
-            files: etherpad-lite-win.zip

CHANGELOG.md

@@ -1,3 +1,171 @@
+# 2.6.0
+
+### Notable enhancements and fixes
+
+- Added native option to transfer your Etherpad session between browsers. If you use multiple browsers or different PC for Etherpad they are different sessions. Meaning typing on one PC and then switching to another one in the same pad will result in different authorship colors. With this new feature you can now transfer your session to another browser or PC. To do so, open the home page and click on the wheel icon in the top right corner. After that click through the first dialog prompting you to copy a code to your clipboard. On your second browser open the same dialog and switch to "Receive Session" tab. There you can paste the code you copied before and click on "Receive Session". After that your session is transferred, and you can continue editing with the same authorship color as before. Just be aware that you can't have two active sessions at once in a pad.
+- Updated to oidc provider v2.6.0 after resolving compatibility issues.
+
+🎉 For all the people celebrating: Have a happy and awesome new year! 🎉 There is something big on the horizon for Etherpad in 2026. Stay tuned!
+
+# 2.5.3
+
+### Notable enhancements and fixes
+- Fixed an issue with the release script that caused the release to not be created correctly.
+
+# 2.5.2
+
+### Notable enhancements and fixes
+
+- Fixes the no skin theme having an overlapping
+- Adds a new setting to disable recent pads to be shown. By setting `showRecentPads` to false in the `settings.json` file you can disable the recent pads feature on the home screen.
+- Sets the oidc-provider version to 9.5.1 as 9.5.2 crashes Etherpad on startup.
+
+# 2.5.1
+
+### Notable enhancements and fixes
+
+- Added endpoint for prometheus scraping. You can now scrape the metrics endpoint with prometheus. It is available at /stats/prometheus if you have enableMetrics set to true in your settings.json
+
+- fixed exposeVersion causing the pad panel to not load correctly
+- fixed admin manage pad url to also take the base path into account
+
+# 2.5.0
+
+### Notable enhancements and fixes
+
+- Updated to express 5.0.0. This is a major update to express that brings a lot of improvements and fixes. Please update all your plugins to the latest version to ensure compatibility. A lot changed in the route matching, and thus old plugins will throw errors and crash Etherpad.
+- Fixed an issue with the no-skin theme with cookie recentPadList feature
+- Fixed layout issues with the no-skin theme
+
+# 2.4.2
+
+### Notable enhancements and fixes
+- Fixed a german translation in the english translation file.
+
+# 2.4.1
+
+### Notable enhancements and fixes
+
+- Added generating release through ci cd pipeline.
+- Readded temporarily disabled workflows after release generation works again
+
+# 2.4.0
+
+### Notable enhancements and fixes
+- Added home button to the pad panel. To show it in your current instance, please copy the updated "toolbar" settings from the `settings.json.template` file to your `settings.json` file.
+- Added more current design for the default collibri theme.
+- Added handling of recent visited pads in the collibri theme. You can now access the most recent three pads you visited in the pad panel.
+- Disable stats endpoints if enableMetrics is set to false. This allows you to disable the metrics endpoints if you don't want to use them.
+- Use Node LTS instead of always latest Node version.
+
+
+# 2.3.2
+
+### Notable enhancements and fixes
+
+- Fixed admin ui displaying incorrect text
+
+# 2.3.1
+
+### Notable enhancements and fixes
+
+- Dependency updates
+
+# 2.3.0
+
+### Notable enhancements and fixes
+
+- Added possibility to cluster Etherpads behind reverse proxy. There is now a new reverse proxy designed for Etherpads that handles multiple Etherpads and the created pads in them. It will assign the pad assignement to an Etherpad at random but once the choice was made it will always reverse proxy the same backend. This allows to host multiple concurrent Etherpads and benefit from multi core systems even though one Etherpad is singlethreaded.
+- Added reverse proxy configuration for replacing Nginx. In the past there were some issues with nginx and its configuration. This reverse proxy allows you to handle your configuration with ease.
+
+If you want to find out more about the reverse proxy method check out the repository https://github.com/ether/etherpad-proxy . It also contains a sample docker-compose file with three Etherpads and one etherpad-proxy. Of course you need to adapt the settings.json.template to your liking and map it into the reverse proxy image before you are ready :).
+
+
+- Added client authorization to work with Etherpad. Before it would get blocked because it doesn't have the required claim. As this is now fixed etherpad-proxy can also work with your new OAuth2 configuration and retrieve a token via client credentials flow.
+
+
+
+
+# 2.2.7
+
+
+### Notable enhancements and fixes
+
+- We migrated all important pages to React 19 and React Router v7
+
+Besides that only dependency updates.
+
+
+ -> Have a merry Christmas and a happy new year.  🎄 🎁
+
+
+# 2.2.6
+
+### Notable enhancements and fixes
+
+- Added option to delete a pad by the creator. This option can be found in the settings menu. When you click on it you get a confirm dialog and after that you have the chance to completely erase the pad.
+
+
+# 2.2.5
+
+### Notable enhancements and fixes
+
+- Fixed timeslider not scrolling when the revision count is a multiple of 100
+- Added new Restful API for version 2 of Etherpad. It is available at /api-docs
+
+
+# 2.2.4
+
+### Notable enhancements and fixes
+
+- Switched to new SQLite backend
+- Fixed rusty-store-kv module not found
+
+
+# 2.2.3
+
+### Notable enhancements and fixes
+
+- Introduced a new in process database `rustydb` that represents a fast key value store written in Rust.
+- Readded window._ as a shortcut for getting text
+- Added support for migrating any ueberdb database to another. You can now switch as you please. See here: https://docs.etherpad.org/cli.html
+- Further Typescript movements
+- A lot of security issues fixed and reviewed in this release. Please update.
+
+
+# 2.2.2
+
+### Notable enhancements and fixes
+
+- Removal of Etherpad require kernel: We finally managed to include esbuild to bundle our frontend code together. So no matter how many plugins your server has it is always one JavaScript file. This boosts performance dramatically.
+- Added log layoutType: This lets you print the log in either colored or basic (black and white text)
+- Introduced esbuild for bundling CSS files
+- Cache all files to be bundled in memory for faster load speed
+
+
+# 2.1.1
+
+
+### Notable enhancements and fixes
+
+- Fixed failing Docker build when checked out as git submodule. Thanks to @neurolabs
+- Fixed: Fallback to websocket and polling when unknown(old) config is present for socket io
+- Fixed: Next page disabled if zero page by @samyakj023
+- On CTRL+CLICK bring the window back to focus by Helder Sepulveda
+
+# 2.1.0
+
+### Notable enhancements and fixes
+
+- Added PWA support. You can now add your Etherpad instance to your home screen on your mobile device or desktop.
+- Fixed live plugin manager versions clashing. Thanks to @yacchin1205
+- Fixed a bug in the pad panel where pagination was not working correctly when sorting by pad name
+
+### Compatibility changes
+
+- Reintroduced APIKey.txt support. You can now switch between APIKey and OAuth2.0 authentication. This can be toggled with the setting authenticationMethod. The default is OAuth2. If you want to use the APIKey method you can set that to `apikey`.
+
+
 # 2.0.3
 
 ### Notable enhancements and fixes
@@ -47,8 +215,8 @@
   - Bin folder: The bin folder has been moved from the src folder to the root folder. This change was necessary as the contained scripts do not represent core functionality of the user.
   - Starting Etherpad: Etherpad can now be started with a single command: `pnpm run prod` in the root directory.
   - Installing Etherpad: Etherpad no longer symlinks itself in the root directory. This is now also taken care by pnpm, and it just creates a node_modules folder with the src directory`s ep_etherpad-lite folder
-  - Plugins can now be installed simply via the command: `pnpm run install-plugins first-plugin second-plugin` or if you want to install from path you can do:
+  - Plugins can now be installed simply via the command: `pnpm run plugins i first-plugin second-plugin` or if you want to install from path you can do:
-  `pnpm run install-plugins --path ../path-to-plugin`
+  `pnpm run plugins i --path ../path-to-plugin`
 
 
 # 1.9.7

Dockerfile

@@ -3,16 +3,17 @@
 # https://github.com/ether/etherpad-lite
 #
 # Author: muxator
+ARG BUILD_ENV=git
 
-FROM node:alpine as adminBuild
+FROM node:lts-alpine AS adminbuild
-
+RUN npm install -g pnpm@latest
 WORKDIR /opt/etherpad-lite
-COPY ./ ./
+COPY . .
-RUN cd ./admin && npm install -g pnpm@9.0.4 && pnpm install && pnpm run build --outDir ./dist
+RUN pnpm install
-RUN cd ./ui && pnpm install && pnpm run build --outDir ./dist
+RUN pnpm run build:ui
 
 
-FROM node:alpine as build
+FROM node:lts-alpine AS build
 LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
 
 # Set these arguments when building the image from behind a proxy
@@ -49,6 +50,14 @@ ARG ETHERPAD_PLUGINS=
 #   ETHERPAD_LOCAL_PLUGINS="../ep_my_plugin ../ep_another_plugin"
 ARG ETHERPAD_LOCAL_PLUGINS=
 
+# github plugins to install while building the container. By default no plugins are
+# installed.
+# If given a value, it has to be a space-separated, quoted list of plugin names.
+#
+# EXAMPLE:
+#   ETHERPAD_GITHUB_PLUGINS="ether/ep_plugin"
+ARG ETHERPAD_GITHUB_PLUGINS=
+
 # Control whether abiword will be installed, enabling exports to DOC/PDF/ODT formats.
 # By default, it is not installed.
 # If given any value, abiword will be installed.
@@ -91,53 +100,81 @@ RUN mkdir -p "${EP_DIR}" && chown etherpad:etherpad "${EP_DIR}"
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
 RUN  \
     mkdir -p /usr/share/man/man1 && \
-    npm install pnpm@9.0.4 -g  && \
+    npm install pnpm@latest -g  && \
     apk update && apk upgrade && \
     apk add --no-cache \
         ca-certificates \
         curl \
         git \
         ${INSTALL_ABIWORD:+abiword abiword-plugin-command} \
-        ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common}
+        ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common} && \
+    rm -rf /var/cache/apk/*
 
 USER etherpad
 
 WORKDIR "${EP_DIR}"
 
 # etherpads version feature requires this. Only copy what is really needed
-COPY --chown=etherpad:etherpad ./.git/HEAD ./.git/HEAD
-COPY --chown=etherpad:etherpad ./.git/refs ./.git/refs
 COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
 COPY --chown=etherpad:etherpad ./var ./var
 COPY --chown=etherpad:etherpad ./bin ./bin
 COPY --chown=etherpad:etherpad ./pnpm-workspace.yaml ./package.json ./
 
-FROM build as development
 
-COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/
+
-COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/admin/dist ./src/templates/admin
+FROM build AS build_git
-COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/ui/dist ./src/static/oidc
+ONBUILD COPY --chown=etherpad:etherpad ./.git/HEA[D] ./.git/HEAD
+ONBUILD COPY --chown=etherpad:etherpad ./.git/ref[s] ./.git/refs
+
+FROM build AS build_copy
+
+
+
+
+FROM build_${BUILD_ENV} AS development
+
+ARG ETHERPAD_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS_ENV=
+ARG ETHERPAD_GITHUB_PLUGINS=
+
+COPY --chown=etherpad:etherpad ./src/ ./src/
+COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/ templates/admin./src/templates/admin
+COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/static/oidc ./src/static/oidc
+
+COPY --chown=etherpad:etherpad ./local_plugin[s] ./local_plugins/
+
+RUN bash -c ./bin/installLocalPlugins.sh
 
 RUN bin/installDeps.sh && \
-    if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \
+  if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_GITHUB_PLUGINS}" ]; then \
-        pnpm run install-plugins ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
+      pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_GITHUB_PLUGINS:+--github ${ETHERPAD_GITHUB_PLUGINS}}; \
-    fi
+  fi
 
 
-FROM build as production
+FROM build_${BUILD_ENV} AS production
+
+ARG ETHERPAD_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS=
+ARG ETHERPAD_LOCAL_PLUGINS_ENV=
+ARG ETHERPAD_GITHUB_PLUGINS=
 
 ENV NODE_ENV=production
 ENV ETHERPAD_PRODUCTION=true
 
 COPY --chown=etherpad:etherpad ./src ./src
-COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/admin/dist ./src/templates/admin
+COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/templates/admin ./src/templates/admin
-COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/ui/dist ./src/static/oidc
+COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/src/static/oidc ./src/static/oidc
 
-RUN bin/installDeps.sh && rm -rf ~/.npm && rm -rf ~/.local && rm -rf ~/.cache && \
+COPY --chown=etherpad:etherpad ./local_plugin[s] ./local_plugins/
-    if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \
-        pnpm run install-plugins ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
-    fi
 
+RUN bash -c ./bin/installLocalPlugins.sh
+
+RUN bin/installDeps.sh && \
+  if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_GITHUB_PLUGINS}" ]; then \
+      pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_GITHUB_PLUGINS:+--github ${ETHERPAD_GITHUB_PLUGINS}}; \
+  fi && \
+    pnpm store prune
 
 # Copy the configuration file.
 COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json

README.md

@@ -90,7 +90,7 @@ services:
     # ports:
     #   - "5432:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql/data/pgdata
+      - postgres_data:/var/lib/postgresql/data
 
 volumes:
   postgres_data:
@@ -98,76 +98,19 @@ volumes:
   etherpad-var:
 ```
 
-
-
 ### Requirements
 
 [Node.js](https://nodejs.org/) >= **18.18.2**.
 
-### GNU/Linux and other UNIX-like systems
+### Windows, macOS, Linux
 
-#### Quick install on Debian/Ubuntu
+1. Download the latest Node.js runtime from [nodejs.org](https://nodejs.org/).
-
+2. Install pnpm: `npm install -g pnpm` (Administrator privileges may be required).
-Install the latest Node.js LTS per [official install instructions](https://github.com/nodesource/distributions#installation-instructions), then:
+3. Clone the repository: `git clone -b master`
-```sh
+4. Run `pnpm i`
-git clone --branch master https://github.com/ether/etherpad-lite.git &&
+5. Run `pnpm run build:etherpad`
-cd etherpad-lite &&
+6. Run `pnpm run prod`
-bin/run.sh
+7. Visit `http://localhost:9001` in your browser.
-```
-
-#### Manual install
-
-You'll need Git and [Node.js](https://nodejs.org/) installed.
-
-**As any user (we recommend creating a separate user called etherpad):**
-
-  1. Move to a folder where you want to install Etherpad.
-  2. Clone the Git repository: `git clone --branch master
-     https://github.com/ether/etherpad-lite.git`
-  3. Change into the new directory containing the cloned source code: `cd
-     etherpad-lite`
-  4. Run `bin/run.sh` and open http://127.0.0.1:9001 in your browser.
-
-To update to the latest released version, execute `git pull origin`. The next
-start with `bin/run.sh` will update the dependencies.
-
-### Windows
-
-#### Prebuilt Windows package
-
-This package runs on any Windows machine. You can perform a manual installation
-via git for development purposes, but as this uses symlinks which performs
-unreliably on Windows, please stick to the prebuilt package if possible.
-
-  1. [Download the latest Windows package](https://etherpad.org/#download)
-  2. Extract the folder
-
-Run `start.bat` and open <http://localhost:9001> in your browser.
-
-#### Manually install on Windows
-
-You'll need [Node.js](https://nodejs.org) and (optionally, though recommended)
-git.
-
-  1. Grab the source, either:
-      * download <https://github.com/ether/etherpad-lite/zipball/master>
-      * or `git clone --branch master
-        https://github.com/ether/etherpad-lite.git`
-  2. With a "Run as administrator" command prompt execute
-     `bin\installOnWindows.bat`
-
-Now, run `start.bat` and open http://localhost:9001 in your browser.
-
-Update to the latest version with `git pull origin`, then run
-`bin\installOnWindows.bat`, again.
-
-If cloning to a subdirectory within another project, you may need to do the
-following:
-
-  1. Start the server manually (e.g. `node src/node/server.ts`)
-  2. Edit the db `filename` in `settings.json` to the relative directory with
-     the file (e.g. `application/lib/etherpad-lite/var/dirty.db`)
-  3. Add auto-generated files to the main project `.gitignore`
 
 ### Docker container
 
@@ -195,7 +138,7 @@ Alternatively, you can install plugins from the command line:
 
 ```sh
 cd /path/to/etherpad-lite
-pnpm run install-plugins ep_${plugin_name}
+pnpm run plugins i ep_${plugin_name}
 ```
 
 Also see [the plugin wiki
@@ -207,7 +150,7 @@ Run the following command in your Etherpad folder to get all of the features
 visible in the above demo gif:
 
 ```sh
-pnpm run install-plugins \
+pnpm run plugins i \
   ep_align \
   ep_comments_page \
   ep_embedded_hyperlinks2 \
@@ -231,6 +174,31 @@ following plugins:
     that each user's chosen color, display name, comment ownership, etc. is
     strongly linked to their account.
 
+### Upgrade Etherpad
+
+Run the following command in your Etherpad folder to upgrade
+
+1. Stop any running Etherpad (manual, systemd ...)
+2. Get present version
+```sh
+git -P tag --contains
+```
+3. List versions available
+```sh
+git -P tag --list "v*" --merged
+```
+4. Select the version
+```sh
+git checkout v2.2.5
+git switch -c v2.2.5
+```
+5. Upgrade Etherpad
+```sh
+./bin/run.sh
+```
+6. Stop with [CTRL-C]
+7. Restart your Etherpad service
+
 ## Next Steps
 
 ### Tweak the settings

admin/package.json

@@ -1,41 +1,46 @@
 {
   "name": "admin",
   "private": true,
-  "version": "2.0.3",
+  "version": "2.6.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "build-copy": "tsc && vite build --outDir ../src/templates/admin --emptyOutDir",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@radix-ui/react-switch": "^1.0.3"
+    "@radix-ui/react-switch": "^1.2.6"
   },
   "devDependencies": {
-    "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-dialog": "^1.1.15",
-    "@radix-ui/react-toast": "^1.1.5",
+    "@radix-ui/react-toast": "^1.2.15",
-    "@types/react": "^18.2.79",
+    "@types/react": "^19.2.8",
-    "@types/react-dom": "^18.2.25",
+    "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
+    "@typescript-eslint/eslint-plugin": "^8.53.1",
-    "@typescript-eslint/parser": "^7.7.0",
+    "@typescript-eslint/parser": "^8.53.1",
-    "@vitejs/plugin-react-swc": "^3.5.0",
+    "@vitejs/plugin-react": "^5.1.2",
-    "eslint": "^9.0.0",
+    "babel-plugin-react-compiler": "19.1.0-rc.3",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint": "^9.39.2",
-    "eslint-plugin-react-refresh": "^0.4.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
-    "i18next": "^23.11.2",
+    "eslint-plugin-react-refresh": "^0.4.26",
-    "i18next-browser-languagedetector": "^7.2.1",
+    "i18next": "^25.7.4",
-    "lucide-react": "^0.372.0",
+    "i18next-browser-languagedetector": "^8.2.0",
-    "react": "^18.2.0",
+    "lucide-react": "^0.562.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.2.3",
-    "react-hook-form": "^7.51.3",
+    "react-dom": "^19.2.3",
-    "react-i18next": "^14.1.0",
+    "react-hook-form": "^7.71.1",
-    "react-router-dom": "^6.22.3",
+    "react-i18next": "^16.5.3",
-    "socket.io-client": "^4.7.5",
+    "react-router-dom": "^7.12.0",
-    "typescript": "^5.4.5",
+    "socket.io-client": "^4.8.3",
-    "vite": "^5.2.9",
+    "typescript": "^5.9.3",
-    "vite-plugin-static-copy": "^1.0.3",
+    "vite": "npm:rolldown-vite@7.2.10",
-    "vite-plugin-svgr": "^4.2.0",
+    "vite-plugin-babel": "^1.4.1",
-    "zustand": "^4.5.2"
+    "vite-plugin-static-copy": "^3.1.5",
+    "zustand": "^5.0.10"
+  },
+  "overrides": {
+    "vite": "npm:rolldown-vite@7.2.10"
   }
 }

admin/public/brand.svg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg fill="#0f775b" width="355px" height="355px" viewBox="0 0 355 355" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Group 10</title>
+    <defs>
+        <!-- top line -->
+        <rect id="path-4" x="41" y="110" width="142" height="25" rx="12.5" fill="#0f775b">
+          <animate attributeName="width" from="0" to="142" dur="3s" fill="freeze"/>
+        </rect>
+
+        <!-- middle line -->
+        <rect id="path-2" x="42" y="167" width="168" height="27" rx="13.5" fill="#0f775b">
+          <animate attributeName="width" from="0" to="168" dur="5s" fill="freeze"/>
+        </rect>
+
+        <!-- bottom line -->
+        <rect id="path-6" x="41" y="226" width="105" height="25" rx="12.5" fill="#0f775b">
+          <animate attributeName="width" from="0" to="105" dur="2s" fill="freeze"/>
+        </rect>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" >
+        <g id="Group-5-Copy-2" transform="translate(-415.000000, -351.000000)">
+            <g id="Group-10" transform="translate(415.000000, 351.000000)">
+                <g id="Group-9" transform="translate(0.000000, 15.000000)">
+                    <!-- small radio wave -->
+                    <path stroke="0f775b" d="M237.612214,138.157654 C234.725783,135.28192 230.051254,135.279644 227.164823,138.157654 C224.278392,141.035663 224.278392,145.698831 227.164823,148.57684 C234.93988,156.329214 239.222735,166.601382 239.222735,177.499403 C239.222735,188.397423 234.93988,198.669591 227.164823,206.424696 C224.278392,209.30043 224.278392,213.965873 227.164823,216.841607 C228.608267,218.280384 230.497251,219 232.388518,219 C234.277503,219 236.16877,218.280384 237.612214,216.841607 C248.18012,206.304532 254,192.334147 254,177.499403 C254,162.665114 248.18012,148.694728 237.612214,138.157654 Z" id="Path-Copy-26" fill-opacity="0.200482" fill="#000000" fill-rule="nonzero" opacity="0.754065225">
+                      <animate attributeName="opacity" from="0" to="1" dur="3s" repeatCount="indefinite"/>
+                    </path>
+                    <!-- large radio wave -->
+                    <path stroke="0f775b" d="M267.333026,113.158661 C264.51049,110.280446 259.939438,110.280446 257.116902,113.158661 C254.294366,116.039154 254.294366,120.709078 257.116902,123.586837 C285.703837,152.763042 285.703837,200.237641 257.116902,229.413847 C254.294366,232.292061 254.294366,236.96153 257.116902,239.839744 C258.528393,241.280219 260.375562,242 262.224964,242 C264.074365,242 265.921535,241.279763 267.333026,239.837011 C301.555658,204.912576 301.555658,148.084007 267.333026,113.158661 Z" id="Path-Copy-27" fill-opacity="0.250565" fill="#131514" fill-rule="nonzero" opacity="0.754065225">
+                      <animate attributeName="opacity" from="0" to="1" dur="3s" repeatCount="indefinite"/>
+                    </path>
+                    <!-- top line -->
+                    <g stroke="0f775b" id="Rectangle-Copy-56">
+                      <use fill="#000000" fill-opacity="0.200482" fill-rule="evenodd" xlink:href="#path-4"></use>
+                    </g>
+                    <!-- middle line -->
+                    <g  stroke="0f775b" id="Rectangle-Copy-55">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                      <use fill="#000000" fill-opacity="0.200482" fill-rule="evenodd" xlink:href="#path-2"></use>
+                    </g>
+                    <!-- bottom line -->
+                    <g stroke="0f775b" id="Rectangle-Copy-57">
+                      <use fill="black" fill-opacity="1" filter="url(#filter-7)" xlink:href="#path-6"></use>
+                      <use fill="#000000" fill-opacity="0.200482" xlink:href="#path-6"></use>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

admin/public/ep_admin_pads/de.json

@@ -14,6 +14,7 @@
 	"ep_adminpads2_autoupdate.title": "Aktiviert oder deaktiviert automatische Aktualisierungen für die aktuelle Abfrage.",
 	"ep_adminpads2_confirm": "Willst du das Pad {{padID}} wirklich löschen?",
 	"ep_adminpads2_delete.value": "Löschen",
+  "ep_adminpads2_cleanup": "Historie aufräumen",
 	"ep_adminpads2_last-edited": "Zuletzt bearbeitet",
 	"ep_adminpads2_loading": "Lädt...",
 	"ep_adminpads2_manage-pads": "Pads verwalten",

admin/public/ep_admin_pads/en.json

@@ -4,6 +4,7 @@
   "ep_adminpads2_autoupdate.title": "Enables or disables automatic updates for the current query.",
   "ep_adminpads2_confirm": "Do you really want to delete the pad {{padID}}?",
   "ep_adminpads2_delete.value": "Delete",
+  "ep_adminpads2_cleanup": "Cleanup revisions",
   "ep_adminpads2_last-edited": "Last edited",
   "ep_adminpads2_loading": "Loading…",
   "ep_adminpads2_manage-pads": "Manage pads",

admin/src/App.tsx

@@ -1,4 +1,4 @@
-import {useEffect} from 'react'
+import {useEffect, useState} from 'react'
 import './App.css'
 import {connect} from 'socket.io-client'
 import {isJSONClean} from './utils/utils.ts'
@@ -6,107 +6,115 @@ import {NavLink, Outlet, useNavigate} from "react-router-dom";
 import {useStore} from "./store/store.ts";
 import {LoadingScreen} from "./utils/LoadingScreen.tsx";
 import {Trans, useTranslation} from "react-i18next";
-import {Cable, Construction, Crown, NotepadText, Wrench, PhoneCall} from "lucide-react";
+import {Cable, Construction, Crown, NotepadText, Wrench, PhoneCall, LucideMenu} from "lucide-react";
 
-const WS_URL = import.meta.env.DEV? 'http://localhost:9001' : ''
+const WS_URL = import.meta.env.DEV ? 'http://localhost:9001' : ''
-export const App = ()=> {
+export const App = () => {
-    const setSettings = useStore(state => state.setSettings);
+  const setSettings = useStore(state => state.setSettings);
-    const {t} = useTranslation()
+  const {t} = useTranslation()
-    const navigate = useNavigate()
+  const navigate = useNavigate()
+  const [sidebarOpen, setSidebarOpen] = useState<boolean>(true)
 
-    useEffect(() => {
+  useEffect(() => {
-        fetch('/admin-auth/', {
+    fetch('/admin-auth/', {
-            method: 'POST'
+      method: 'POST'
-        }).then((value)=>{
+    }).then((value) => {
-            if(!value.ok){
+      if (!value.ok) {
-                navigate('/login')
+        navigate('/login')
-            }
+      }
-        }).catch(()=>{
+    }).catch(() => {
-            navigate('/login')
+      navigate('/login')
-        })
+    })
-    }, []);
+  }, []);
 
-    useEffect(() => {
+  useEffect(() => {
-        document.title = t('admin.page-title')
+    document.title = t('admin.page-title')
 
-        useStore.getState().setShowLoading(true);
+    useStore.getState().setShowLoading(true);
-        const settingSocket = connect(`${WS_URL}/settings`, {
+    const settingSocket = connect(`${WS_URL}/settings`, {
-            transports: ['websocket'],
+      transports: ['websocket'],
-        });
+    });
 
-        const pluginsSocket = connect(`${WS_URL}/pluginfw/installer`, {
+    const pluginsSocket = connect(`${WS_URL}/pluginfw/installer`, {
-          transports: ['websocket'],
+      transports: ['websocket'],
-        })
+    })
 
-        pluginsSocket.on('connect', () => {
+    pluginsSocket.on('connect', () => {
-            useStore.getState().setPluginsSocket(pluginsSocket);
+      useStore.getState().setPluginsSocket(pluginsSocket);
-        });
+    });
 
 
-        settingSocket.on('connect', () => {
+    settingSocket.on('connect', () => {
-            useStore.getState().setSettingsSocket(settingSocket);
+      useStore.getState().setSettingsSocket(settingSocket);
-            useStore.getState().setShowLoading(false)
+      useStore.getState().setShowLoading(false)
-            settingSocket.emit('load');
+      settingSocket.emit('load');
-            console.log('connected');
+      console.log('connected');
-        });
+    });
 
-        settingSocket.on('disconnect', (reason) => {
+    settingSocket.on('disconnect', (reason) => {
-            // The settingSocket.io client will automatically try to reconnect for all reasons other than "io
+      // The settingSocket.io client will automatically try to reconnect for all reasons other than "io
-            // server disconnect".
+      // server disconnect".
-            useStore.getState().setShowLoading(true)
+      useStore.getState().setShowLoading(true)
-            if (reason === 'io server disconnect') {
+      if (reason === 'io server disconnect') {
-                settingSocket.connect();
+        settingSocket.connect();
-            }
+      }
-        });
+    });
 
-        settingSocket.on('settings', (settings) => {
+    settingSocket.on('settings', (settings) => {
-            /* Check whether the settings.json is authorized to be viewed */
+      /* Check whether the settings.json is authorized to be viewed */
-            if (settings.results === 'NOT_ALLOWED') {
+      if (settings.results === 'NOT_ALLOWED') {
-                console.log('Not allowed to view settings.json')
+        console.log('Not allowed to view settings.json')
-                return;
+        return;
-            }
+      }
 
-            /* Check to make sure the JSON is clean before proceeding */
+      /* Check to make sure the JSON is clean before proceeding */
-            if (isJSONClean(settings.results)) {
+      if (isJSONClean(settings.results)) {
-                setSettings(settings.results);
+        setSettings(settings.results);
-            } else {
+      } else {
-                alert('Invalid JSON');
+        alert('Invalid JSON');
-            }
+      }
-            useStore.getState().setShowLoading(false);
+      useStore.getState().setShowLoading(false);
-        });
+    });
 
-        settingSocket.on('saveprogress', (status)=>{
+    settingSocket.on('saveprogress', (status) => {
-            console.log(status)
+      console.log(status)
-        })
+    })
 
-        return () => {
+    return () => {
-            settingSocket.disconnect();
+      settingSocket.disconnect();
-            pluginsSocket.disconnect()
+      pluginsSocket.disconnect()
-        }
+    }
-    }, []);
+  }, []);
 
-    return <div id="wrapper">
+  return <div id="wrapper" className={`${sidebarOpen ? '': 'closed' }`}>
-        <LoadingScreen/>
+    <LoadingScreen/>
-        <div  className="menu">
+    <div className="menu">
-            <div className="inner-menu">
+      <div className="inner-menu">
-                <span>
+        <span>
                     <Crown width={40} height={40}/>
                     <h1>Etherpad</h1>
                 </span>
-                <ul>
+        <ul onClick={()=>{
-                    <li><NavLink to="/plugins"><Cable/><Trans i18nKey="admin_plugins"/></NavLink></li>
+          if (window.innerWidth < 768) {
-                    <li><NavLink to={"/settings"}><Wrench/><Trans i18nKey="admin_settings"/></NavLink></li>
+            setSidebarOpen(false)
-                    <li><NavLink to={"/help"}> <Construction/> <Trans i18nKey="admin_plugins_info"/></NavLink></li>
+          }
-                    <li><NavLink to={"/pads"}><NotepadText/><Trans
+        }}>
-                        i18nKey="ep_admin_pads:ep_adminpads2_manage-pads"/></NavLink></li>
+          <li><NavLink to="/plugins"><Cable/><Trans i18nKey="admin_plugins"/></NavLink></li>
-                    <li><NavLink to={"/shout"}><PhoneCall/>Communication</NavLink></li>
+          <li><NavLink to={"/settings"}><Wrench/><Trans i18nKey="admin_settings"/></NavLink></li>
-                </ul>
+          <li><NavLink to={"/help"}> <Construction/> <Trans i18nKey="admin_plugins_info"/></NavLink></li>
-            </div>
+          <li><NavLink to={"/pads"}><NotepadText/><Trans
-        </div>
+            i18nKey="ep_admin_pads:ep_adminpads2_manage-pads"/></NavLink></li>
-        <div className="innerwrapper">
+          <li><NavLink to={"/shout"}><PhoneCall/>Communication</NavLink></li>
-            <Outlet/>
+        </ul>
-        </div>
+      </div>
     </div>
+      <button id="icon-button" onClick={() => {
+        setSidebarOpen(!sidebarOpen)
+      }}><LucideMenu/></button>
+    <div className="innerwrapper">
+      <Outlet/>
+    </div>
+  </div>
 }
 
 export default App

admin/src/components/IconButton.tsx

@@ -1,6 +1,7 @@
-import {FC, ReactElement} from "react";
+import {FC, JSX, ReactElement} from "react";
 
 export type IconButtonProps = {
+    style?: React.CSSProperties,
     icon: JSX.Element,
     title: string|ReactElement,
     onClick: ()=>void,
@@ -8,8 +9,8 @@ export type IconButtonProps = {
     disabled?: boolean
 }
 
-export const IconButton:FC<IconButtonProps> = ({icon,className,onClick,title, disabled})=>{
+export const IconButton:FC<IconButtonProps> = ({icon,className,onClick,title, disabled, style})=>{
-    return <button onClick={onClick} className={"icon-button "+ className} disabled={disabled}>
+    return <button style={style}  onClick={onClick} className={"icon-button "+ className} disabled={disabled}>
         {icon}
         <span>{title}</span>
         </button>

admin/src/pages/HomePage.tsx

@@ -4,16 +4,54 @@ import {InstalledPlugin, PluginDef, SearchParams} from "./Plugin.ts";
 import {useDebounce} from "../utils/useDebounce.ts";
 import {Trans, useTranslation} from "react-i18next";
 import {SearchField} from "../components/SearchField.tsx";
-import {Download, Trash} from "lucide-react";
+import {ArrowUpFromDot, Download, Trash} from "lucide-react";
 import {IconButton} from "../components/IconButton.tsx";
+import {determineSorting} from "../utils/sorting.ts";
 
 
 export const HomePage = () => {
     const pluginsSocket = useStore(state=>state.pluginsSocket)
     const [plugins,setPlugins] = useState<PluginDef[]>([])
-    const [installedPlugins, setInstalledPlugins] = useState<InstalledPlugin[]>([])
+  const installedPlugins = useStore(state=>state.installedPlugins)
+  const setInstalledPlugins = useStore(state=>state.setInstalledPlugins)
+  const [searchParams, setSearchParams] = useState<SearchParams>({
+    offset: 0,
+    limit: 99999,
+    sortBy: 'name',
+    sortDir: 'asc',
+    searchTerm: ''
+  })
+
+  const filteredInstallablePlugins = useMemo(()=>{
+    return plugins.sort((a, b)=>{
+      if(searchParams.sortBy === "version"){
+        if(searchParams.sortDir === "asc"){
+          return a.version.localeCompare(b.version)
+        }
+        return b.version.localeCompare(a.version)
+      }
+
+      if(searchParams.sortBy === "last-updated"){
+        if(searchParams.sortDir === "asc"){
+          return a.time.localeCompare(b.time)
+        }
+        return b.time.localeCompare(a.time)
+      }
+
+
+      if (searchParams.sortBy === "name") {
+        if(searchParams.sortDir === "asc"){
+          return a.name.localeCompare(b.name)
+        }
+        return b.name.localeCompare(a.name)
+      }
+      return 0
+    })
+  }, [plugins, searchParams])
+
     const sortedInstalledPlugins = useMemo(()=>{
-        return installedPlugins.sort((a, b)=>{
+        return useStore.getState().installedPlugins.sort((a, b)=>{
+
             if(a.name < b.name){
                 return -1
             }
@@ -23,14 +61,8 @@ export const HomePage = () => {
             return 0
         })
 
-    } ,[installedPlugins])
+    } ,[installedPlugins, searchParams])
-    const [searchParams, setSearchParams] = useState<SearchParams>({
+
-        offset: 0,
-        limit: 99999,
-        sortBy: 'name',
-        sortDir: 'asc',
-        searchTerm: ''
-    })
     const [searchTerm, setSearchTerm] = useState<string>('')
     const {t} = useTranslation()
 
@@ -47,17 +79,16 @@ export const HomePage = () => {
         })
 
         pluginsSocket.on('results:updatable', (data) => {
-            data.updatable.forEach((pluginName: string) => {
+          const newInstalledPlugins = useStore.getState().installedPlugins.map(plugin => {
-                setInstalledPlugins(installedPlugins.map(plugin => {
+            if (data.updatable.includes(plugin.name)) {
-                    if (plugin.name === pluginName) {
+              return {
-                        return {
+                ...plugin,
-                            ...plugin,
+                updatable: true
-                            updatable: true
+              }
-                        }
+            }
-                    }
+            return plugin
-                    return plugin
+          })
-                }))
+         setInstalledPlugins(newInstalledPlugins)
-            })
         })
 
         pluginsSocket.on('finished:install', () => {
@@ -93,25 +124,20 @@ export const HomePage = () => {
         if (!pluginsSocket) {
             return
         }
-
         pluginsSocket?.emit('search', searchParams)
-
-
         pluginsSocket!.on('results:search', (data: {
             results: PluginDef[]
         }) => {
-            if (Array.isArray(data.results) && data.results.length > 0) {
+            setPlugins(data.results)
-                setPlugins(data.results)
+        })
-            } else {
+        pluginsSocket!.on('results:searcherror', (data: {error: string}) => {
-                useStore.getState().setToastState({
+            console.log(data.error)
-                    open: true,
+            useStore.getState().setToastState({
-                    title: "Error retrieving plugins",
+                open: true,
-                    success: false
+                title: "Error retrieving plugins",
-                })
+                success: false
-            }
+            })
         })
-
-
     }, [searchParams, pluginsSocket]);
 
     const uninstallPlugin  = (pluginName: string)=>{
@@ -125,7 +151,6 @@ export const HomePage = () => {
         setPlugins(plugins.filter(plugin=>plugin.name !== pluginName))
     }
 
-
     useDebounce(()=>{
         setSearchParams({
             ...searchParams,
@@ -134,6 +159,7 @@ export const HomePage = () => {
         })
     }, 500, [searchTerm])
 
+
     return <div>
         <h1><Trans i18nKey="admin_plugins"/></h1>
 
@@ -155,42 +181,67 @@ export const HomePage = () => {
                     <td>
                     {
                         plugin.updatable ?
-                            <button onClick={() => installPlugin(plugin.name)}>Update</button>
+                            <IconButton onClick={() => installPlugin(plugin.name)} icon={<ArrowUpFromDot/>} title="Update"></IconButton>
                             : <IconButton disabled={plugin.name == "ep_etherpad-lite"} icon={<Trash/>} title={<Trans i18nKey="admin_plugins.installed_uninstall.value"/>} onClick={() => uninstallPlugin(plugin.name)}/>
                     }
                     </td>
                         </tr>
                     })}
-                </tbody>
+            </tbody>
-            </table>
+        </table>
 
 
-                <h2><Trans i18nKey="admin_plugins.available"/></h2>
+        <h2><Trans i18nKey="admin_plugins.available"/></h2>
-                <SearchField onChange={v=>{setSearchTerm(v.target.value)}} placeholder={t('admin_plugins.available_search.placeholder')} value={searchTerm}/>
+        <SearchField onChange={v=>{setSearchTerm(v.target.value)}} placeholder={t('admin_plugins.available_search.placeholder')} value={searchTerm}/>
 
+      <div className="table-container">
         <table id="available-plugins">
             <thead>
             <tr>
-                <th><Trans i18nKey="admin_plugins.name"/></th>
+                <th className={determineSorting(searchParams.sortBy, searchParams.sortDir == "asc", 'name')} onClick={()=>{
+                  setSearchParams({
+                    ...searchParams,
+                    sortBy: 'name',
+                    sortDir: searchParams.sortDir === "asc"? "desc": "asc"
+                  })
+                }}>
+                  <Trans i18nKey="admin_plugins.name" /></th>
                 <th style={{width: '30%'}}><Trans i18nKey="admin_plugins.description"/></th>
-                <th><Trans i18nKey="admin_plugins.version"/></th>
+                <th className={determineSorting(searchParams.sortBy, searchParams.sortDir == "asc", 'version')} onClick={()=>{
-                <th><Trans i18nKey="admin_plugins.last-update"/></th>
+                  setSearchParams({
+                    ...searchParams,
+                    sortBy: 'version',
+                    sortDir: searchParams.sortDir === "asc"? "desc": "asc"
+                  })
+                }}><Trans i18nKey="admin_plugins.version"/></th>
+                <th className={determineSorting(searchParams.sortBy, searchParams.sortDir == "asc", 'last-updated')} onClick={()=>{
+                  setSearchParams({
+                    ...searchParams,
+                    sortBy: 'last-updated',
+                    sortDir: searchParams.sortDir === "asc"? "desc": "asc"
+                  })
+                }}><Trans i18nKey="admin_plugins.last-update"/></th>
                 <th><Trans i18nKey="ep_admin_pads:ep_adminpads2_action"/></th>
             </tr>
             </thead>
             <tbody style={{overflow: 'auto'}}>
-            {plugins.map((plugin) => {
+            {(filteredInstallablePlugins.length > 0) ?
-                return <tr key={plugin.name}>
+              filteredInstallablePlugins.map((plugin) => {
-                    <td><a rel="noopener noreferrer" href={`https://npmjs.com/${plugin.name}`} target="_blank">{plugin.name}</a></td>
+                        return <tr key={plugin.name}>
-                    <td>{plugin.description}</td>
+                            <td><a rel="noopener noreferrer" href={`https://npmjs.com/${plugin.name}`} target="_blank">{plugin.name}</a></td>
-                    <td>{plugin.version}</td>
+                            <td>{plugin.description}</td>
-                    <td>{plugin.time}</td>
+                            <td>{plugin.version}</td>
-                    <td>
+                            <td>{plugin.time}</td>
-                        <IconButton icon={<Download/>} onClick={() => installPlugin(plugin.name)} title={<Trans i18nKey="admin_plugins.available_install.value"/>}/>
+                            <td>
-                    </td>
+                                <IconButton icon={<Download/>} onClick={() => installPlugin(plugin.name)} title={<Trans i18nKey="admin_plugins.available_install.value"/>}/>
-                </tr>
+                            </td>
-            })}
+                        </tr>
+                    })
+                :
+                <tr><td colSpan={5}>{searchTerm == '' ? <Trans i18nKey="pad.loading"/>: <Trans i18nKey="admin_plugins.available_not-found"/>}</td></tr>
+            }
             </tbody>
         </table>
+      </div>
     </div>
 }

admin/src/pages/PadPage.tsx

@@ -6,8 +6,13 @@ import {useDebounce} from "../utils/useDebounce.ts";
 import {determineSorting} from "../utils/sorting.ts";
 import * as Dialog from "@radix-ui/react-dialog";
 import {IconButton} from "../components/IconButton.tsx";
-import {ChevronLeft, ChevronRight, Eye, Trash2} from "lucide-react";
+import {ChevronLeft, ChevronRight, Eye, Trash2, FileStack, PlusIcon} from "lucide-react";
 import {SearchField} from "../components/SearchField.tsx";
+import {useForm} from "react-hook-form";
+
+type PadCreateProps = {
+    padName: string
+}
 
 export const PadPage = ()=>{
     const settingsSocket = useStore(state=>state.settingsSocket)
@@ -23,10 +28,13 @@ export const PadPage = ()=>{
     const pads = useStore(state=>state.pads)
     const [currentPage, setCurrentPage] = useState<number>(0)
     const [deleteDialog, setDeleteDialog] = useState<boolean>(false)
+    const [errorText, setErrorText] = useState<string|null>(null)
     const [padToDelete, setPadToDelete] = useState<string>('')
+    const [createPadDialogOpen, setCreatePadDialogOpen] = useState<boolean>(false)
+    const {register, handleSubmit} = useForm<PadCreateProps>()
     const pages = useMemo(()=>{
         if(!pads){
-            return [0]
+            return 0;
         }
 
         return Math.ceil(pads!.total / searchParams.limit)
@@ -68,12 +76,66 @@ export const PadPage = ()=>{
                 results: newPads
             })
         })
+
+      type SettingsSocketCreateReponse = {
+          error: string
+      } | {
+        success: string
+      }
+
+      settingsSocket.on('results:createPad', (rep: SettingsSocketCreateReponse)=>{
+        if ('error' in rep) {
+          useStore.getState().setToastState({
+            open: true,
+            title: rep.error,
+            success: false
+          })
+        } else {
+          useStore.getState().setToastState({
+            open: true,
+            title: rep.success,
+            success: true
+          })
+          setCreatePadDialogOpen(false)
+          // reload pads
+          settingsSocket.emit('padLoad', searchParams)
+        }
+      })
+
+        settingsSocket.on('results:cleanupPadRevisions', (data)=>{
+          const newPads = useStore.getState().pads?.results ?? []
+
+          if (data.error) {
+            setErrorText(data.error)
+            return
+          }
+
+          newPads.forEach((pad)=>{
+            if (pad.padName === data.padId) {
+              pad.revisionNumber = data.keepRevisions
+            }
+          })
+
+          useStore.getState().setPads({
+            results: newPads,
+            total: useStore.getState().pads!.total
+          })
+        })
     }, [settingsSocket, pads]);
 
     const deletePad = (padID: string)=>{
         settingsSocket?.emit('deletePad', padID)
     }
 
+    const cleanupPad = (padID: string)=>{
+        settingsSocket?.emit('cleanupPadRevisions', padID)
+    }
+
+    const onPadCreate = (data: PadCreateProps)=>{
+      settingsSocket?.emit('createPad', {
+        padName: data.padName
+      })
+    }
 
 
     return <div>
@@ -100,11 +162,51 @@ export const PadPage = ()=>{
             </Dialog.Content>
         </Dialog.Portal>
         </Dialog.Root>
-        <h1><Trans i18nKey="ep_admin_pads:ep_adminpads2_manage-pads"/></h1>
+        <Dialog.Root open={errorText !== null}>
+          <Dialog.Portal>
+            <Dialog.Overlay className="dialog-confirm-overlay"/>
+            <Dialog.Content className="dialog-confirm-content">
+              <div>
+                <div>Error occured: {errorText}</div>
+                <div className="settings-button-bar">
+                  <button onClick={() => {
+                    setErrorText(null)
+                  }}>OK</button>
+                </div>
+              </div>
+            </Dialog.Content>
+          </Dialog.Portal>
+        </Dialog.Root>
+      <Dialog.Root open={createPadDialogOpen}>
+        <Dialog.Portal>
+        <Dialog.Overlay className="dialog-confirm-overlay" />
+        <Dialog.Content  className="dialog-confirm-content">
+          <Dialog.Title className="dialog-confirm-title"><Trans i18nKey="index.newPad"/></Dialog.Title>
+          <form  onSubmit={handleSubmit(onPadCreate)}>
+            <button className="dialog-close-button" onClick={()=>{
+              setCreatePadDialogOpen(false);
+            }}>x</button>
+              <div style={{display: 'grid', gap: '10px', gridTemplateColumns: 'auto auto', marginBottom: '1rem'}}>
+                <label><Trans i18nKey="ep_admin_pads:ep_adminpads2_padname"/></label>
+                <input {...register('padName', {
+                  required: true
+                })}/>
+              </div>
+            <input type="submit" value={t('admin_settings.createPad')} className="login-button" />
+          </form>
+        </Dialog.Content>
+      </Dialog.Portal>
+      </Dialog.Root>
+      <span className="manage-pads-header">
+                <h1><Trans i18nKey="ep_admin_pads:ep_adminpads2_manage-pads"/></h1>
+        <span style={{width: '29px', marginBottom: 'auto', marginTop: 'auto', flexGrow: 1}}><IconButton style={{float: 'right'}} icon={<PlusIcon/>} title={<Trans i18nKey="index.newPad"/>} onClick={()=>{
+          setCreatePadDialogOpen(true)
+        }}/></span>
+      </span>
         <SearchField value={searchTerm} onChange={v=>setSearchTerm(v.target.value)} placeholder={t('ep_admin_pads:ep_adminpads2_search-heading')}/>
         <table>
             <thead>
-            <tr>
+            <tr className="search-pads">
                 <th className={determineSorting(searchParams.sortBy, searchParams.ascending, 'padName')} onClick={()=>{
                     setSearchParams({
                         ...searchParams,
@@ -112,19 +214,19 @@ export const PadPage = ()=>{
                         ascending: !searchParams.ascending
                     })
                 }}><Trans i18nKey="ep_admin_pads:ep_adminpads2_padname"/></th>
-                <th className={determineSorting(searchParams.sortBy, searchParams.ascending, 'lastEdited')} onClick={()=>{
-                    setSearchParams({
-                        ...searchParams,
-                        sortBy: 'lastEdited',
-                        ascending: !searchParams.ascending
-                    })
-                }}><Trans i18nKey="ep_admin_pads:ep_adminpads2_pad-user-count"/></th>
                 <th className={determineSorting(searchParams.sortBy, searchParams.ascending, 'userCount')} onClick={()=>{
                     setSearchParams({
                         ...searchParams,
                         sortBy: 'userCount',
                         ascending: !searchParams.ascending
                     })
+                }}><Trans i18nKey="ep_admin_pads:ep_adminpads2_pad-user-count"/></th>
+                <th className={determineSorting(searchParams.sortBy, searchParams.ascending, 'lastEdited')} onClick={()=>{
+                    setSearchParams({
+                        ...searchParams,
+                        sortBy: 'lastEdited',
+                        ascending: !searchParams.ascending
+                    })
                 }}><Trans i18nKey="ep_admin_pads:ep_adminpads2_last-edited"/></th>
                 <th className={determineSorting(searchParams.sortBy, searchParams.ascending, 'revisionNumber')} onClick={()=>{
                     setSearchParams({
@@ -136,7 +238,7 @@ export const PadPage = ()=>{
                 <th><Trans i18nKey="ep_admin_pads:ep_adminpads2_action"/></th>
             </tr>
             </thead>
-            <tbody>
+            <tbody className="search-pads-body">
             {
                 pads?.results?.map((pad)=>{
                     return <tr key={pad.padName}>
@@ -150,7 +252,10 @@ export const PadPage = ()=>{
                                     setPadToDelete(pad.padName)
                                     setDeleteDialog(true)
                                 }}/>
-                                <IconButton icon={<Eye/>} title="view" onClick={()=>window.open(`/p/${pad.padName}`, '_blank')}/>
+                                <IconButton icon={<FileStack/>} title={<Trans i18nKey="ep_admin_pads:ep_adminpads2_cleanup"/>} onClick={()=>{
+                                  cleanupPad(pad.padName)
+                                }}/>
+                                <IconButton icon={<Eye/>} title={<Trans i18nKey="index.createOpenPad"/>} onClick={()=>window.open(`../../p/${pad.padName}`, '_blank')}/>
                             </div>
                         </td>
                     </tr>
@@ -166,11 +271,12 @@ export const PadPage = ()=>{
                         offset: (Number(currentPage)-1)*searchParams.limit})
             }}><ChevronLeft/><span>Previous Page</span></button>
             <span>{currentPage+1} out of {pages}</span>
-            <button disabled={pages == currentPage+1} onClick={()=>{
+            <button disabled={pages == 0 || pages == currentPage+1} onClick={()=>{
-                setCurrentPage(currentPage+1)
+              const newCurrentPage = currentPage+1
+                setCurrentPage(newCurrentPage)
                 setSearchParams({
                     ...searchParams,
-                    offset: (Number(currentPage)-1)*searchParams.limit
+                    offset: (Number(newCurrentPage))*searchParams.limit
                 })
             }}><span>Next Page</span><ChevronRight/></button>
         </div>

admin/src/pages/Plugin.ts

@@ -20,7 +20,7 @@ export type SearchParams = {
     searchTerm: string,
     offset: number,
     limit: number,
-    sortBy: 'name'|'version',
+    sortBy: 'name'|'version'|'last-updated',
     sortDir: 'asc'|'desc'
 }
 

admin/src/pages/SettingsPage.tsx

@@ -1,12 +1,12 @@
 import {useStore} from "../store/store.ts";
-import {isJSONClean} from "../utils/utils.ts";
+import {isJSONClean, cleanComments} from "../utils/utils.ts";
 import {Trans} from "react-i18next";
 import {IconButton} from "../components/IconButton.tsx";
 import {RotateCw, Save} from "lucide-react";
 
 export const SettingsPage = ()=>{
     const settingsSocket = useStore(state=>state.settingsSocket)
-    const settings = useStore(state=>state.settings)
+    const settings = cleanComments(useStore(state=>state.settings))
 
     return <div className="settings-page">
         <h1><Trans i18nKey="admin_settings.current"/></h1>
@@ -21,7 +21,7 @@ export const SettingsPage = ()=>{
                     settingsSocket!.emit('saveSettings', settings!);
                     useStore.getState().setToastState({
                         open: true,
-                        title: "Succesfully saved settings",
+                        title: "Successfully saved settings",
                         success: true
                     })
                 } else {

admin/src/pages/ShoutPage.tsx

@@ -9,22 +9,28 @@ export const ShoutPage = ()=>{
     const [message, setMessage] = useState<string>("");
     const [sticky, setSticky] = useState<boolean>(false);
     const socket = useStore(state => state.settingsSocket);
+    const pluginSocket = useStore(state => state.pluginsSocket);
     const [shouts, setShouts] = useState<ShoutType[]>([]);
 
-    useEffect(() => {
-        fetch('/stats')
-            .then(response => response.json())
-            .then(data => setTotalUsers(data.totalUsers));
-    }, []);
-
 
     useEffect(() => {
-        if(socket) {
+        if(socket && pluginSocket) {
+          console.log('Socket connected', socket.id);
             socket.on('shout', (shout) => {
                 setShouts([...shouts, shout])
             })
+          pluginSocket.on('results:stats', (statData) => {
+            setTotalUsers(statData.totalUsers);
+          })
         }
-    }, [socket, shouts])
+    }, [socket, shouts, pluginSocket])
+
+
+  useEffect(() => {
+    if (pluginSocket) {
+      pluginSocket.emit('getStats', {});
+    }
+  }, [pluginSocket]);
 
     const sendMessage = () => {
         socket?.emit('shout', {

admin/src/store/store.ts

@@ -1,6 +1,7 @@
 import {create} from "zustand";
 import {Socket} from "socket.io-client";
 import {PadSearchResult} from "../utils/PadSearch.ts";
+import {InstalledPlugin} from "../pages/Plugin.ts";
 
 type ToastState = {
     description?:string,
@@ -22,7 +23,9 @@ type StoreState = {
     toastState: ToastState,
     setToastState: (val: ToastState)=>void,
     pads: PadSearchResult|undefined,
-    setPads: (pads: PadSearchResult)=>void
+    setPads: (pads: PadSearchResult)=>void,
+    installedPlugins: InstalledPlugin[],
+    setInstalledPlugins: (plugins: InstalledPlugin[])=>void
 }
 
 
@@ -43,5 +46,7 @@ export const useStore = create<StoreState>()((set) => ({
         success: false
     },
     pads: undefined,
-    setPads: (pads)=>set({pads})
+    setPads: (pads)=>set({pads}),
+    installedPlugins: [],
+    setInstalledPlugins: (plugins)=>set({installedPlugins: plugins})
 }));

admin/src/utils/LoadingScreen.tsx

@@ -1,6 +1,7 @@
 import {useStore} from "../store/store.ts";
 import * as Dialog from '@radix-ui/react-dialog';
-import ReactComponent from './brand.svg?react';
+import brand from './brand.svg'
+
 export const LoadingScreen = ()=>{
     const showLoading = useStore(state => state.showLoading)
 
@@ -10,7 +11,7 @@ export const LoadingScreen = ()=>{
             <div className="flex flex-col items-center">
                 <div className="animate-spin w-16 h-16 border-t-2 border-b-2 border-[--fg-color] rounded-full"></div>
                 <div className="mt-4 text-[--fg-color]">
-                    <ReactComponent/>
+                    <img src={brand}/>
                 </div>
             </div>
         </Dialog.Content>

admin/src/utils/utils.ts

@@ -1,5 +1,14 @@
-const minify = (json: string)=>{
+export const cleanComments = (json: string|undefined)=>{
+    if (json !== undefined){
+        json = json.replace(/\/\*.*?\*\//g, "");          // remove single line comments
+        json = json.replace(/ *\/\*.*(.|\n)*?\*\//g, ""); // remove multi line comments
+        json = json.replace(/[ \t]+$/gm, "");             // trim trailing spaces
+        json = json.replace(/^(\n)/gm, "");               // remove empty lines
+    }
+    return json;
+}
 
+export const minify = (json: string)=>{
     let tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r/g,
         in_string = false,
         in_multiline_comment = false,
@@ -49,9 +58,6 @@ const minify = (json: string)=>{
     return new_str.join("");
 }
 
-
-
-
 export const isJSONClean = (data: string) => {
     let cleanSettings = minify(data);
     // this is a bit naive. In theory some key/value might contain the sequences ',]' or ',}'

admin/vite.config.ts

@@ -1,18 +1,20 @@
 import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react-swc'
-import svgr from 'vite-plugin-svgr'
 import {viteStaticCopy} from "vite-plugin-static-copy";
+import react from '@vitejs/plugin-react';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react(), svgr(), viteStaticCopy({
+  plugins: [viteStaticCopy({
       targets: [
           {
               src: '../src/locales',
               dest: ''
           }
       ]
-  })],
+  }),   react({
+    babel: {
+      plugins: ['babel-plugin-react-compiler'],
+    }})],
     base: '/admin',
     build:{
       outDir: '../src/templates/admin',
@@ -28,10 +30,6 @@ export default defineConfig({
         '/admin-auth/': {
             target: 'http://localhost:9001',
             changeOrigin: true,
-        },
-        '/stats': {
-            target: 'http://localhost:9001',
-            changeOrigin: true,
         }
         }
   }

bin/buildForWindows.sh

@@ -50,21 +50,13 @@ rm -rf src/node_modules || true
 #$(try cd ./bin/installDeps.sh)
 
 # Install admin frontend
-cd admin
 try pnpm install
-try pnpm run build
+try pnpm run build:etherpad
-cd ..
-
-
-
 
 # Nuke the admin folder as it is not needed anymore :D
 rm -rf admin
-
+rm -rf oidc
-export NODE_ENV=production
+rm -rf src/node_modules
-try pnpm install --production
-
-
 
 log "copy the windows settings template..."
 try cp settings.json.template settings.json

bin/checkAllPads.ts

@@ -25,4 +25,5 @@ if (process.argv.length !== 2) throw new Error('Use: node bin/checkAllPads.js');
     console.log(`Pad ${padId}: OK`);
   }));
   console.log('Finished.');
+  process.exit(0)
 })();

bin/checkPad.ts

@@ -11,12 +11,19 @@ process.on('unhandledRejection', (err) => { throw err; });
 if (process.argv.length !== 3) throw new Error('Use: node bin/checkPad.js $PADID');
 // @ts-ignore
 const padId = process.argv[2];
-(async () => {
+
+const performCheck = async () => {
   const db = require('ep_etherpad-lite/node/db/DB');
   await db.init();
+  console.log("Checking if " + padId + " exists")
   const padManager = require('ep_etherpad-lite/node/db/PadManager');
   if (!await padManager.doesPadExists(padId)) throw new Error('Pad does not exist');
   const pad = await padManager.getPad(padId);
   await pad.check();
-  console.log('Finished.');
+  console.log('Finished checking pad.');
-})();
+  process.exit(0)
+}
+
+performCheck()
+  .then(e=>console.log("Finished"))
+  .catch(e=>console.log("Finished with errors"))

bin/commonPlugins.ts

@@ -0,0 +1,17 @@
+import {PackageData} from "ep_etherpad-lite/node/types/PackageInfo";
+import {writeFileSync} from "fs";
+import {installedPluginsPath} from "ep_etherpad-lite/static/js/pluginfw/installer";
+const pluginsModule = require('ep_etherpad-lite/static/js/pluginfw/plugins');
+
+export const persistInstalledPlugins = async () => {
+    const plugins:PackageData[] = []
+    const installedPlugins = {plugins: plugins};
+    for (const pkg of Object.values(await pluginsModule.getPackages()) as PackageData[]) {
+        installedPlugins.plugins.push({
+            name: pkg.name,
+            version: pkg.version,
+        });
+    }
+    installedPlugins.plugins = [...new Set(installedPlugins.plugins)];
+    writeFileSync(installedPluginsPath, JSON.stringify(installedPlugins));
+};

bin/createUserSession.ts

@@ -14,10 +14,11 @@ import path from "node:path";
 import querystring from "node:querystring";
 
 import axios from 'axios'
+import process from "node:process";
 
 
 process.on('unhandledRejection', (err) => { throw err; });
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings';
 (async () => {
   axios.defaults.baseURL = `http://${settings.ip}:${settings.port}`;
   const api = axios;
@@ -53,4 +54,5 @@ const settings = require('ep_etherpad-lite/node/utils/Settings');
   if (res.data.code === 1) throw new Error(`Error creating session: ${JSON.stringify(res.data)}`);
   console.log('Session made: ====> create a cookie named sessionID and set the value to',
       res.data.data.sessionID);
+  process.exit(0)
 })();

bin/deleteAllGroupSessions.ts

@@ -49,4 +49,5 @@ const settings = require('ep_etherpad-lite/tests/container/loadSettings').loadSe
     }
   }
   console.log(`Deleted ${deleteCount} sessions`);
+  process.exit(0)
 })();

bin/deletePad.ts

@@ -38,4 +38,5 @@ const apikey = fs.readFileSync(filePath, {encoding: 'utf-8'});
   const deleteAttempt = await axios.post(uri);
   if (deleteAttempt.data.code === 1) throw new Error(`Error deleting pad ${deleteAttempt.data}`);
   console.log('Deleted pad', deleteAttempt.data);
+  process.exit(0)
 })();

bin/extractPadData.ts

@@ -60,4 +60,5 @@ const padId = process.argv[2];
   }
 
   console.log('finished');
+  process.exit(0)
 })();

bin/fastRun.sh

@@ -19,4 +19,4 @@ cd "${MY_DIR}/.." || exit 1
 echo "Running directly, without checking/installing dependencies"
 
 # run Etherpad main class
-exec node --import tsx src/node/server.ts "$@"
+exec pnpm run prod "$@"

bin/generateReleaseNotes.ts

@@ -0,0 +1,39 @@
+import {readFileSync} from "node:fs";
+
+const changelog = readFileSync('../CHANGELOG.md')
+const changelogText = changelog.toString()
+const changelogLines = changelogText.split('\n')
+
+
+let cliArgs = process.argv.slice(2)
+
+let tagVar = cliArgs[0]
+
+if (!tagVar) {
+  console.error("No tag provided")
+  process.exit(1)
+}
+
+tagVar = tagVar.replace("refs/tags/v", "")
+
+let startNum = -1
+let endline = 0
+
+let counter = 0
+for (const line of changelogLines) {
+    if (line.trim().startsWith("#") && (line.match(new RegExp("#", "g"))||[]).length === 1) {
+      if (startNum !== -1) {
+        endline = counter-1
+        break
+      }
+
+      const sanitizedLine = line.replace("#","").trim()
+      if(sanitizedLine.includes(tagVar)) {
+        startNum = counter
+      }
+    }
+    counter++
+}
+
+let currentReleaseNotes = changelogLines.slice(startNum, endline).join('\n')
+console.log(currentReleaseNotes)

bin/importSqlFile.ts

@@ -3,12 +3,13 @@
 // As of v14, Node.js does not exit when there is an unhandled Promise rejection. Convert an
 // unhandled rejection into an uncaught exception, which does cause Node.js to exit.
 import util from "node:util";
-const fs = require('fs');
+import fs from 'node:fs';
 import log4js from 'log4js';
 import readline from 'readline';
-import ueberDB from "ueberdb2";
+import {Database, DatabaseType} from "ueberdb2";
+import process from "node:process";
 
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+import settings from 'ep_etherpad-lite/node/utils/Settings';
 process.on('unhandledRejection', (err) => { throw err; });
 const startTime = Date.now();
 
@@ -56,8 +57,8 @@ const unescape = (val: string) => {
     writeInterval: 100,
     json: false, // data is already json encoded
   };
-  const db = new ueberDB.Database( // eslint-disable-line new-cap
+  const db = new Database( // eslint-disable-line new-cap
-      settings.dbType,
+      settings.dbType as DatabaseType,
       settings.dbSettings,
       dbWrapperSettings,
       log4js.getLogger('ueberDB'));
@@ -96,6 +97,8 @@ const unescape = (val: string) => {
                        'depended on dbms this may take some time..\n');
 
   const closeDB = util.promisify(db.close.bind(db));
+  // @ts-ignore
   await closeDB(null);
   log(`finished, imported ${keyNo} keys.`);
+  process.exit(0)
 })();

bin/installLocalPlugins.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+trim() {
+    local var="$*"
+    # remove leading whitespace characters
+    var="${var#"${var%%[![:space:]]*}"}"
+    # remove trailing whitespace characters
+    var="${var%"${var##*[![:space:]]}"}"
+    printf '%s' "$var"
+}
+
+# Move to the Etherpad base directory.
+MY_DIR=$(cd "${0%/*}" && pwd -P) || exit 1
+cd "${MY_DIR}/.." || exit 1
+
+# Source constants and useful functions
+. bin/functions.sh
+
+PNPM_OPTIONS=
+if [ ! -z "${NODE_ENV-}"  ]; then
+  if [ "$NODE_ENV" == 'production' ]; then
+    PNPM_OPTIONS='--prod'
+  fi
+fi
+
+if [ ! -z "${ETHERPAD_LOCAL_PLUGINS_ENV-}"  ]; then
+  if [ "$ETHERPAD_LOCAL_PLUGINS_ENV" == 'production' ]; then
+    PNPM_OPTIONS='--prod'
+  elif [ "$ETHERPAD_LOCAL_PLUGINS_ENV" == 'development' ]; then
+    PNPM_OPTIONS='-D'
+  fi
+fi
+
+if [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then
+  readarray -d ' ' plugins <<< "${ETHERPAD_LOCAL_PLUGINS}"
+  for plugin in "${plugins[@]}"; do
+    plugin=$(trim "$plugin")
+    if [ -d "local_plugins/${plugin}" ]; then
+      echo "Installing plugin: '${plugin}'"
+      pnpm install -w ${PNPM_OPTIONS:-} "local_plugins/${plugin}/"
+    else
+      ( echo "Error. Directory 'local_plugins/${plugin}' for local plugin " \
+             "'${plugin}' missing" >&2 )
+      exit 1
+    fi
+  done
+else
+  echo 'No local plugings to install.'
+fi

bin/installPlugins.ts

@@ -1,59 +0,0 @@
-'use strict';
-
-import {writeFileSync} from 'fs'
-import {linkInstaller, installedPluginsPath} from "ep_etherpad-lite/static/js/pluginfw/installer";
-import {PackageData} from "ep_etherpad-lite/node/types/PackageInfo";
-
-const pluginsModule = require('ep_etherpad-lite/static/js/pluginfw/plugins');
-if (process.argv.length === 2) {
-  console.error('Expected at least one argument!');
-  process.exit(1);
-}
-
-let args = process.argv.slice(2)
-
-let registryPlugins: string[] = [];
-let localPlugins: string[] = [];
-
-if (args.indexOf('--path') !== -1) {
-  const indexToSplit = args.indexOf('--path');
-  registryPlugins = args.slice(0, indexToSplit);
-  localPlugins = args.slice(indexToSplit + 1);
-} else {
-  registryPlugins = args;
-}
-
-const persistInstalledPlugins = async () => {
-  const plugins:PackageData[] = []
-    const installedPlugins = {plugins: plugins};
-  for (const pkg of Object.values(await pluginsModule.getPackages()) as PackageData[]) {
-    installedPlugins.plugins.push({
-      name: pkg.name,
-      version: pkg.version,
-    });
-  }
-  installedPlugins.plugins = [...new Set(installedPlugins.plugins)];
-  writeFileSync(installedPluginsPath, JSON.stringify(installedPlugins));
-};
-
-async function run() {
-  for (const plugin of registryPlugins) {
-    console.log(`Installing plugin from registry: ${plugin}`)
-    if (plugin.includes('@')) {
-        const [name, version] = plugin.split('@');
-        await linkInstaller.installPlugin(name, version);
-        continue;
-    }
-    await linkInstaller.installPlugin(plugin);
-  }
-
-  for (const plugin of localPlugins) {
-    console.log(`Installing plugin from path: ${plugin}`);
-    await linkInstaller.installFromPath(plugin);
-  }
-}
-
-(async () => {
-  await run();
-  await persistInstalledPlugins();
-})();

bin/make_docs.ts

@@ -0,0 +1,63 @@
+import {exec} from 'child_process'
+import fs from 'fs'
+import path from 'path'
+
+import pjson from '../src/package.json'
+
+const VERSION=pjson.version
+console.log(`Building docs for version ${VERSION}`)
+
+const createDirIfNotExists = (dir: fs.PathLike) => {
+    if (!fs.existsSync(dir)){
+        fs.mkdirSync(dir)
+    }
+}
+
+
+function copyFolderSync(from: fs.PathLike, to: fs.PathLike) {
+    if(fs.existsSync(to)){
+        const stat = fs.lstatSync(to)
+        if (stat.isDirectory()){
+            fs.rmSync(to, { recursive: true })
+        }
+        else{
+            fs.rmSync(to)
+        }
+    }
+    fs.mkdirSync(to);
+    fs.readdirSync(from).forEach(element => {
+        if (fs.lstatSync(path.join(<string>from, element)).isFile()) {
+          if (typeof from === "string") {
+            if (typeof to === "string") {
+              fs.copyFileSync(path.join(from, element), path.join(to, element))
+            }
+          }
+        } else {
+          if (typeof from === "string") {
+            if (typeof to === "string") {
+              copyFolderSync(path.join(from, element), path.join(to, element))
+            }
+          }
+        }
+    });
+}
+
+exec('asciidoctor -v', (err,stdout)=>{
+    if (err){
+        console.log('Please install asciidoctor')
+        console.log('https://asciidoctor.org/docs/install-toolchain/')
+        process.exit(1)
+    }
+});
+
+
+createDirIfNotExists('../out')
+createDirIfNotExists('../out/doc')
+createDirIfNotExists('../out/doc/api')
+
+
+
+exec(`asciidoctor -D ../out/doc ../doc/index.adoc ../*/**.adoc -a VERSION=${VERSION}`)
+exec(`asciidoctor -D ../out/doc/api  ../doc/api/*.adoc -a VERSION=${VERSION}`)
+
+copyFolderSync('../doc/public/', '../out/doc/')

bin/migrateDB.ts

@@ -0,0 +1,83 @@
+// DB migration
+import {readFileSync} from 'node:fs'
+import {Database, DatabaseType} from "ueberdb2";
+import path from "node:path";
+import settings from 'ep_etherpad-lite/node/utils/Settings';
+
+
+// file1 = source, file2 = target
+// pnpm run --filter bin migrateDB --file1 <db1.json> --file2 <db2.json>
+const arg = process.argv.slice(2);
+
+if (arg.length != 4) {
+  console.error('Wrong number of arguments!. Call with pnpm run --filter bin migrateDB --file1 source.json target.json')
+  process.exit(1)
+}
+
+type SettingsConfig = {
+  dbType: string,
+  dbSettings: any
+}
+
+/*
+  {
+    "dbType": "<your-db-type>",
+    "dbSettings": {
+      <your-db-settings>
+     }
+  }
+ */
+
+let firstDBSettingsFile: string
+let secondDBSettingsFile: string
+
+
+if (arg[0] == "--file1") {
+    firstDBSettingsFile = arg[1]
+} else if (arg[0] === "--file2") {
+  secondDBSettingsFile = arg[1]
+}
+
+if (arg[2] == "--file1") {
+  firstDBSettingsFile = arg[3]
+} else if (arg[2] === "--file2") {
+  secondDBSettingsFile = arg[3]
+}
+
+
+
+const settingsfile = JSON.parse(readFileSync(path.join(settings.root,firstDBSettingsFile!)).toString()) as SettingsConfig
+const settingsfile2 = JSON.parse(readFileSync(path.join(settings.root,secondDBSettingsFile!)).toString()) as SettingsConfig
+
+console.log(settingsfile2)
+if ("filename" in settingsfile.dbSettings) {
+  settingsfile.dbSettings.filename = path.join(settings.root, settingsfile.dbSettings.filename)
+  console.log(settingsfile.dbType + " location is "+ settingsfile.dbSettings.filename)
+}
+
+if ("filename" in settingsfile2.dbSettings) {
+  settingsfile2.dbSettings.filename = path.join(settings.root, settingsfile2.dbSettings.filename)
+  console.log(settingsfile2.dbType + " location is "+ settingsfile2.dbSettings.filename)
+}
+
+const ueberdb1 = new Database(settingsfile.dbType as DatabaseType, settingsfile.dbSettings)
+const ueberdb2 = new Database(settingsfile2.dbType as DatabaseType, settingsfile2.dbSettings)
+
+const handleSync = async ()=>{
+  await ueberdb1.init()
+  await ueberdb2.init()
+
+  const allKeys = await ueberdb1.findKeys('*','')
+  for (const key of allKeys) {
+    const foundVal = await ueberdb1.get(key)!
+    await ueberdb2.set(key, foundVal)
+  }
+}
+
+handleSync().then(()=>{
+  console.log("Done syncing dbs")
+}).catch(e=>{
+  console.log(`Error syncing db ${e}`)
+})
+
+

bin/migrateDirtyDBtoRealDB.ts

@@ -1,10 +1,9 @@
 'use strict';
 
 import process from 'node:process';
-import ueberDB from "ueberdb2";
+import {Database, DatabaseType} from "ueberdb2";
 import log4js from 'log4js';
-import util from 'util';
+import settings from 'ep_etherpad-lite/node/utils/Settings';
-const settings = require('ep_etherpad-lite/node/utils/Settings');
 
 // As of v14, Node.js does not exit when there is an unhandled Promise rejection. Convert an
 // unhandled rejection into an uncaught exception, which does cause Node.js to exit.
@@ -23,15 +22,15 @@ process.on('unhandledRejection', (err) => { throw err; });
     cache: '0', // The cache slows things down when you're mostly writing.
     writeInterval: 0, // Write directly to the database, don't buffer
   };
-  const db = new ueberDB.Database( // eslint-disable-line new-cap
+  const db = new Database( // eslint-disable-line new-cap
-      settings.dbType,
+      settings.dbType as DatabaseType,
       settings.dbSettings,
       dbWrapperSettings,
       log4js.getLogger('ueberDB'));
   await db.init();
 
   console.log('Waiting for dirtyDB to parse its file.');
-  const dirty = await  new ueberDB.Database('dirty',`${__dirname}/../var/dirty.db`);
+  const dirty = new Database('dirty', `${__dirname}/../var/dirty.db`);
     await dirty.init();
   const keys = await dirty.findKeys('*', '')
 
@@ -57,4 +56,5 @@ process.on('unhandledRejection', (err) => { throw err; });
   await db.close(null);
   await dirty.close(null);
   console.log('Finished.');
+  process.exit(0)
 })();

bin/package.json

@@ -1,25 +1,26 @@
 {
   "name": "bin",
-  "version": "2.0.3",
+  "version": "2.6.0",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {
     "doc": "doc"
   },
   "dependencies": {
-    "axios": "^1.6.8",
+    "axios": "^1.13.2",
     "ep_etherpad-lite": "workspace:../src",
     "log4js": "^6.9.1",
-    "semver": "^7.6.0",
+    "semver": "^7.7.3",
-    "tsx": "^4.7.2",
+    "tsx": "^4.21.0",
-    "ueberdb2": "^4.2.63"
+    "ueberdb2": "^5.0.23"
   },
   "devDependencies": {
-    "@types/node": "^20.12.7",
+    "@types/node": "^25.0.9",
-    "@types/semver": "^7.5.8",
+    "@types/semver": "^7.7.1",
-    "typescript": "^5.4.5"
+    "typescript": "^5.9.3"
   },
   "scripts": {
+    "makeDocs": "node --import tsx make_docs.ts",
     "checkPad": "node --import tsx checkPad.ts",
     "checkAllPads": "node --import tsx checkAllPads.ts",
     "createUserSession": "node --import tsx createUserSession.ts",
@@ -32,7 +33,9 @@
     "rebuildPad": "node --import tsx rebuildPad.ts",
     "stalePlugins": "node --import tsx ./plugins/stalePlugins.ts",
     "checkPlugin": "node --import tsx ./plugins/checkPlugin.ts",
-    "install-plugins": "node --import tsx ./installPlugins.ts"
+    "plugins": "node --import tsx ./plugins.ts",
+    "generateChangelog": "node --import tsx generateReleaseNotes.ts",
+    "migrateDB": "node --import tsx migrateDB.ts"
   },
   "author": "",
   "license": "ISC"

bin/plugins.ts

@@ -0,0 +1,120 @@
+'use strict';
+
+import {linkInstaller, checkForMigration} from "ep_etherpad-lite/static/js/pluginfw/installer";
+import {persistInstalledPlugins} from "./commonPlugins";
+import fs from "node:fs";
+const settings = require('ep_etherpad-lite/node/utils/Settings');
+
+if (process.argv.length === 2) {
+  console.error('Expected at least one argument!');
+  process.exit(1);
+}
+
+let args = process.argv.slice(2)
+
+
+const possibleActions = [
+  "i",
+  "install",
+  "rm",
+  "remove",
+  "ls",
+  "list"
+]
+
+const install = ()=> {
+  const argsAsString: string = args.join(" ");
+  const regexRegistryPlugins = /(?<=(?:i|install)\s)(.*?)(?=--github|--path|$)/;
+  const regexLocalPlugins = /(?<=--path\s)(.*?)(?=--github|$)/;
+  const regexGithubPlugins = /(?<=--github\s)(.*?)(?=--path|$)/;
+  const registryPlugins = argsAsString.match(regexRegistryPlugins)?.[0]?.split(" ")?.filter(s => s) || [];
+  const localPlugins = argsAsString.match(regexLocalPlugins)?.[0]?.split(" ")?.filter(s => s) || [];
+  const githubPlugins = argsAsString.match(regexGithubPlugins)?.[0]?.split(" ")?.filter(s => s) || [];
+
+  async function run() {
+    for (const plugin of registryPlugins) {
+      if (possibleActions.includes(plugin)){
+        continue
+      }
+      console.log(`Installing plugin from registry: ${plugin}`)
+      if (plugin.includes('@')) {
+        const [name, version] = plugin.split('@');
+        await linkInstaller.installPlugin(name, version);
+        continue;
+      }
+      await linkInstaller.installPlugin(plugin);
+    }
+
+    for (const plugin of localPlugins) {
+      console.log(`Installing plugin from path: ${plugin}`);
+      await linkInstaller.installFromPath(plugin);
+    }
+
+    for (const plugin of githubPlugins) {
+      console.log(`Installing plugin from github: ${plugin}`);
+      await linkInstaller.installFromGitHub(plugin);
+    }
+  }
+
+  (async () => {
+    await checkForMigration();
+    await run();
+    await persistInstalledPlugins();
+  })();
+}
+
+const list = ()=>{
+  const walk =  async () => {
+    const plugins = fs.readFileSync(settings.root+"/var/installed_plugins.json", "utf-8")
+    const pluginNames = JSON.parse(plugins).plugins.map((plugin: any) => plugin.name).join(", ")
+
+    console.log("Installed plugins are:", pluginNames)
+  }
+
+  (async () => {
+    await walk();
+  })();
+}
+
+const remove = (plugins: string[])=>{
+  const walk =  async () => {
+    for (const plugin of plugins) {
+      console.log(`Uninstalling plugin: ${plugin}`)
+      await linkInstaller.uninstallPlugin(plugin);
+    }
+    await persistInstalledPlugins();
+  }
+
+  (async () => {
+    await checkForMigration();
+    await walk();
+  })();
+}
+
+let action = args[0];
+
+switch (action) {
+  case "install":
+    install();
+    break;
+  case "i":
+    install();
+    break;
+  case "ls":
+    list();
+    break;
+  case "list":
+    list();
+    break;
+  case "rm":
+    remove(args.slice(1));
+    break;
+  case "remove":
+    remove(args.slice(1));
+    break;
+  default:
+    console.error('Expected at least one argument!');
+    process.exit(1);
+}
+
+

bin/plugins/checkPlugin.ts

@@ -474,6 +474,6 @@ log4js.configure({
       logger.info('No changes.');
     }
   }
-
   logger.info('Finished');
+  process.exit(0)
 })();

bin/plugins/lib/backend-tests.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 10
           run_install: false
       - name: Get pnpm store directory
         shell: bash
@@ -69,7 +69,7 @@ jobs:
         working-directory: ./etherpad-lite
         run: |
           pnpm link --global $PLUGIN_NAME
-          pnpm run install-plugins --path  ../../plugin
+          pnpm run plugins i --path  ../../plugin
         env:
           PLUGIN_NAME: ${{ steps.plugin_name.outputs.plugin_name }}
       - name: Link ep_etherpad-lite

bin/plugins/lib/frontend-tests.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 10
           run_install: false
       - name: Get pnpm store directory
         shell: bash
@@ -78,7 +78,7 @@ jobs:
       - name: Run the frontend tests
         shell: bash
         run: |
-          pnpm run dev &
+          pnpm run prod &
           connected=false
           can_connect() {
           curl -sSfo /dev/null http://localhost:9001/ || return 1

bin/plugins/lib/npmpublish.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 10
           run_install: false
       - name: Get pnpm store directory
         shell: bash

bin/plugins/stalePlugins.ts

@@ -3,6 +3,7 @@
 // Returns a list of stale plugins and their authors email
 
 import axios from 'axios'
+import process from "node:process";
 const currentTime = new Date();
 
 (async () => {
@@ -19,4 +20,5 @@ const currentTime = new Date();
       console.log(`${name}, ${res.data[plugin].data.maintainers[0].email}`);
     }
   }
+  process.exit(0)
 })();

bin/rebuildPad.ts

@@ -1,5 +1,3 @@
-'use strict';
-
 /*
   This is a repair tool. It rebuilds an old pad at a new pad location up to a
   known "good" revision.
@@ -7,6 +5,8 @@
 
 // As of v14, Node.js does not exit when there is an unhandled Promise rejection. Convert an
 // unhandled rejection into an uncaught exception, which does cause Node.js to exit.
+import process from "node:process";
+
 process.on('unhandledRejection', (err) => { throw err; });
 
 if (process.argv.length !== 4 && process.argv.length !== 5) {
@@ -82,4 +82,5 @@ const newPadId = process.argv[4] || `${padId}-rebuilt`;
 
   await db.shutdown();
   console.info('finished');
+  process.exit(0)
 })();

bin/release.ts

@@ -56,6 +56,8 @@ const readJson = (filename: string) => JSON.parse(fs.readFileSync(filename, {enc
 const assertWorkDirClean = (opts:{
     cwd?: string;
 } = {}) => {
+  // Stash any changes in the working directory so that we can check for modifications.
+  runc('git stash')
   opts.cwd = runc('git rev-parse --show-cdup', opts) || cwd;
   const m = runc('git diff-files --name-status', opts);
   console.log(">"+m.trim()+"<")
@@ -172,8 +174,8 @@ try {
   console.log('Merging develop into master...');
   run('git merge --no-ff --no-edit develop');
   console.log(`Creating ${newVersion} tag...`);
-  run(`git tag -s '${newVersion}' -m '${newVersion}'`);
+  run(`git tag -a '${newVersion}' -m '${newVersion}'`);
-  run(`git tag -s 'v${newVersion}' -m 'v${newVersion}'`);
+  run(`git tag -a 'v${newVersion}' -m 'v${newVersion}'`);
   console.log('Switching back to develop...');
   run('git checkout develop');
   console.log('Merging master into develop...');
@@ -197,7 +199,7 @@ try {
 
 try {
   console.log('Building documentation...');
-  run('node ./make_docs.js');
+  run('pnpm run makeDocs');
   console.log('Updating ether.github.com master branch...');
   run('git pull --ff-only', {cwd: '../ether.github.com/'});
   console.log('Committing documentation...');

bin/repairPad.ts

@@ -57,4 +57,5 @@ let valueCount = 0;
   }
 
   console.info(`Finished: Replaced ${valueCount} values in the database`);
+  process.exit(0)
 })();

bin/run.sh

@@ -45,4 +45,4 @@ fi
 log "Starting Etherpad..."
 
 # cd src
-exec pnpm run dev "$@"
+exec pnpm run prod "$@"

bin/tsconfig.json

@@ -39,7 +39,7 @@
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    "resolveJsonModule": true,                        /* Enable importing .json files. */
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
 

doc/.vitepress/config.mts

@@ -32,6 +32,7 @@ export default defineConfig({
                 { text: 'Stats', link: '/stats.md' },
                 {text: 'Skins', link: '/skins.md' },
                 {text: 'Demo', link: '/demo.md' },
+              {text: 'CLI', link: '/cli.md'},
                 ]
           },
           {

doc/api/changeset_library.adoc

@@ -1,6 +1,6 @@
 == Changeset Library
 
-The https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.js[changeset
+The https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.ts[changeset
 library]
 provides tools to create, read, and apply changesets.
 
@@ -31,7 +31,7 @@ const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
 ----
 
 Changesets do not include any attribute key–value pairs. Instead, they use
-numeric identifiers that reference attributes kept in an https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.js[attribute pool].
+numeric identifiers that reference attributes kept in an https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.ts[attribute pool].
 This attribute interning reduces the transmission overhead of attributes that
 are used many times.
 

doc/api/changeset_library.md

@@ -1,7 +1,7 @@
 # Changeset Library
 
 The [changeset
-library](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.js)
+library](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/Changeset.ts)
 provides tools to create, read, and apply changesets.
 
 ## Changeset
@@ -29,7 +29,7 @@ const AttributePool = require('ep_etherpad-lite/static/js/AttributePool');
 
 Changesets do not include any attribute key–value pairs. Instead, they use
 numeric identifiers that reference attributes kept in an [attribute
-pool](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.js).
+pool](https://github.com/ether/etherpad-lite/blob/develop/src/static/js/AttributePool.ts).
 This attribute interning reduces the transmission overhead of attributes that
 are used many times.
 

doc/cli.md

@@ -0,0 +1,29 @@
+# CLI
+
+You can find different tools for migrating things, checking your Etherpad health in the bin directory.
+One of these is the migrateDB command. It takes two settings.json files and copies data from one source to another one.
+In this example we migrate from the old dirty db to the new rustydb engine. So we copy these files to the root of the etherpad-directory.
+
+````json
+{
+  "dbType": "dirty",
+  "dbSettings": {
+    "filename": "./var/rusty.db"
+  }
+}
+````
+
+
+
+````json
+{
+  "dbType": "rustydb",
+  "dbSettings": {
+    "filename": "./var/rusty2.db"
+  }
+}
+````
+
+
+After that we need to move the data from dirty to rustydb.
+Therefore, we call `pnpm run --filter bin migrateDB --file1 test1.json --file2 test2.json` with these two files in our root directories. After some time the data should be copied over to the new database.

doc/docker.adoc

@@ -510,7 +510,7 @@ For the editor container, you can also make it full width by adding `full-width-
 
 | `SOCKETIO_MAX_HTTP_BUFFER_SIZE`
 | The maximum size (in bytes) of a single message accepted via Socket.IO. If a client sends a larger message, its connection gets closed to prevent DoS (memory exhaustion) attacks.
-| `10000`
+| `50000`
 
 | `LOAD_TEST`
 | Allow Load Testing tools to hit the Etherpad Instance. WARNING: this will disable security on the instance.

doc/docker.md

@@ -213,7 +213,7 @@ For the editor container, you can also make it full width by adding `full-width-
 | `FOCUS_LINE_PERCENTAGE_ARROW_UP`  | Percentage of viewport height to be additionally scrolled when user presses arrow up in the line of the top of the viewport. Set to 0 to let the scroll to be handled as default by Etherpad           | `0`                   |
 | `FOCUS_LINE_DURATION`             | Time (in milliseconds) used to animate the scroll transition. Set to 0 to disable animation                                                                                                            | `0`                   |
 | `FOCUS_LINE_CARET_SCROLL`         | Flag to control if it should scroll when user places the caret in the last line of the viewport                                                                                                        | `false`               |
-| `SOCKETIO_MAX_HTTP_BUFFER_SIZE`   | The maximum size (in bytes) of a single message accepted via Socket.IO. If a client sends a larger message, its connection gets closed to prevent DoS (memory exhaustion) attacks.                     | `10000`               |
+| `SOCKETIO_MAX_HTTP_BUFFER_SIZE`   | The maximum size (in bytes) of a single message accepted via Socket.IO. If a client sends a larger message, its connection gets closed to prevent DoS (memory exhaustion) attacks.                     | `50000`               |
 | `LOAD_TEST`                       | Allow Load Testing tools to hit the Etherpad Instance. WARNING: this will disable security on the instance.                                                                                            | `false`               |
 | `DUMP_ON_UNCLEAN_EXIT`            | Enable dumping objects preventing a clean exit of Node.js. WARNING: this has a significant performance impact.                                                                                         | `false`               |
 | `EXPOSE_VERSION`                  | Expose Etherpad version in the web interface and in the Server http header. Do not enable on production machines.                                                                                      | `false`               |

doc/package.json

@@ -1,10 +1,16 @@
 {
   "devDependencies": {
-    "vitepress": "^1.1.3"
+    "vitepress": "^2.0.0-alpha.15"
   },
   "scripts": {
     "docs:dev": "vitepress dev",
     "docs:build": "vitepress build",
     "docs:preview": "vitepress preview"
+  },
+  "peerDependencies": {
+    "search-insights": "^2.17.3"
+  },
+  "overrides": {
+    "vite": "npm:rolldown-vite@7.2.10"
   }
 }

doc/plugins.md

@@ -7,8 +7,9 @@ execute its own functionality based on these events.
 Publicly available plugins can be found in the npm registry (see
 <https://npmjs.org>). Etherpad's naming convention for plugins is to prefix your
 plugins with `ep_`. So, e.g. it's `ep_flubberworms`. Thus you can install
-plugins from npm, using `npm install --no-save --legacy-peer-deps
+plugins from npm, using `pnpm run plugins install ep_flubberworms` in Etherpad's root directory.
-ep_flubberworm` in Etherpad's root directory.
+
+Also see [wiki article](https://github.com/ether/etherpad-lite/wiki/Available-Plugins) for more info.
 
 You can also browse to `http://yourEtherpadInstan.ce/admin/plugins`, which will
 list all installed plugins and those available on npm. It even provides

doc/skins.md

@@ -15,5 +15,5 @@ You can choose a skin changing the parameter `skinName` in `settings.json`.
 
 Since Etherpad **1.7.5**, two skins are included:
 
-* `no-skin`: an empty skin, leaving the default Etherpad appearance unchanged, that you can use as a guidance to develop your own.
+* `no-skin`: an empty skin, leaving the default Etherpad appearance unchanged, that you can use as guidance to develop your own.
 * `colibris`: a new, experimental skin, that will become the default in Etherpad 2.0.

doc/stats.adoc

@@ -17,3 +17,15 @@ We currently measure:
 Under the hood, we are happy to rely on https://github.com/felixge/node-measured[measured] for all our metrics needs.
 
 To modify or simply access our stats in your plugin, simply `require('ep_etherpad-lite/stats')` which is a https://yaorg.github.io/node-measured/packages/measured-core/Collection.html[`measured.Collection`].
+
+
+=== Prometheus scraper
+
+Besides the non standard `/stats` endpoint, Etherpad also exposes a `/stats/prometheus` endpoint which is compatible with Prometheus scraping. It includes a lot more metrics than the standard `/stats` endpoint. It contains the following metrics:
+
+- ueberdb stats
+- gc
+- memory
+- event loop lag
+- v8
+- and more

docker-compose.dev.yml

@@ -9,6 +9,7 @@ services:
     build:
       context: .
       args:
+        # Attention: installed plugins in the node_modules folder get overwritten during volume mount in dev
         ETHERPAD_PLUGINS:
       # change from development to production if needed
       target: development
@@ -57,7 +58,7 @@ services:
     # ports:
     #   - "5432:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql/data/pgdata
+      - postgres_data:/var/lib/postgresql/data
 
 volumes:
-  postgres_data:
+  postgres_data:

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   app:
-    user: "0:0"
+    user: "5001:0"
     image: etherpad/etherpad:latest
     tty: true
     stdin_open: true
@@ -42,7 +42,7 @@ services:
     # ports:
     #   - "5432:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql/data/pgdata
+      - postgres_data:/var/lib/postgresql/data
 
 volumes:
   postgres_data:

local_plugins/.gitignore

@@ -0,0 +1,3 @@
+# ignore everything
+*
+!.gitignore

make_docs.js

@@ -1,55 +0,0 @@
-import {exec} from 'child_process'
-import fs from 'fs'
-import path from 'path'
-
-import pjson from './src/package.json' assert {type: "json"}
-
-const VERSION=pjson.version
-console.log(`Building docs for version ${VERSION}`)
-
-const createDirIfNotExists = (dir) => {
-    if (!fs.existsSync(dir)){
-        fs.mkdirSync(dir)
-    }
-}
-
-
-function copyFolderSync(from, to) {
-    if(fs.existsSync(to)){
-        const stat = fs.lstatSync(to)
-        if (stat.isDirectory()){
-            fs.rmSync(to, { recursive: true })
-        }
-        else{
-            fs.rmSync(to)
-        }
-    }
-    fs.mkdirSync(to);
-    fs.readdirSync(from).forEach(element => {
-        if (fs.lstatSync(path.join(from, element)).isFile()) {
-            fs.copyFileSync(path.join(from, element), path.join(to, element))
-        } else {
-            copyFolderSync(path.join(from, element), path.join(to, element))
-        }
-    });
-}
-
-exec('asciidoctor -v', (err,stdout)=>{
-    if (err){
-        console.log('Please install asciidoctor')
-        console.log('https://asciidoctor.org/docs/install-toolchain/')
-        process.exit(1)
-    }
-});
-
-
-createDirIfNotExists('./out')
-createDirIfNotExists('./out/doc')
-createDirIfNotExists('./out/doc/api')
-
-
-
-exec(`asciidoctor -D out/doc doc/index.adoc */**.adoc -a VERSION=${VERSION}`)
-exec(`asciidoctor -D out/doc/api  ./doc/api/*.adoc -a VERSION=${VERSION}`)
-
-copyFolderSync('./doc/public/', './out/doc/')

package.json

@@ -15,6 +15,7 @@
   "scripts": {
     "lint": "pnpm --filter ep_etherpad-lite run lint",
     "test": "pnpm --filter ep_etherpad-lite run test",
+    "test-utils": "pnpm --filter ep_etherpad-lite run test-utils",
     "test-container": "pnpm --filter ep_etherpad-lite run test-container",
     "dev": "pnpm --filter ep_etherpad-lite run dev",
     "prod": "pnpm --filter ep_etherpad-lite run prod",
@@ -24,25 +25,30 @@
     "test-ui:ui": "pnpm --filter ep_etherpad-lite run test-ui:ui",
     "test-admin": "pnpm --filter ep_etherpad-lite run test-admin",
     "test-admin:ui": "pnpm --filter ep_etherpad-lite run test-admin:ui",
-    "install-plugins": "pnpm --filter bin run install-plugins"
+    "plugins": "pnpm --filter bin run plugins",
+    "install-plugins": "pnpm --filter bin run plugins i",
+    "remove-plugins": "pnpm --filter bin run remove-plugins",
+    "list-plugins": "pnpm --filter bin run list-plugins",
+    "build:etherpad": "pnpm --filter admin run build-copy && pnpm --filter ui run build-copy",
+    "build:ui": "pnpm --filter ui run build-copy && pnpm --filter admin run build-copy",
+    "makeDocs": "pnpm --filter bin run makeDocs"
   },
   "dependencies": {
-    "ep_etherpad-lite": "workspace:./src"
+    "ep_etherpad-lite": "link:src"
   },
   "devDependencies": {
-    "admin": "workspace:./admin",
+    "admin": "link:admin",
-    "docs": "workspace:./doc",
+    "docs": "link:doc",
-    "ui": "workspace:./ui"
+    "ui": "link:ui"
   },
   "engines": {
-    "node": ">=18.18.2",
+    "node": ">=20.0.0"
-    "npm": ">=6.14.0",
-    "pnpm": ">=8.3.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/ether/etherpad-lite.git"
   },
-  "version": "2.0.3",
+  "engineStrict": true,
+  "version": "2.6.0",
   "license": "Apache-2.0"
 }

pnpm-workspace.yaml

@@ -4,3 +4,7 @@ packages:
   - bin
   - doc
   - ui
+onlyBuiltDependencies:
+  - '@scarf/scarf'
+  - '@swc/core'
+  - esbuild

settings.json.docker

@@ -96,7 +96,7 @@
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
  *
- *    "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2"
+ *    "defaultPadText" : "${DEFAULT_PAD_TEXT:Line 1\nLine 2}"
  */
 {
   /*
@@ -104,6 +104,11 @@
    */
   "title": "${TITLE:Etherpad}",
 
+  /*
+  * Whether to show recent pads on the homepage or not.
+  */
+  "showRecentPads": "${SHOW_RECENT_PADS:true}",
+
   /*
    * Pathname of the favicon you want to use. If null, the skin's favicon is
    * used if one is provided by the skin, otherwise the default Etherpad favicon
@@ -171,6 +176,35 @@
    */
   "showSettingsInAdminPage": "${SHOW_SETTINGS_IN_ADMIN_PAGE:true}",
 
+  /*
+   * Enable/disable the metrics endpoint.
+   *
+   * This is used by the monitoring plugins to collect metrics about Etherpad.
+   * If you do not use any monitoring plugins, you can disable this.
+   */
+  "enableMetrics": "${ENABLE_METRICS:true}",
+
+  /*
+   * Settings for cleanup of pads
+   */
+  "cleanup": {
+    "enabled": false,
+    "keepRevisions": 5
+  },
+
+  /*
+    The authentication method used by the server.
+    The default value is sso
+    If you want to use the old authentication system, change this to apikey
+   */
+  "authenticationMethod": "${AUTHENTICATION_METHOD:sso}",
+
+  /**
+  * Allow setting dark mode for the enduser. This is so if the user has preferred dark mode in their browser, Etherpad will respect that.
+  * Of course this overrides all the skin variants and the skinName set by the administrator.
+  **/
+  "enableDarkMode": "${ENABLE_DARK_MODE:true}",
+
   /*
    * Node native SSL support
    *
@@ -187,6 +221,15 @@
           },
   */
 
+
+  /*
+   * Enables the use of a different server. We have a different one that syncs changes from the original server.
+   * It is hosted on GitHub and should not be blocked by many firewalls.
+   *  https://etherpad.org/ep_infos
+   */
+
+  "updateServer": "https://etherpad.org/ep_infos",
+
   /*
    * The type of the database.
    *
@@ -537,7 +580,7 @@
      * value to work properly, but increasing the value increases susceptibility
      * to denial of service attacks (malicious clients can exhaust memory).
      */
-    "maxHttpBufferSize": "${SOCKETIO_MAX_HTTP_BUFFER_SIZE:10000}"
+    "maxHttpBufferSize": "${SOCKETIO_MAX_HTTP_BUFFER_SIZE:50000}"
   },
 
   /*
@@ -618,7 +661,7 @@
     ],
     "right": [
       ["importexport", "timeslider", "savedrevision"],
-      ["settings", "embed"],
+      ["settings", "embed", "home"],
       ["showusers"]
     ],
     "timeslider": [

settings.json.template

@@ -87,7 +87,7 @@
  * 3) if you want to use newlines in the default value of a string parameter,
  *    use "\n" as usual.
  *
- *    "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2"
+ *    "defaultPadText" : "${DEFAULT_PAD_TEXT:Line 1\nLine 2}"
  */
 {
   /*
@@ -95,6 +95,11 @@
    */
   "title": "Etherpad",
 
+    /*
+    * Whether to show recent pads on the homepage or not.
+    */
+    "showRecentPads": true,
+
   /*
    * Pathname of the favicon you want to use. If null, the skin's favicon is
    * used if one is provided by the skin, otherwise the default Etherpad favicon
@@ -162,6 +167,22 @@
    */
   "showSettingsInAdminPage": true,
 
+  /*
+   * Enable/disable the metrics endpoint.
+   *
+   * This is used by the monitoring plugins to collect metrics about Etherpad.
+   * If you do not use any monitoring plugins, you can disable this.
+   */
+   "enableMetrics": "${ENABLE_METRICS:true}",
+
+  /*
+   * Settings for cleanup of pads
+   */
+  "cleanup": {
+    "enabled": false,
+    "keepRevisions": 5
+  },
+
   /*
    * Node native SSL support
    *
@@ -271,6 +292,14 @@
     "pageDown":  true
   },
 
+  /*
+   * Enables the use of a different server. We have a different one that syncs changes from the original server.
+   * It is hosted on GitHub and should not be blocked by many firewalls.
+   *  https://etherpad.org/ep_infos
+   */
+
+  "updateServer": "https://etherpad.org/ep_infos",
+
   /*
    * Should we suppress errors from being visible in the default Pad Text?
    */
@@ -537,7 +566,7 @@
      * value to work properly, but increasing the value increases susceptibility
      * to denial of service attacks (malicious clients can exhaust memory).
      */
-    "maxHttpBufferSize": 10000
+    "maxHttpBufferSize": 50000
   },
 
   /*
@@ -586,6 +615,19 @@
    */
   "importMaxFileSize": 52428800, // 50 * 1024 * 1024
 
+  /*
+    The authentication method used by the server.
+    The default value is sso
+    If you want to use the old authentication system, change this to apikey
+   */
+  "authenticationMethod": "${AUTHENTICATION_METHOD:sso}",
+
+    /**
+    * Allow setting dark mode for the enduser. This is so if the user has preferred dark mode in their browser, Etherpad will respect that.
+    * Of course this overrides all the skin variants and the skinName set by the administrator.
+    **/
+    "enableDarkMode": "${ENABLE_DARK_MODE:true}",
+
   /*
    * From Etherpad 1.8.5 onwards, when Etherpad is in production mode commits from individual users are rate limited
    *
@@ -618,7 +660,7 @@
     ],
     "right": [
       ["importexport", "timeslider", "savedrevision"],
-      ["settings", "embed"],
+      ["settings", "embed", "home"],
       ["showusers"]
     ],
     "timeslider": [
@@ -641,6 +683,13 @@
    */
   "loglevel": "INFO",
 
+    /*
+   * The log layout type to use.
+   *
+   * Valid values: basic, colored
+   */
+   "logLayoutType": "colored",
+
   /* Override any strings found in locale directories */
   "customLocaleStrings": {},
 

src/ep.json

@@ -42,7 +42,8 @@
       "name": "specialpages",
       "hooks": {
         "expressCreateServer": "ep_etherpad-lite/node/hooks/express/specialpages",
-        "expressPreSession": "ep_etherpad-lite/node/hooks/express/specialpages"
+        "expressPreSession": "ep_etherpad-lite/node/hooks/express/specialpages",
+        "socketio": "ep_etherpad-lite/node/hooks/express/specialpages"
       }
     },
     {
@@ -57,6 +58,18 @@
         "expressCreateServer": "ep_etherpad-lite/node/hooks/express/padurlsanitize"
       }
     },
+    {
+      "name": "transferToken",
+      "hooks": {
+        "expressCreateServer": "ep_etherpad-lite/node/hooks/express/tokenTransfer"
+      }
+    },
+    {
+      "name": "pwa",
+      "hooks": {
+        "expressCreateServer": "ep_etherpad-lite/node/hooks/express/pwa"
+      }
+    },
     {
       "name": "apicalls",
       "hooks": {
@@ -75,6 +88,12 @@
         "expressCreateServer": "ep_etherpad-lite/node/hooks/express/errorhandling"
       }
     },
+    {
+      "name": "restApi",
+      "hooks": {
+        "expressCreateServer": "ep_etherpad-lite/node/handler/RestAPI"
+      }
+    },
     {
       "name": "socketio",
       "hooks": {
@@ -83,12 +102,6 @@
         "socketio": "ep_etherpad-lite/node/handler/PadMessageHandler"
       }
     },
-    {
-      "name": "tests",
-      "hooks": {
-        "expressPreSession": "ep_etherpad-lite/node/hooks/express/tests"
-      }
-    },
     {
       "name": "admin",
       "hooks": {
@@ -112,12 +125,6 @@
       "hooks": {
         "expressPreSession": "ep_etherpad-lite/node/hooks/express/openapi"
       }
-    },
-    {
-      "name": "ep_message_all",
-      "client_hooks": {
-        "handleClientMessage_shoutMessage": "ep_etherpad-lite/static/js/messageHandler"
-      }
     }
   ]
 }

src/locales/ar.json

@@ -16,10 +16,18 @@
 		]
 	},
 	"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": "الإصدار",
@@ -31,16 +39,37 @@
 	"admin_plugins_info.plugins": "الإضافات المثبتة",
 	"admin_plugins_info.page-title": "معلومات البرنامج المساعد - Etherpad",
 	"admin_plugins_info.version": "إصدار Etherpad",
+	"admin_plugins_info.version_latest": "أحدث إصدار متاح",
 	"admin_plugins_info.version_number": "رقم الإصدار",
 	"admin_settings": "إعدادات",
+	"admin_settings.current": "التكوين الحالي",
 	"admin_settings.current_example-devel": "مثال على قالب إعدادات التطوير",
 	"admin_settings.current_example-prod": "مثال على قالب إعدادات الإنتاج",
 	"admin_settings.current_restart.value": "أعد تشغيل Etherpad",
 	"admin_settings.current_save.value": "حفظ الإعدادات",
 	"admin_settings.page-title": "الإعدادات - Etherpad",
 	"index.newPad": "باد جديد",
-	"index.createOpenPad": "أو صنع/فتح باد بوضع اسمه:",
+	"index.settings": "إعدادات",
+	"index.transferSessionTitle": "جلسة النقل",
+	"index.receiveSessionTitle": "تلقي الجلسة",
+	"index.receiveSessionDescription": "هنا يمكنك استقبال جلسة Etherpad من متصفح أو جهاز آخر. مع ذلك، يُرجى العلم أن هذا سيؤدي إلى حذف جلستك الحالية، إن وُجدت.",
+	"index.transferSession": "1. جلسة النقل",
+	"index.transferSessionNow": "نقل الجلسة الآن",
+	"index.copyLink": "2. نسخ الرابط",
+	"index.copyLinkDescription": "انقر على الزر أدناه لنسخ الرابط إلى الحافظة الخاصة بك.",
+	"index.copyLinkButton": "نسخ الرابط إلى الحافظة",
+	"index.transferToSystem": "3. نسخ الجلسة إلى النظام الجديد",
+	"index.transferToSystemDescription": "افتح الرابط المنسوخ في المتصفح أو الجهاز المستهدف لنقل جلستك.",
+	"index.transferSessionDescription": "انقل جلستك الحالية إلى المتصفح أو الجهاز بالنقر على الزر أدناه. سيؤدي هذا إلى نسخ رابط لصفحة ستنقل جلستك عند فتحها في المتصفح أو الجهاز المستهدف.",
+	"index.createOpenPad": "افتح الوسادة حسب الاسم",
 	"index.openPad": "افتح باد موجودة بالاسم:",
+	"index.recentPads": "الوسادات الأخيرة",
+	"index.recentPadsEmpty": "لم يتم العثور على أي وسادات حديثة.",
+	"index.generateNewPad": "إنشاء اسم لوحة عشوائي",
+	"index.labelPad": "اسم الوسادة (اختياري)",
+	"index.placeholderPadEnter": "الرجاء إدخال اسم الوسادة...",
+	"index.createAndShareDocuments": "إنشاء المستندات ومشاركتها في الوقت الفعلي",
+	"index.createAndShareDocumentsDescription": "يتيح لك Etherpad تحرير المستندات بشكل تعاوني في الوقت الفعلي، تمامًا مثل محرر متعدد اللاعبين مباشر يعمل في متصفحك.",
 	"pad.toolbar.bold.title": "سميك (Ctrl+B)",
 	"pad.toolbar.italic.title": "مائل (Ctrl+I)",
 	"pad.toolbar.underline.title": "تسطير (Ctrl+U)",
@@ -57,6 +86,7 @@
 	"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.cancel": "إلغاء",
@@ -73,6 +103,8 @@
 	"pad.settings.fontType": "نوع الخط:",
 	"pad.settings.fontType.normal": "عادي",
 	"pad.settings.language": "اللغة:",
+	"pad.settings.deletePad": "حذف الوسادة",
+	"pad.delete.confirm": "هل تريد حقا حذف هذه الوسادة؟",
 	"pad.settings.about": "حول",
 	"pad.settings.poweredBy": "مدعوم من",
 	"pad.importExport.import_export": "استيراد/تصدير",
@@ -110,6 +142,8 @@
 	"pad.modals.deleted": "محذوف.",
 	"pad.modals.deleted.explanation": "تمت إزالة هذا الباد.",
 	"pad.modals.rateLimited": "معدل محدود.",
+	"pad.modals.rateLimited.explanation": "لقد أرسلت الكثير من الرسائل إلى هذه اللوحة مما أدى إلى قطع الاتصال بك.",
+	"pad.modals.rejected.explanation": "رفض الخادم الرسالة التي أرسلها متصفحك.",
 	"pad.modals.rejected.cause": "ربما تم تحديث الخادم أثناء عرض اللوحة ، أو ربما كان هناك خطأ في Etherpad. حاول إعادة تحميل الصفحة.",
 	"pad.modals.disconnected": "لم تعد متصلا.",
 	"pad.modals.disconnected.explanation": "تم فقدان الاتصال بالخادم",

src/locales/be-tarask.json

@@ -35,10 +35,20 @@
 	"admin_plugins_info.version_number": "Нумар вэрсіі",
 	"admin_settings": "Налады",
 	"admin_settings.current": "Цяперашняя канфігурацыя",
+	"admin_settings.current_example-devel": "Прыклад шаблёну наладаў распрацоўкі",
+	"admin_settings.current_example-prod": "Прыклад шаблёну наладаў вытворчасьці",
+	"admin_settings.current_restart.value": "Перазапуск Etherpad",
+	"admin_settings.current_save.value": "Захаваць налады",
 	"admin_settings.page-title": "Налады — Etherpad",
 	"index.newPad": "Стварыць",
-	"index.createOpenPad": "ці тварыць/адкрыць дакумэнт з назвай:",
+	"index.createOpenPad": "Адкрыць дакумэнт паводле назвы",
 	"index.openPad": "адкрыць існы Нататнік з назваю:",
+	"index.recentPads": "Нядаўнія дакумэнты",
+	"index.recentPadsEmpty": "Нядаўнія дакумэнты ня знойдзеныя.",
+	"index.generateNewPad": "Стварыць выпадковую назву дакумэнта",
+	"index.labelPad": "Назва дакумэнта (неабавязкова)",
+	"index.placeholderPadEnter": "Калі ласка, увядзіце назву дакумэнта…",
+	"index.createAndShareDocuments": "Стварайце і дзяліцеся дакумэнтамі ў рэальным часе",
 	"pad.toolbar.bold.title": "Тоўсты (Ctrl-B)",
 	"pad.toolbar.italic.title": "Курсіў (Ctrl-I)",
 	"pad.toolbar.underline.title": "Падкрэсьліваньне (Ctrl-U)",
@@ -55,6 +65,7 @@
 	"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.cancel": "Скасаваць",
@@ -71,7 +82,10 @@
 	"pad.settings.fontType": "Тып шрыфту:",
 	"pad.settings.fontType.normal": "Звычайны",
 	"pad.settings.language": "Мова:",
+	"pad.settings.deletePad": "Выдаліць нататнік",
+	"pad.delete.confirm": "Вы ўпэўненыя, што хочаце выдаліць гэты нататнік?",
 	"pad.settings.about": "Пра",
+	"pad.settings.poweredBy": "Працуе на",
 	"pad.importExport.import_export": "Імпарт/Экспарт",
 	"pad.importExport.import": "Загрузіжайце любыя тэкставыя файлы або дакумэнты",
 	"pad.importExport.importSuccessful": "Пасьпяхова!",
@@ -106,6 +120,9 @@
 	"pad.modals.corruptPad.cause": "Гэта можа быць выклікана няправільнай канфігурацыяй сэрвэру або іншымі нечаканымі дзеяньнямі. Калі ласка, скантактуйцеся з адміністратарам службы.",
 	"pad.modals.deleted": "Выдалены.",
 	"pad.modals.deleted.explanation": "Гэты дакумэнт быў выдалены.",
+	"pad.modals.rateLimited": "Хуткасьць абмежаваная.",
+	"pad.modals.rateLimited.explanation": "Вы адаслалі так шмат паведамленьняў, што гэты дакумэнт вас адключыў.",
+	"pad.modals.rejected.explanation": "Сэрвэр адхіліў паведамленьне, адасланае вашым броўзэрам.",
 	"pad.modals.disconnected": "Вы былі адключаныя.",
 	"pad.modals.disconnected.explanation": "Злучэньне з сэрвэрам было страчанае",
 	"pad.modals.disconnected.cause": "Магчыма, сэрвэр недаступны. Калі ласка, паведаміце адміністратару службы, калі праблема будзе паўтарацца.",

src/locales/bn.json

@@ -8,6 +8,7 @@
 			"Bellayet",
 			"Greatder",
 			"Nasir8891",
+			"RiazACU",
 			"Sankarshan",
 			"Sibabrata Banerjee",
 			"আজিজ",

src/locales/ce.json

@@ -0,0 +1,49 @@
+{
+	"@metadata": {
+		"authors": [
+			"Умар"
+		]
+	},
+	"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.installed_uninstall.value": "ДӀайаккха",
+	"admin_plugins.last-update": "ТӀаьххьара карлайаккхар",
+	"admin_plugins.name": "ЦӀе",
+	"admin_plugins.page-title": "Плагинийн менеджер — Etherpad",
+	"admin_plugins.version": "Верси",
+	"admin_plugins_info.version_number": "Версин лоьмар",
+	"admin_settings": "Нисдаран гӀирс",
+	"admin_settings.current": "Карара конфигураци",
+	"pad.colorpicker.save": "Ӏалашйан",
+	"pad.colorpicker.cancel": "Йухайаккхар",
+	"pad.loading": "Чуйолуш…",
+	"pad.permissionDenied": "Хьан бакъонаш йац тӀекхача",
+	"pad.settings.padSettings": "Документан нисдаран гӀирс",
+	"pad.settings.myView": "Сан васт",
+	"pad.settings.stickychat": "Гуттара а гайта чат",
+	"pad.settings.language": "Мотт:",
+	"pad.settings.about": "Проектах лаьцна",
+	"pad.importExport.importSuccessful": "Кхиамца!",
+	"pad.modals.cancel": "Йухайаккхар",
+	"pad.share.link": "Хьажорг",
+	"pad.chat": "Чат",
+	"timeslider.toolbar.authors": "Авторш:",
+	"timeslider.toolbar.exportlink.title": "Экспорт",
+	"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": "декабрь",
+	"pad.impexp.importing": "Импорт йар..."
+}

src/locales/cs.json

@@ -11,7 +11,8 @@
 			"Mormegil",
 			"Peldrjan",
 			"Quinn",
-			"Spotter"
+			"Spotter",
+			"The astrea"
 		]
 	},
 	"admin.page-title": "Ovládací panel Správce - Etherpad",
@@ -48,8 +49,27 @@
 	"admin_settings.current_save.value": "Uložit nastavení",
 	"admin_settings.page-title": "Nastavení - Etherpad",
 	"index.newPad": "Založ nový Pad",
-	"index.createOpenPad": "nebo vytvoř/otevři Pad s názvem:",
+	"index.settings": "Nastavení",
+	"index.transferSessionTitle": "relace Přenosu",
+	"index.receiveSessionTitle": "Přijmout relaci",
+	"index.receiveSessionDescription": "Zde můžete přijímat relaci Etherpad z jiného prohlížeče nebo zařízení. Upozorňujeme však, že tím se smaže vaše aktuální relace, pokud nějaká existuje.",
+	"index.transferSession": "1. Přenos relace",
+	"index.transferSessionNow": "Přenést relaci nyní",
+	"index.copyLink": "2. Zkopírovat odkaz",
+	"index.copyLinkDescription": "Kliknutím na tlačítko níže zkopírujete odkaz do schránky.",
+	"index.copyLinkButton": "Kopírovat odkaz do schránky",
+	"index.transferToSystem": "3. Zkopírujte relaci do nového systému",
+	"index.transferToSystemDescription": "Otevřete zkopírovaný odkaz v cílovém prohlížeči nebo zařízení a přeneste svou relaci.",
+	"index.transferSessionDescription": "Přeneste svou aktuální relaci do prohlížeče nebo zařízení kliknutím na tlačítko níže. Tím se zkopíruje odkaz na stránku, která přenese vaši relaci po otevření v cílovém prohlížeči nebo zařízení.",
+	"index.createOpenPad": "Otevřít pad podle jména",
 	"index.openPad": "otevřít existující Pad se jménem:",
+	"index.recentPads": "Poslední Pady",
+	"index.recentPadsEmpty": "Nebyly nalezeny žádné nedávné pady.",
+	"index.generateNewPad": "Generovat náhodný název padu",
+	"index.labelPad": "Název Padu (volitelné)",
+	"index.placeholderPadEnter": "Zadejte prosím název padu...",
+	"index.createAndShareDocuments": "Vytvářejte a sdílejte dokumenty v reálném čase",
+	"index.createAndShareDocumentsDescription": "Etherpad umožňuje kolaborativní úpravu dokumentů v reálném čase, podobně jako živý multiplayerový editor, který běží ve vašem prohlížeči.",
 	"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)",
@@ -66,6 +86,7 @@
 	"pad.toolbar.savedRevision.title": "Uložit revizi",
 	"pad.toolbar.settings.title": "Nastavení",
 	"pad.toolbar.embed.title": "Sdílet a umístit tento Pad",
+	"pad.toolbar.home.title": "Zpět domů",
 	"pad.toolbar.showusers.title": "Zobrazit uživatele u tohoto Padu",
 	"pad.colorpicker.save": "Uložit",
 	"pad.colorpicker.cancel": "Zrušit",
@@ -82,6 +103,8 @@
 	"pad.settings.fontType": "Typ písma:",
 	"pad.settings.fontType.normal": "Normální",
 	"pad.settings.language": "Jazyk:",
+	"pad.settings.deletePad": "Smazat pad",
+	"pad.delete.confirm": "Opravdu chcete tento pad smazat?",
 	"pad.settings.about": "O projektu",
 	"pad.settings.poweredBy": "Běží na",
 	"pad.importExport.import_export": "Import/Export",

src/locales/de.json

@@ -2,15 +2,18 @@
 	"@metadata": {
 		"authors": [
 			"Bjarncraft",
+			"Brettchenweber",
 			"Dom",
 			"Justman10000",
 			"Killarnee",
 			"Metalhead64",
 			"Mklehr",
+			"Mukeber",
 			"Nipsky",
 			"Predatorix",
 			"SamTV",
 			"Sebastian Wallroth",
+			"Ssgl",
 			"Thargon",
 			"Tim.krieger",
 			"Wikinaut",
@@ -51,8 +54,27 @@
 	"admin_settings.current_save.value": "Einstellungen speichern",
 	"admin_settings.page-title": "Einstellungen - Etherpad",
 	"index.newPad": "Neues Pad",
-	"index.createOpenPad": "oder ein Pad mit folgendem Namen erstellen/öffnen:",
+	"index.settings": "Einstellungen",
+	"index.transferSessionTitle": "Sitzung übertragen",
+	"index.receiveSessionTitle": "Sitzung empfangen",
+	"index.receiveSessionDescription": "Hier kannst du eine Etherpad-Sitzung aus einem anderen Browser oder Gerät empfangen. Bedenke allerdings, dass dadurch deine aktuelle Sitzung, falls vorhanden, gelöscht wird.",
+	"index.transferSession": "1. Sitzung übertragen",
+	"index.transferSessionNow": "Jetzt übertragen",
+	"index.copyLink": "2. Link kopieren",
+	"index.copyLinkDescription": "Klicke auf den untenstehenden Button, um den Übertragungscode in deine Zwischenablage zu kopieren.",
+	"index.copyLinkButton": "Übertragungscode kopieren",
+	"index.transferToSystem": "3. Sitzung einfügen",
+	"index.transferToSystemDescription": "Öffne den kopierten Link in dem neuen Browser oder Gerät, um deine aktuelle Etherpad-Sitzung zu übertragen.",
+	"index.transferSessionDescription": "Übertrage deine aktuelle Etherpad-Sitzung zu einem anderen Browser oder Gerät, indem du den untenstehenden Button klickst. Dabei wird ein Link in deine Zwischenablage kopiert, den du im neuen Browser oder Gerät öffnen kannst, um deine Sitzung zu übertragen.",
+	"index.createOpenPad": "Pad öffnen",
 	"index.openPad": "Öffne ein vorhandenes Pad mit folgendem Namen:",
+	"index.recentPads": "Zuletzt bearbeitete Pads",
+	"index.recentPadsEmpty": "Keine kürzlich bearbeiteten Pads gefunden.",
+	"index.generateNewPad": "Neues Pad generieren",
+	"index.labelPad": "Padname (optional)",
+	"index.placeholderPadEnter": "Gib den Namen des Pads ein...",
+	"index.createAndShareDocuments": "Erstelle und teile Dokumente in Echtzeit",
+	"index.createAndShareDocumentsDescription": "Etherpad ermöglicht die gemeinsame Bearbeitung von Dokumenten in Echtzeit, ähnlich wie ein Live-Multiplayer-Editor, der in Ihrem Browser läuft.",
 	"pad.toolbar.bold.title": "Fett (Strg-B)",
 	"pad.toolbar.italic.title": "Kursiv (Strg-I)",
 	"pad.toolbar.underline.title": "Unterstrichen (Strg-U)",
@@ -69,6 +91,7 @@
 	"pad.toolbar.savedRevision.title": "Version speichern",
 	"pad.toolbar.settings.title": "Einstellungen",
 	"pad.toolbar.embed.title": "Dieses Pad teilen oder einbetten",
+	"pad.toolbar.home.title": "Zurück zur Startseite",
 	"pad.toolbar.showusers.title": "Benutzer dieses Pads anzeigen",
 	"pad.colorpicker.save": "Speichern",
 	"pad.colorpicker.cancel": "Abbrechen",
@@ -85,6 +108,8 @@
 	"pad.settings.fontType": "Schriftart:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Sprache:",
+	"pad.settings.deletePad": "Pad löschen",
+	"pad.delete.confirm": "Möchtest du dieses Pad wirklich löschen?",
 	"pad.settings.about": "Über",
 	"pad.settings.poweredBy": "Betrieben von",
 	"pad.importExport.import_export": "Import/Export",

src/locales/diq.json

@@ -3,6 +3,7 @@
 		"authors": [
 			"1917 Ekim Devrimi",
 			"Erdemaslancan",
+			"GolyatGeri",
 			"Gorizon",
 			"Gırd",
 			"Kumkumuk",
@@ -78,6 +79,8 @@
 	"pad.settings.fontType": "Babeta nuşti:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Zıwan:",
+	"pad.settings.deletePad": "Defteri bıesterê",
+	"pad.delete.confirm": "Şıma raşti wazenê ke nê defteri bıesterên?",
 	"pad.settings.about": "Heqa",
 	"pad.settings.poweredBy": "Pheştidayoğ",
 	"pad.importExport.import_export": "Zerredayış/Teberdayış",

src/locales/dsb.json

@@ -38,8 +38,27 @@
 	"admin_settings.current_save.value": "Nastajenja składowaś",
 	"admin_settings.page-title": "Nastajenja – Etherpad",
 	"index.newPad": "Nowy zapisnik",
-	"index.createOpenPad": "abo napóraj/wócyń zapisnik z mjenim:",
+	"index.settings": "Nastajenja",
+	"index.transferSessionTitle": "Pósejźenje pśenosowaś",
+	"index.receiveSessionTitle": "Pósejźenje dostaś",
+	"index.receiveSessionDescription": "How móžoš póseźenje Etherpad z drugego wobglědowaka abo rěda dostaś. Pšosym źiwaj na to, až to wašo aktualne pósejźenje wulašujo, jolic take eksistěrujo.",
+	"index.transferSession": "1. Pósejźenje pśenosowaś",
+	"index.transferSessionNow": "Pósejźenje něnto pśenosowaś",
+	"index.copyLink": "2. Wótkaz kopěrowaś",
+	"index.copyLinkDescription": "Klikni na slědujucy tłocašk, aby wótkaz do mjazywótkłada kopěrował.",
+	"index.copyLinkButton": "Wótkaz do mjazywótkłada kopěrowaś",
+	"index.transferToSystem": "3. Pósejźenje do nowego systema kopěrowaś",
+	"index.transferToSystemDescription": "Wócyń kopěrowany wótkaz w celowem wobglědowaku abo rěźe, aby swóje pósejźenje pśenosował.",
+	"index.transferSessionDescription": "Klikni na slědujucy tłocašk, aby swójo aktualne pósejźenje do wobglědowaka abo rěda pśenosował. To buźo wótkaz do boka kopěrowaś, kótaryž buźo wašo pósejźenje pśenosowaś, gaž se w celowem wobglědowaku abo rěźe woócynja.",
+	"index.createOpenPad": "Zapisnik pó mjenju wócyniś",
 	"index.openPad": "wócyńśo eksistěrujucy Pad z mjenim:",
+	"index.recentPads": "Nejnowše zapisniki",
+	"index.recentPadsEmpty": "Žedne nejnowše zapisniki namakane.",
+	"index.generateNewPad": "Pśipadne mě zapisnika generěrowaś",
+	"index.labelPad": "Mě zapisnika (pó žycenju)",
+	"index.placeholderPadEnter": "Pšosym zapódaj mě zapisnika…",
+	"index.createAndShareDocuments": "Napóraj a źěl dokumenty w napšawdnem casu",
+	"index.createAndShareDocumentsDescription": "Etherpad wam zmóžnja, dokumenty zgromadnje w napšawdnem casu wobźěłaś, kaž editor live multi-player, kótaryž we wašom wobglědowaku běžy.",
 	"pad.toolbar.bold.title": "Tucny (Strg-B)",
 	"pad.toolbar.italic.title": "Kursiwny (Strg-I)",
 	"pad.toolbar.underline.title": "Pódšmarnuś (Strg-U)",
@@ -56,6 +75,7 @@
 	"pad.toolbar.savedRevision.title": "Wersiju składowaś",
 	"pad.toolbar.settings.title": "Nastajenja",
 	"pad.toolbar.embed.title": "Toś ten zapisnik źěliś a zasajźiś",
+	"pad.toolbar.home.title": "Slědk k startowemu bokoju",
 	"pad.toolbar.showusers.title": "Wužywarje na toś tom zapisniku pokazaś",
 	"pad.colorpicker.save": "Składowaś",
 	"pad.colorpicker.cancel": "Pśetergnuś",
@@ -72,6 +92,8 @@
 	"pad.settings.fontType": "Pismowa družyna:",
 	"pad.settings.fontType.normal": "Normalny",
 	"pad.settings.language": "Rěc:",
+	"pad.settings.deletePad": "Zapisnik lašowaś",
+	"pad.delete.confirm": "Cośo napšawdu toś ten zapisnik lašowaś?",
 	"pad.settings.about": "Wó",
 	"pad.settings.poweredBy": "Pódpěrany wót",
 	"pad.importExport.import_export": "Import/Eksport",

src/locales/el.json

@@ -4,6 +4,7 @@
 			"Evropi",
 			"Geraki",
 			"Glavkos",
+			"Jimkats",
 			"Monopatis",
 			"Norhorn",
 			"Papspyr",
@@ -14,10 +15,12 @@
 	"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": "Τελευταία ενημέρωση",
@@ -41,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)",
@@ -59,6 +72,7 @@
 	"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.cancel": "Ακύρωση",
@@ -75,6 +89,8 @@
 	"pad.settings.fontType": "Τύπος γραμματοσειράς:",
 	"pad.settings.fontType.normal": "Κανονική",
 	"pad.settings.language": "Γλώσσα:",
+	"pad.settings.deletePad": "Διαγραφή Pad",
+	"pad.delete.confirm": "Θέλετε πραγματικά να διαγράψετε αυτό το pad;",
 	"pad.settings.about": "Σχετικά",
 	"pad.settings.poweredBy": "Υποστηρίζεται από",
 	"pad.importExport.import_export": "Εισαγωγή/Εξαγωγή",
@@ -89,7 +105,7 @@
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
 	"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.reconnecting": "Επανασύνδεση στο pad σας…",
 	"pad.modals.forcereconnect": "Επιβολή επανασύνδεσης",
 	"pad.modals.reconnecttimer": "Προσπάθεια επανασύνδεσης σε",
 	"pad.modals.cancel": "Ακύρωση",
@@ -111,7 +127,9 @@
 	"pad.modals.corruptPad.cause": "Αυτό μπορεί να οφείλεται σε ένα λάθος στη ρύθμιση του διακομιστή ή κάποια άλλη απρόβλεπτη συμπεριφορά. Παρακαλώ επικοινωνήστε με τον διαχειριστή της υπηρεσίας.",
 	"pad.modals.deleted": "Διεγράφη.",
 	"pad.modals.deleted.explanation": "Αυτό το pad έχει καταργηθεί.",
+	"pad.modals.rateLimited.explanation": "Στείλατε πάρα πολλά μηνύματα σε αυτό το pad, επομένως σας αποσύνδεσε.",
 	"pad.modals.rejected.explanation": "Ο διακομιστής απέρριψε ένα μήνυμα που στάλθηκε από το πρόγραμμα περιήγησής σας.",
+	"pad.modals.rejected.cause": "Ο διακομιστής μπορεί να έχει ενημερωθεί ενώ προβάλλατε το pad ή ίσως υπάρχει σφάλμα στο Etherpad. Δοκιμάστε να φορτώσετε ξανά τη σελίδα.",
 	"pad.modals.disconnected": "Είστε αποσυνδεδεμένοι.",
 	"pad.modals.disconnected.explanation": "Χάθηκε η σύνδεση με τον διακομιστή",
 	"pad.modals.disconnected.cause": "Ο διακομιστής μπορεί να μην είναι διαθέσιμος. Παρακαλούμε ειδοποιήστε τον διαχειριστή της υπηρεσίας εάν εξακολουθεί να συμβαίνει αυτό.",
@@ -124,6 +142,7 @@
 	"pad.chat.loadmessages": "Φόρτωση περισσότερων μηνυμάτων",
 	"pad.chat.stick.title": "Κρατήστε τη συνομιλία στην οθόνη",
 	"pad.chat.writeMessage.placeholder": "Γράψτε το μήνυμα σας εδώ",
+	"timeslider.followContents": "Ακολουθήστε τις ενημερώσεις περιεχομένου του pad",
 	"timeslider.pageTitle": "{{appTitle}} Χρονοδιάγραμμα",
 	"timeslider.toolbar.returnbutton": "Επιστροφή στο pad",
 	"timeslider.toolbar.authors": "Συντάκτες:",

src/locales/en.json

@@ -34,8 +34,28 @@
   "admin_settings.page-title": "Settings - Etherpad",
 
   "index.newPad": "New Pad",
-  "index.createOpenPad": "or create/open a Pad with the name:",
+  "index.settings": "Settings",
+  "index.transferSessionTitle": "Transfer session",
+  "index.receiveSessionTitle": "Receive session",
+  "index.receiveSessionDescription": "Here you can receive an Etherpad session from another browser or device. Please note, however, that this will delete your current session, if any.",
+  "index.transferSession": "1. Transfer session",
+  "index.transferSessionNow": "Transfer session now",
+  "index.copyLink": "2. Copy link",
+  "index.copyLinkDescription": "Click on the button below to copy the link to your clipboard.",
+  "index.copyLinkButton": "Copy link to clipboard",
+  "index.transferToSystem": "3. Copy session to new system",
+  "index.transferToSystemDescription": "Open the copied link in the target browser or device to transfer your session.",
+  "index.transferSessionDescription": "Transfer your current session to browser or device by clicking the button below. This will copy a link to a page that will transfer your session when opened in the target browser or device.",
+  "index.createOpenPad": "Open pad by name",
   "index.openPad": "open an existing Pad with the name:",
+  "index.recentPads": "Recent Pads",
+  "index.recentPadsEmpty": "No recent pads found.",
+  "index.generateNewPad": "Generate random pad name",
+  "index.labelPad": "Pad name (optional)",
+  "index.placeholderPadEnter": "Please enter a pad name...",
+  "index.createAndShareDocuments": "Create and share documents in real time",
+  "index.createAndShareDocumentsDescription": "Etherpad allows you to edit documents collaboratively in real-time, much like a live multi-player editor that runs in your browser.",
+
 
   "pad.toolbar.bold.title": "Bold (Ctrl+B)",
   "pad.toolbar.italic.title": "Italic (Ctrl+I)",
@@ -53,6 +73,7 @@
   "pad.toolbar.savedRevision.title": "Save Revision",
   "pad.toolbar.settings.title": "Settings",
   "pad.toolbar.embed.title": "Share and Embed this pad",
+  "pad.toolbar.home.title": "Back to home",
   "pad.toolbar.showusers.title": "Show the users on this pad",
 
   "pad.colorpicker.save": "Save",
@@ -72,6 +93,8 @@
   "pad.settings.fontType": "Font type:",
   "pad.settings.fontType.normal": "Normal",
   "pad.settings.language": "Language:",
+  "pad.settings.deletePad": "Delete Pad",
+  "pad.delete.confirm": "Do you really want to delete this pad?",
   "pad.settings.about": "About",
   "pad.settings.poweredBy": "Powered by",
 

src/locales/es.json

@@ -14,6 +14,7 @@
 			"Macofe",
 			"MartaEgea",
 			"Mklehr",
+			"Ovruni",
 			"Rubenwap",
 			"Tiberius1701",
 			"VegaDark",
@@ -50,11 +51,13 @@
 	"admin_settings": "Configuración",
 	"admin_settings.current": "Configuración actual",
 	"admin_settings.current_example-devel": "Plantilla de ejemplo de configuración de desarrollo",
+	"admin_settings.current_example-prod": "Ejemplo de plantilla de configuración de producción",
 	"admin_settings.current_restart.value": "Reiniciar Etherpad",
 	"admin_settings.current_save.value": "Guardar configuración",
 	"admin_settings.page-title": "Configuración. Etherpad",
 	"index.newPad": "Nuevo pad",
 	"index.createOpenPad": "o crea/abre un pad con el nombre:",
+	"index.openPad": "abrir un pad existente con el nombre:",
 	"pad.toolbar.bold.title": "Negrita (Ctrl-B)",
 	"pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
 	"pad.toolbar.underline.title": "Subrayado (Ctrl-U)",
@@ -87,6 +90,8 @@
 	"pad.settings.fontType": "Tipografía:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Idioma:",
+	"pad.settings.deletePad": "Eliminar pad",
+	"pad.delete.confirm": "¿De verdad quieres borrar este pad?",
 	"pad.settings.about": "Acerca de",
 	"pad.settings.poweredBy": "Funciona con",
 	"pad.importExport.import_export": "Importar/Exportar",
@@ -123,6 +128,10 @@
 	"pad.modals.corruptPad.cause": "Esto puede deberse a una mala configuración del servidor o algún otro comportamiento inesperado. Contacta con el administrador del servicio.",
 	"pad.modals.deleted": "Borrado.",
 	"pad.modals.deleted.explanation": "Este pad ha sido borrado.",
+	"pad.modals.rateLimited": "Límite de solicitudes.",
+	"pad.modals.rateLimited.explanation": "Enviaste demasiados mensajes a este pad por lo que te desconectó.",
+	"pad.modals.rejected.explanation": "El servidor rechazó un mensaje que envió tu navegador.",
+	"pad.modals.rejected.cause": "Es posible que el servidor se haya actualizado mientras veías el panel, o que haya un error en Etherpad. Intenta recargar la página.",
 	"pad.modals.disconnected": "Te has desconectado.",
 	"pad.modals.disconnected.explanation": "Se perdió la conexión con el servidor",
 	"pad.modals.disconnected.cause": "El servidor podría no estar disponible. Contacta con el administrador del servicio si esto continúa sucediendo.",
@@ -135,6 +144,7 @@
 	"pad.chat.loadmessages": "Cargar más mensajes",
 	"pad.chat.stick.title": "Ampliar",
 	"pad.chat.writeMessage.placeholder": "Enviar un mensaje",
+	"timeslider.followContents": "Sigue las actualizaciones de contenido del pad",
 	"timeslider.pageTitle": "{{appTitle}} Línea de tiempo",
 	"timeslider.toolbar.returnbutton": "Volver al pad",
 	"timeslider.toolbar.authors": "Autores:",
@@ -173,5 +183,6 @@
 	"pad.impexp.uploadFailed": "El envío falló. Inténtalo de nuevo.",
 	"pad.impexp.importfailed": "Fallo al importar",
 	"pad.impexp.copypaste": "Intenta copiar y pegar",
-	"pad.impexp.exportdisabled": "La exportación al formato {{type}} está desactivada. Contacta con tu administrador del sistema."
+	"pad.impexp.exportdisabled": "La exportación al formato {{type}} está desactivada. Contacta con tu administrador del sistema.",
+	"pad.impexp.maxFileSize": "El archivo es demasiado grande. Contacte al administrador del sitio para aumentar el tamaño de archivo permitido para la importación."
 }

src/locales/eu.json

@@ -1,7 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
+			"Alexgabi",
 			"An13sa",
+			"Atzerritik",
 			"HairyFotr",
 			"Izendegi",
 			"Mikel Ibaiba",
@@ -44,8 +46,14 @@
 	"admin_settings.current_save.value": "Gorde Ezarpenak",
 	"admin_settings.page-title": "Ezarpenak - Etherpad",
 	"index.newPad": "Pad berria",
-	"index.createOpenPad": "edo sortu/ireki Pad bat honako izenarekin:",
+	"index.createOpenPad": "Ireki Pad bat honako izenarekin:",
 	"index.openPad": "ireki existitzen den eta hurrengo izena duen Pad-a:",
+	"index.recentPadsEmpty": "Ez da aurkitu duela gutxiko pad-ik",
+	"index.generateNewPad": "Sortu pad izen aleatorioa",
+	"index.labelPad": "Pad izena (aukerakoa)",
+	"index.placeholderPadEnter": "Mesedez sartu pad izen bat...",
+	"index.createAndShareDocuments": "Sortu eta partekatu dokumentuak denbora errealean",
+	"index.createAndShareDocumentsDescription": "Etherpadek aukera ematen dizu dokumentuak elkarlanean editatzeko zure nabigatzailean exekutatzen den idazle anitzeko editore bat bezala.",
 	"pad.toolbar.bold.title": "Lodia (Ctrl+B)",
 	"pad.toolbar.italic.title": "Etzana (Ctrl+I)",
 	"pad.toolbar.underline.title": "Azpimarratua (Ctrl+U)",
@@ -62,6 +70,7 @@
 	"pad.toolbar.savedRevision.title": "Gorde berrikuspena",
 	"pad.toolbar.settings.title": "Ezarpenak",
 	"pad.toolbar.embed.title": "Partekatu eta Txertatu pad hau",
+	"pad.toolbar.home.title": "Atzera hasierara",
 	"pad.toolbar.showusers.title": "Erakutsi pad honetako erabiltzaileak",
 	"pad.colorpicker.save": "Gorde",
 	"pad.colorpicker.cancel": "Utzi",
@@ -78,6 +87,8 @@
 	"pad.settings.fontType": "Letra-mota:",
 	"pad.settings.fontType.normal": "Arrunta",
 	"pad.settings.language": "Hizkuntza:",
+	"pad.settings.deletePad": "Ezabatu pad-a",
+	"pad.delete.confirm": "Benetan pad hau ezabatu nahi duzu?",
 	"pad.settings.about": "Honi buruz",
 	"pad.settings.poweredBy": "Honek garatua:",
 	"pad.importExport.import_export": "Inportatu/Esportatu",

src/locales/fa.json

@@ -4,6 +4,8 @@
 			"BMRG14",
 			"Beginneruser",
 			"Dalba",
+			"Darafsh",
+			"Ebrahim",
 			"Ebraminio",
 			"FarsiNevis",
 			"Jeeputer",
@@ -65,6 +67,7 @@
 	"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.cancel": "لغو",
@@ -81,8 +84,10 @@
 	"pad.settings.fontType": "نوع قلم:",
 	"pad.settings.fontType.normal": "ساده",
 	"pad.settings.language": "زبان:",
+	"pad.settings.deletePad": "حذف پد",
+	"pad.delete.confirm": "آیا واقعاً می‌خواهید این پد را حذف کنید؟",
 	"pad.settings.about": "درباره",
-	"pad.settings.poweredBy": "قدرست‌گرفته از",
+	"pad.settings.poweredBy": "قدرت‌گرفته از",
 	"pad.importExport.import_export": "درون‌ریزی/برون‌بری",
 	"pad.importExport.import": "بارگذاری پروندهٔ متنی یا سند",
 	"pad.importExport.importSuccessful": "موفقیت آمیز بود!",
@@ -118,6 +123,9 @@
 	"pad.modals.deleted": "پاک شد.",
 	"pad.modals.deleted.explanation": "این دفترچه یادداشت پاک شده است.",
 	"pad.modals.rateLimited": "نرخ محدود شده است.",
+	"pad.modals.rateLimited.explanation": "پیام‌های زیادی به این پد فرستادید، بنابراین اتصال شما قطع شد.",
+	"pad.modals.rejected.explanation": "سرور پیامی را که مرورگرتان فرستاده بود، رد کرد.",
+	"pad.modals.rejected.cause": "ممکن است سرور هنگام مشاهدهٔ پد به‌روزرسانی شده باشد یا شاید باگی در اترپد وجود داشته باشد. صفحه را دوباره بارگذاری کنید.",
 	"pad.modals.disconnected": "اتصال شما قطع شده است.",
 	"pad.modals.disconnected.explanation": "اتصال به سرور قطع شده است.",
 	"pad.modals.disconnected.cause": "ممکن است سرور در دسترس نباشد. اگر این مشکل باز هم رخ داد مدیر حدمت را آگاه کنید.",
@@ -130,6 +138,7 @@
 	"pad.chat.loadmessages": "بارگیری پیام‌های بیشتر",
 	"pad.chat.stick.title": "چسباندن چت به صفحه",
 	"pad.chat.writeMessage.placeholder": "پیام خود را این‌جا بنویسید",
+	"timeslider.followContents": "پیگیری به‌روزرسانی‌های محتوای پد",
 	"timeslider.pageTitle": "لغزندهٔ زمان {{appTitle}}",
 	"timeslider.toolbar.returnbutton": "بازگشت به دفترچه یادداشت",
 	"timeslider.toolbar.authors": "نویسندگان:",
@@ -168,5 +177,6 @@
 	"pad.impexp.uploadFailed": "آپلود انجام نشد، دوباره تلاش کنید",
 	"pad.impexp.importfailed": "درون‌ریزی انجام نشد",
 	"pad.impexp.copypaste": "کپی پیست کنید",
-	"pad.impexp.exportdisabled": "برون‌ریزی با قالب {{type}} از کار افتاده است. برای جزئیات بیشتر با مدیر سامانه خودتان تماس بگیرید."
+	"pad.impexp.exportdisabled": "برون‌ریزی با قالب {{type}} از کار افتاده است. برای جزئیات بیشتر با مدیر سامانه خودتان تماس بگیرید.",
+	"pad.impexp.maxFileSize": "پرونده خیلی بزرگ است. با مدیر سایت تماس بگیرید تا اندازهٔ مجاز برای وارد کردن پرونده را افزایش دهد."
 }

src/locales/fi.json

@@ -50,11 +50,13 @@
 	"admin_settings": "Asetukset",
 	"admin_settings.current": "Nykyinen kokoonpano",
 	"admin_settings.current_example-devel": "Esimerkki kehitysasetusten mallista",
+	"admin_settings.current_example-prod": "Esimerkkipohja tuotantoasetuksille",
 	"admin_settings.current_restart.value": "Käynnistä Etherpad uudelleen",
 	"admin_settings.current_save.value": "Tallenna asetukset",
 	"admin_settings.page-title": "asetukset - Etherpad",
 	"index.newPad": "Uusi muistio",
-	"index.createOpenPad": "tai luo tai avaa muistio nimellä:",
+	"index.createOpenPad": "Avaa muistio nimellä",
+	"index.openPad": "avaa olemassa oleva muistio nimellä:",
 	"pad.toolbar.bold.title": "Lihavointi (Ctrl-B)",
 	"pad.toolbar.italic.title": "Kursivointi (Ctrl-I)",
 	"pad.toolbar.underline.title": "Alleviivaus (Ctrl-U)",
@@ -71,6 +73,7 @@
 	"pad.toolbar.savedRevision.title": "Tallenna muutos",
 	"pad.toolbar.settings.title": "Asetukset",
 	"pad.toolbar.embed.title": "Jaa ja upota muistio",
+	"pad.toolbar.home.title": "Takaisin kotiin",
 	"pad.toolbar.showusers.title": "Näytä muistion käyttäjät",
 	"pad.colorpicker.save": "Tallenna",
 	"pad.colorpicker.cancel": "Peru",
@@ -87,6 +90,8 @@
 	"pad.settings.fontType": "Fonttityyppi:",
 	"pad.settings.fontType.normal": "normaali",
 	"pad.settings.language": "Kieli:",
+	"pad.settings.deletePad": "Poista muistio",
+	"pad.delete.confirm": "Haluatko todella poistaa tämän muistion?",
 	"pad.settings.about": "Tietoja",
 	"pad.settings.poweredBy": "Palvelun mahdollistaa",
 	"pad.importExport.import_export": "Tuonti/vienti",
@@ -135,6 +140,7 @@
 	"pad.chat.loadmessages": "Lataa lisää viestejä",
 	"pad.chat.stick.title": "Liimaa chatti ruutuun",
 	"pad.chat.writeMessage.placeholder": "Kirjoita viestisi tähän",
+	"timeslider.followContents": "Seuraa muistion sisällön päivityksiä",
 	"timeslider.pageTitle": "{{appTitle}} -aikajana",
 	"timeslider.toolbar.returnbutton": "Palaa muistioon",
 	"timeslider.toolbar.authors": "Tekijät:",
@@ -173,5 +179,6 @@
 	"pad.impexp.uploadFailed": "Lähetys epäonnistui. Yritä uudelleen.",
 	"pad.impexp.importfailed": "Tuonti epäonnistui",
 	"pad.impexp.copypaste": "Kopioi ja liitä",
-	"pad.impexp.exportdisabled": "Vienti muotoon \"{{type}}\" ei ole käytössä. Ota yhteys ylläpitäjään saadaksesi lisätietoja."
+	"pad.impexp.exportdisabled": "Vienti muotoon \"{{type}}\" ei ole käytössä. Ota yhteys ylläpitäjään saadaksesi lisätietoja.",
+	"pad.impexp.maxFileSize": "Tiedosto on liian suuri. Ota yhteyttä sivustosi ylläpitäjään ja pyydä heitä korottomaan suurinta sallittua tiedostokokoa."
 }

src/locales/fr.json

@@ -5,6 +5,7 @@
 			"C13m3n7",
 			"Cquoi",
 			"Crochet.david",
+			"Derugon",
 			"Envlh",
 			"Framafan",
 			"Fylip22",
@@ -14,13 +15,16 @@
 			"Jean-Frédéric",
 			"Leviathan",
 			"Macofe",
+			"Mahabarata",
 			"Maxim21",
 			"McDutchie",
+			"Meaz",
 			"Metroitendo",
 			"Od1n",
 			"Peter17",
 			"Quenenni",
 			"Rastus Vernon",
+			"Spf",
 			"Stephane Cottin",
 			"Thibaut120094",
 			"Tux-tn",
@@ -63,8 +67,27 @@
 	"admin_settings.current_save.value": "Enregistrer les paramètres",
 	"admin_settings.page-title": "Paramètres — Etherpad",
 	"index.newPad": "Nouveau bloc-notes",
-	"index.createOpenPad": "ou créer/ouvrir un bloc-notes intitulé :",
+	"index.settings": "Paramètres",
+	"index.transferSessionTitle": "Session de transfert",
+	"index.receiveSessionTitle": "Résumé de la séance",
+	"index.receiveSessionDescription": "Vous pouvez ici recevoir une session Etherpad depuis un autre navigateur ou appareil. Veuillez noter toutefois que cela supprimera votre session actuelle, le cas échéant.",
+	"index.transferSession": "1. Séance de transfert",
+	"index.transferSessionNow": "Séance de transfert maintenant",
+	"index.copyLink": "Copier le lien",
+	"index.copyLinkDescription": "Cliquez sur le bouton ci-dessous pour copier le lien dans votre presse-papiers.",
+	"index.copyLinkButton": "Copier le lien dans le presse-papiers",
+	"index.transferToSystem": "3. Copier la séance sur le nouveau système",
+	"index.transferToSystemDescription": "Ouvrir le lien copié dans le navigateur ou l'appareil cible pour transférer votre séance.",
+	"index.transferSessionDescription": "Transférez votre session actuelle vers le navigateur ou l'appareil en cliquant sur le bouton ci-dessous. Cela copiera un lien vers une page qui transférera votre session lors de l'ouverture dans le navigateur ou l'appareil cible.",
+	"index.createOpenPad": "Ouvrir le bloc-notes par son nom",
 	"index.openPad": "ouvrir un bloc-note existant avec le nom :",
+	"index.recentPads": "Bloc-notes récents",
+	"index.recentPadsEmpty": "Aucun bloc-notes récents trouvés.",
+	"index.generateNewPad": "Générer un nom de bloc-notes aléatoire",
+	"index.labelPad": "Nom du bloc-notes (facultatif)",
+	"index.placeholderPadEnter": "Veuillez saisir un nom de bloc-notes...",
+	"index.createAndShareDocuments": "Créez et partagez des documents en temps réel",
+	"index.createAndShareDocumentsDescription": "Etherpad vous permet d'éditer des documents de manière collaborative en temps réel, un peu comme un éditeur multijoueur en direct qui s'exécute dans votre navigateur.",
 	"pad.toolbar.bold.title": "Gras (Ctrl + B)",
 	"pad.toolbar.italic.title": "Italique (Ctrl + I)",
 	"pad.toolbar.underline.title": "Souligné (Ctrl + U)",
@@ -81,6 +104,7 @@
 	"pad.toolbar.savedRevision.title": "Enregistrer la révision",
 	"pad.toolbar.settings.title": "Paramètres",
 	"pad.toolbar.embed.title": "Partager et intégrer ce bloc-notes",
+	"pad.toolbar.home.title": "Retour à l’accueil",
 	"pad.toolbar.showusers.title": "Afficher les utilisateurs du bloc-notes",
 	"pad.colorpicker.save": "Enregistrer",
 	"pad.colorpicker.cancel": "Annuler",
@@ -97,10 +121,12 @@
 	"pad.settings.fontType": "Type de police :",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Langue :",
+	"pad.settings.deletePad": "Supprimer le bloc-notes",
+	"pad.delete.confirm": "Voulez-vous vraiment supprimer ce bloc-notes ?",
 	"pad.settings.about": "À propos",
 	"pad.settings.poweredBy": "Propulsé par",
 	"pad.importExport.import_export": "Importer/Exporter",
-	"pad.importExport.import": "Charger un texte ou un document",
+	"pad.importExport.import": "Téléverser un texte ou un document",
 	"pad.importExport.importSuccessful": "Réussi !",
 	"pad.importExport.export": "Exporter le bloc-notes actuel en :",
 	"pad.importExport.exportetherpad": "Etherpad",
@@ -119,7 +145,7 @@
 	"pad.modals.userdup.explanation": "Ce bloc-notes semble être ouvert dans plusieurs fenêtres sur cet ordinateur.",
 	"pad.modals.userdup.advice": "Se reconnecter en utilisant plutôt cette fenêtre.",
 	"pad.modals.unauth": "Non autorisé",
-	"pad.modals.unauth.explanation": "Vos autorisations ont été changées lors de l’affichage de cette page. Essayez de vous reconnecter.",
+	"pad.modals.unauth.explanation": "Vos autorisations ont changées lors de l’affichage de cette page. Essayez de vous reconnecter.",
 	"pad.modals.looping.explanation": "Nous éprouvons des problèmes de communication au serveur de synchronisation.",
 	"pad.modals.looping.cause": "Il est possible que vous soyez connecté avec un pare-feu ou un mandataire incompatible.",
 	"pad.modals.initsocketfail": "Le serveur est introuvable.",
@@ -133,12 +159,12 @@
 	"pad.modals.corruptPad.cause": "Cela peut être dû à une mauvaise configuration du serveur ou à un autre comportement inattendu. Veuillez contacter l’administrateur du service.",
 	"pad.modals.deleted": "Supprimé.",
 	"pad.modals.deleted.explanation": "Ce bloc-notes a été supprimé.",
-	"pad.modals.rateLimited": "Flot limité.",
+	"pad.modals.rateLimited": "Débit limité.",
 	"pad.modals.rateLimited.explanation": "Vous avez envoyé trop de messages à ce bloc-notes, il vous a donc déconnecté.",
 	"pad.modals.rejected.explanation": "Le serveur a rejeté un message qui a été envoyé par votre navigateur.",
 	"pad.modals.rejected.cause": "Le serveur peut avoir été mis à jour pendant que vous regardiez le bloc-notes, ou il y a peut-être une anomalie dans Etherpad. Essayez de recharger la page.",
 	"pad.modals.disconnected": "Vous avez été déconnecté.",
-	"pad.modals.disconnected.explanation": "La connexion au serveur a échoué.",
+	"pad.modals.disconnected.explanation": "La connexion au serveur a échoué",
 	"pad.modals.disconnected.cause": "Il se peut que le serveur soit indisponible. Si le problème persiste, veuillez en informer l’administrateur du service.",
 	"pad.share": "Partager ce bloc-notes",
 	"pad.share.readonly": "Lecture seule",
@@ -157,7 +183,7 @@
 	"timeslider.toolbar.exportlink.title": "Exporter",
 	"timeslider.exportCurrent": "Exporter la version actuelle sous :",
 	"timeslider.version": "Version {{version}}",
-	"timeslider.saved": "Enregistré le {{day}} {{month}} {{year}}",
+	"timeslider.saved": "Enregistrée le {{day}} {{month}} {{year}}",
 	"timeslider.playPause": "Lecture / Pause des contenus du bloc-notes",
 	"timeslider.backRevision": "Reculer d’une révision dans ce bloc-notes",
 	"timeslider.forwardRevision": "Avancer d’une révision dans ce bloc-notes",
@@ -179,13 +205,13 @@
 	"pad.savedrevs.timeslider": "Vous pouvez voir les révisions enregistrées en ouvrant l’historique",
 	"pad.userlist.entername": "Saisissez votre nom",
 	"pad.userlist.unnamed": "anonyme",
-	"pad.editbar.clearcolors": "Effacer le surlignage par auteur dans tout le document ? Cette action ne peut être annulée.",
+	"pad.editbar.clearcolors": "Effacer le surlignage par auteur dans tout le document ? Cette action n'est pas réversible.",
 	"pad.impexp.importbutton": "Importer maintenant",
 	"pad.impexp.importing": "Importation en cours...",
 	"pad.impexp.confirmimport": "Importer un fichier écrasera le contenu actuel du bloc-notes. Êtes-vous sûr de vouloir le faire ?",
-	"pad.impexp.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire manuellement un copier/coller du texte brut",
+	"pad.impexp.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire manuellement",
-	"pad.impexp.padHasData": "Nous n’avons pas pu importer ce fichier parce que ce bloc-notes a déjà été modifié ; veuillez l’importer vers un nouveau bloc-notes.",
+	"pad.impexp.padHasData": "Nous n’avons pas pu importer ce fichier parce que ce bloc-notes a déjà été modifié ; veuillez l’importer vers un nouveau bloc-notes",
-	"pad.impexp.uploadFailed": "Le téléversement a échoué, veuillez réessayer.",
+	"pad.impexp.uploadFailed": "Le téléversement a échoué, veuillez réessayer",
 	"pad.impexp.importfailed": "Échec de l’import",
 	"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.",

src/locales/gl.json

@@ -40,11 +40,30 @@
 	"admin_settings.current_save.value": "Gardar axustes",
 	"admin_settings.page-title": "Axustes - Etherpad",
 	"index.newPad": "Novo documento",
-	"index.createOpenPad": "ou crea/abre un documento co nome:",
+	"index.settings": "Axustes",
-	"index.openPad": "abrir un Pad existente co nome:",
+	"index.transferSessionTitle": "Transferir a sesión",
-	"pad.toolbar.bold.title": "Resaltado (Ctrl-B)",
+	"index.receiveSessionTitle": "Recibir a sesión",
-	"pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
+	"index.receiveSessionDescription": "Aquí podes recibir unha sesión de Etherpad desde outro navegador ou dispositivo. Ten en conta, non obstante, que isto eliminará a túa sesión actual, se a houbese.",
-	"pad.toolbar.underline.title": "Subliñar (Ctrl-U)",
+	"index.transferSession": "1. Transfire a sesión",
+	"index.transferSessionNow": "Transfire a sesión agora",
+	"index.copyLink": "2. Copia a ligazón",
+	"index.copyLinkDescription": "Fai clic no botón de embaixo para copiar a ligazón no portapapeis.",
+	"index.copyLinkButton": "Copiar a ligazón no portapapeis",
+	"index.transferToSystem": "3. Copia a sesión no novo sistema",
+	"index.transferToSystemDescription": "Abre a ligazón copiada no navegador ou dispositivo de destino para transferir a túa sesión.",
+	"index.transferSessionDescription": "Transfire a túa sesión actual ao navegador ou dispositivo facendo clic no botón de embaixo. Isto copiará unha ligazón cara a unha páxina que transferirá a túa sesión cando se abra no navegador ou dispositivo de destino.",
+	"index.createOpenPad": "Abrir un documento por nome",
+	"index.openPad": "abrir un documento existente co nome:",
+	"index.recentPads": "Documentos recentes",
+	"index.recentPadsEmpty": "Non se atoparon documentos recentes.",
+	"index.generateNewPad": "Xerar un nome de documento ao chou",
+	"index.labelPad": "Nome do documento (opcional)",
+	"index.placeholderPadEnter": "Escribe un nome para o documento...",
+	"index.createAndShareDocuments": "Crea e comparte documentos en tempo real",
+	"index.createAndShareDocumentsDescription": "Etherpad permite editar documentos de forma colaborativa en tempo real, de xeito semellante a un editor multixogador en directo que se executa no navegador.",
+	"pad.toolbar.bold.title": "Grosa (Ctrl+B)",
+	"pad.toolbar.italic.title": "Cursiva (Ctrl+I)",
+	"pad.toolbar.underline.title": "Subliñar (Ctrl+U)",
 	"pad.toolbar.strikethrough.title": "Riscar (Ctrl+5)",
 	"pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "Lista sen ordenar (Ctrl+Shift+L)",
@@ -58,6 +77,7 @@
 	"pad.toolbar.savedRevision.title": "Gardar a revisión",
 	"pad.toolbar.settings.title": "Axustes",
 	"pad.toolbar.embed.title": "Compartir e incorporar este documento",
+	"pad.toolbar.home.title": "Volver ao inicio",
 	"pad.toolbar.showusers.title": "Mostrar as usuarias deste documento",
 	"pad.colorpicker.save": "Gardar",
 	"pad.colorpicker.cancel": "Cancelar",
@@ -74,6 +94,8 @@
 	"pad.settings.fontType": "Tipo de letra:",
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Lingua:",
+	"pad.settings.deletePad": "Borrar o documento",
+	"pad.delete.confirm": "Queres borrar este documento?",
 	"pad.settings.about": "Acerca de",
 	"pad.settings.poweredBy": "Grazas a",
 	"pad.importExport.import_export": "Importar/Exportar",
@@ -88,7 +110,7 @@
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
 	"pad.importExport.abiword.innerHTML": "Só podes importar texto simple ou formatos HTML. Para obter máis información sobre as características de importación avanzadas <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instala AbiWord</a>.",
 	"pad.modals.connected": "Conectado.",
-	"pad.modals.reconnecting": "Reconectando co seu documento...",
+	"pad.modals.reconnecting": "Reconectando co teu documento...",
 	"pad.modals.forcereconnect": "Forzar a reconexión",
 	"pad.modals.reconnecttimer": "Intentarase reconectar en",
 	"pad.modals.cancel": "Cancelar",
@@ -118,7 +140,7 @@
 	"pad.modals.disconnected.explanation": "Perdeuse a conexión co servidor",
 	"pad.modals.disconnected.cause": "O servidor non está dispoñible. Póñase en contacto co administrador do servizo se o problema continúa.",
 	"pad.share": "Compartir este documento",
-	"pad.share.readonly": "Só lectura",
+	"pad.share.readonly": "Lectura só",
 	"pad.share.link": "Ligazón",
 	"pad.share.emebdcode": "Incorporar o URL",
 	"pad.chat": "Chat",