Added testing area for the new typescript ueberdb2 build.

2023-07-01 11:01:49 +02:00
133 changed files with 13300 additions and 12721 deletions
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@ -22,9 +22,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node }}
          cache: 'npm'
@ -59,9 +59,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node }}
          cache: 'npm'
@ -120,9 +120,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -153,9 +153,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -23,7 +23,7 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          # We must fetch at least the immediate parents so that if this is
          # a pull request then we can checkout the head.
--- a/.github/workflows/dependency-review.yml
+++ b/.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@v3
      - name: 'Dependency Review'
        uses: actions/dependency-review-action@v3
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@ -17,17 +17,17 @@ jobs:
    steps:
      -
        name: Check out
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Set up QEMU
        if: github.event_name == 'push'
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v2
      -
        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v2
      -
        name: Build and export to Docker
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
        with:
          context: .
          load: true
@ -36,7 +36,7 @@ jobs:
          cache-to: type=gha,mode=max
      -
        name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 'lts/*'
          cache: 'npm'
@ -64,7 +64,7 @@ jobs:
        name: Docker meta
        if: github.event_name == 'push'
        id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v4
        with:
          images: etherpad/etherpad
          tags: |
@ -75,14 +75,14 @@ jobs:
      -
        name: Log in to Docker Hub
        if: github.event_name == 'push'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
      -
        name: Build and push
        if: github.event_name == 'push'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v4
        with:
          context: .
          platforms: linux/amd64,linux/arm64
--- a/.github/workflows/frontend-admin-tests.yml
+++ b/.github/workflows/frontend-admin-tests.yml
@ -8,17 +8,26 @@ permissions:

 jobs:
  withplugins:
-    if: ${{ github.actor != 'dependabot[bot]' }}
    name: with plugins
    runs-on: ubuntu-latest

-#        node: [16, 19, 20] >> Disabled node 16 and 18 because they do not work
    strategy:
      fail-fast: false
      matrix:
-        node: [19, 20]
+        node: [16, 18, 20]

    steps:
+      -
+        name: Fail if Dependabot
+        if: github.actor == 'dependabot[bot]'
+        run: |
+          cat <<EOF >&2
+          Frontend tests skipped because Dependabot can't access secrets.
+          Manually re-run the jobs to run the frontend tests.
+          For more information, see:
+          https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
+          EOF
+          exit 1
      -
        name: Generate Sauce Labs strings
        id: sauce_strings
@ -27,9 +36,9 @@ 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@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node }}
          cache: 'npm'
@ -70,15 +79,11 @@ jobs:
      -
        name: increase maxHttpBufferSize
        run: "sed -i 's/\"maxHttpBufferSize\": 10000/\"maxHttpBufferSize\": 100000/' settings.json"
-      -
-        name: Disable import/export rate limiting
-        run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 1000000/' -i settings.json
      -
        name: Remove standard frontend test files, so only admin tests are run
        run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs
      -
-        uses: saucelabs/sauce-connect-action@v2.3.5
+        uses: saucelabs/sauce-connect-action@v2.3.4
        with:
          username: ${{ secrets.SAUCE_USERNAME }}
          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@ -10,9 +10,18 @@ jobs:
  withoutplugins:
    name: without plugins
    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
-
    steps:
+      -
+        name: Fail if Dependabot
+        if: github.actor == 'dependabot[bot]'
+        run: |
+          cat <<EOF >&2
+          Frontend tests skipped because Dependabot can't access secrets.
+          Manually re-run the jobs to run the frontend tests.
+          For more information, see:
+          https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
+          EOF
+          exit 1
      -
        name: Generate Sauce Labs strings
        id: sauce_strings
@ -21,9 +30,9 @@ 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@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -43,9 +52,9 @@ jobs:
      -
        name: Disable import/export rate limiting
        run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 100000000/' -i settings.json
+          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
      -
-        uses: saucelabs/sauce-connect-action@v2.3.5
+        uses: saucelabs/sauce-connect-action@v2.3.4
        with:
          username: ${{ secrets.SAUCE_USERNAME }}
          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
@ -65,9 +74,18 @@ jobs:
  withplugins:
    name: with plugins
    runs-on: ubuntu-latest
-    if: ${{ github.actor != 'dependabot[bot]' }}
-
    steps:
+      -
+        name: Fail if Dependabot
+        if: github.actor == 'dependabot[bot]'
+        run: |
+          cat <<EOF >&2
+          Frontend tests skipped because Dependabot can't access secrets.
+          Manually re-run the jobs to run the frontend tests.
+          For more information, see:
+          https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
+          EOF
+          exit 1
      -
        name: Generate Sauce Labs strings
        id: sauce_strings
@ -76,9 +94,9 @@ 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@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -127,13 +145,13 @@ jobs:
      -
        name: Disable import/export rate limiting
        run: |
-          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 1000000/' -i settings.json
+          sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 0/' -i settings.json
      # XXX we should probably run all tests, because plugins could effect their results
      -
        name: Remove standard frontend test files, so only plugin tests are run
        run: rm src/tests/frontend/specs/*
      -
-        uses: saucelabs/sauce-connect-action@v2.3.5
+        uses: saucelabs/sauce-connect-action@v2.3.4
        with:
          username: ${{ secrets.SAUCE_USERNAME }}
          accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
--- a/.github/workflows/lint-package-lock.yml
+++ b/.github/workflows/lint-package-lock.yml
@ -18,9 +18,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -29,7 +29,7 @@ jobs:
            src/bin/doc/package-lock.json
      -
        name: Install lockfile-lint
-        run: npm install --no-save lockfile-lint --legacy-peer-deps
+        run: npm install --no-save lockfile-lint
      -
        name: Run lockfile-lint on package-lock.json
        run: >
--- a/.github/workflows/load-test.yml
+++ b/.github/workflows/load-test.yml
@ -18,9 +18,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -48,9 +48,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -105,9 +105,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
--- a/.github/workflows/rate-limit.yml
+++ b/.github/workflows/rate-limit.yml
@ -18,9 +18,9 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
--- a/.github/workflows/upgrade-from-latest-release.yml
+++ b/.github/workflows/upgrade-from-latest-release.yml
@ -22,11 +22,11 @@ jobs:
    steps:
      -
        name: Check out latest release
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          ref: master
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node }}
          cache: 'npm'
@ -67,7 +67,7 @@ jobs:
      -
        name: Run the backend tests
        run: cd src && npm test
-      # Because actions/checkout@v4 is called with "ref: master" and without
+      # Because actions/checkout@v3 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
@ -90,7 +90,7 @@ jobs:
        run: cd src && npm test
      -
        name: Install Cypress
-        run: cd src && npm install cypress --legacy-peer-deps
+        run: cd src && npm install cypress
      -
        name: Run Etherpad & Test Frontend
        run: |
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -24,9 +24,9 @@ jobs:
            zip
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -62,7 +62,7 @@ jobs:
    steps:
      -
        name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
      -
        name: Download .zip
        uses: actions/download-artifact@v3
@ -89,7 +89,7 @@ jobs:
    # run on pushes to any branch
    # run on PRs from external forks
    permissions:
-      contents: write
+      contents: none
    if: |
      (github.event_name != 'pull_request')
      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
@ -106,7 +106,7 @@ jobs:
        name: Extract Etherpad
        run: 7z x etherpad-win.zip -oetherpad
      -
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: 20
          cache: 'npm'
@ -115,7 +115,7 @@ jobs:
            etherpad/src/bin/doc/package-lock.json
      -
        name: Install Cypress
-        run: cd etherpad && cd src && npm install cypress --legacy-peer-deps
+        run: cd etherpad && cd src && npm install cypress
      -
        name: Run Etherpad
        run: |
@ -123,13 +123,3 @@ jobs:
          node node_modules\ep_etherpad-lite\node\server.js &
          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
          src\node_modules\cypress\bin\cypress run --config-file src\tests\frontendcypress\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@v1
-        if: ${{startsWith(github.ref, 'refs/tags/v') }}
-        with:
-            files: etherpad-lite-win.zip
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,54 +1,3 @@
-# 1.9.4
-
-### Compability changes
-
-* Log4js has been updated to the latest version. As it involved a bump of 6 major version. 
-  A lot has changed since then. Most notably the console appender has been deprecated. You can find out more about it [here](https://github.com/log4js-node/log4js-node)
-
-### Notable enhancements and fixes
-
-* Fix for MySQL: The logger calls were incorrectly configured leading to a crash when e.g. somebody uses a different encoding than standard MySQL encoding. 
-
-# 1.9.3
-
-### Compability changes
-
-* express-rate-limit has been bumped to 7.0.0: This involves the breaking change that "max: 0"
-in the importExportRateLimiting is set to always trigger. So set it to your desired value.
-If you haven't changed that value in the settings.json you are all set. 
-
-### Notable enhancements and fixes
-
-* Bugfixes
-  * Fix etherpad crashing with mongodb database
-
-* Enhancements
-  * Add surrealdb database support. You can find out more about this database [here](https://surrealdb.com).
-  * Make sqlite faster: The sqlite library has been switched to better-sqlite3. This should lead to better performance.
-
-# 1.9.2
-
-### Notable enhancements and fixes
-
-* Security
-  * Enable session key rotation: This setting can be enabled in the settings.json. It changes the signing key for the cookie authentication in a fixed interval.
-
-* Bugfixes
-  * Fix appendRevision when creating a new pad via the API without a text. 
-
-
-* Enhancements
-  * Bump JQuery to version 3.7
-  * Update elasticsearch connector to version 8
-
-### Compatibility changes
-
-* No compability changes as JQuery maintains excellent backwards compatibility. 
-
-#### For plugin authors
-
-* Please update to JQuery 3.7. There is an excellent deprecation guide over [here](https://api.jquery.com/category/deprecated/). Version 3.1 to 3.7 are relevant for the upgrade. 
-
 # 1.9.1

 ### Notable enhancements and fixes
@ -88,11 +37,6 @@ If you haven't changed that value in the settings.json you are all set.
    session expires (with some exceptions that will be fixed in the future).
  * Requests for static content (e.g., `/robots.txt`) and special pages (e.g.,
    the HTTP API, `/stats`) no longer create login session state.
-  * The secret used to sign the `express_sid` cookie is now automatically
-    regenerated every day (called *key rotation*) by default. If key rotation is
-    enabled, the now-deprecated `SESSIONKEY.txt` file can be safely deleted
-    after Etherpad starts up (its content is read and saved to the database and
-    used to validate signatures from old cookies until they expire).
 * The following settings from `settings.json` are now applied as expected (they
  were unintentionally ignored before):
  * `padOptions.lang`
--- a/12
+++ b/12
@ -17,9 +17,6 @@ RUN \
  }
 ENV TIMEZONE=${TIMEZONE}

-# Control the configuration file to be copied into the container.
-ARG SETTINGS=./settings.json.docker
-
 # 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.
@ -48,9 +45,9 @@ ARG INSTALL_SOFFICE=
 # leaner (development dependencies are not installed) and runs faster (among
 # other things, assets are minified & compressed).
 ENV NODE_ENV=production
-ENV ETHERPAD_PRODUCTION=true
+
 # Install dependencies required for modifying access.
-RUN apk add shadow bash
+RUN apk add shadow
 # Follow the principle of least privilege: run as unprivileged user.
 #
 # Running as non-root enables running this image in platforms like OpenShift
@ -63,7 +60,6 @@ ARG EP_UID=5001
 ARG EP_GID=0
 ARG EP_SHELL=

-ENV NODE_ENV=production

 RUN groupadd --system ${EP_GID:+--gid "${EP_GID}" --non-unique} etherpad && \
    useradd --system ${EP_UID:+--uid "${EP_UID}" --non-unique} --gid etherpad \
@ -81,7 +77,7 @@ RUN  \
    apk add  \
        ca-certificates \
        git \
-        ${INSTALL_ABIWORD:+abiword abiword-plugin-command} \
+        ${INSTALL_ABIWORD:+abiword} \
        ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common}

 USER etherpad
@ -104,7 +100,7 @@ RUN { [ -z "${ETHERPAD_PLUGINS}" ] || \
    rm -rf ~/.npm

 # Copy the configuration file.
-COPY --chown=etherpad:etherpad ${SETTINGS} "${EP_DIR}"/settings.json
+COPY --chown=etherpad:etherpad ./settings.json.docker "${EP_DIR}"/settings.json

 # Fix group permissions
 RUN chmod -R g=u .
--- a/README.md
+++ b/README.md
@ -116,7 +116,7 @@ following:

 ### Docker container

-Find [here](doc/docker.adoc) information on running Etherpad in a container.
+Find [here](doc/docker.md) information on running Etherpad in a container.

 ## Plugins

--- a/doc/api/hooks_client-side.adoc
+++ b/doc/api/hooks_client-side.adoc
@ -283,7 +283,7 @@ Things in context:
 This hook is called on the client side whenever a user joins or changes. This
 can be used to create notifications or an alternate user list.

-=== chatNewMessage
+=== `chatNewMessage`

 Called from: `src/static/js/chat.js`

@ -319,7 +319,7 @@ Context properties:
 * `duration`: How long (in milliseconds) to display the gritter notification (0
  to disable).

-=== chatSendMessage
+=== `chatSendMessage`

 Called from: `src/static/js/chat.js`

--- a/doc/api/hooks_server-side.adoc
+++ b/doc/api/hooks_server-side.adoc
@ -51,7 +51,7 @@ Things in context:

 If this hook returns an error, the callback to the install function gets an error, too. This seems useful for adding in features when a particular plugin is installed.

-=== init_<plugin name>
+=== `init_<plugin name>`

 Called from: `src/static/js/pluginfw/plugins.js`

@ -62,7 +62,7 @@ Context properties:
  * `logger`: An object with the following `console`-like methods: `debug`,
    `info`, `log`, `warn`, `error`.

-=== expressPreSession
+=== `expressPreSession`

 Called from: `src/node/hooks/express.js`

@ -92,7 +92,7 @@ exports.expressPreSession = async (hookName, {app}) => {
 };
 ----

-=== expressConfigure
+=== `expressConfigure`

 Called from: `src/node/hooks/express.js`

@ -107,7 +107,7 @@ Context properties:
 * `app`: The Express https://expressjs.com/en/4x/api.html==app[Application]
  object.

-=== expressCreateServer
+=== `expressCreateServer`

 Called from: `src/node/hooks/express.js`

@ -210,7 +210,7 @@ Things in context:
 This hook gets called when the access to the concrete pad is being checked.
 Return `false` to deny access.

-=== getAuthorId
+=== `getAuthorId`

 Called from `src/node/db/AuthorManager.js`

@ -267,7 +267,7 @@ exports.getAuthorId = async (hookName, context) => {
 };
 ----

-=== padCreate
+=== `padCreate`

 Called from: `src/node/db/Pad.js`

@ -279,7 +279,7 @@ Context properties:
 * `authorId`: The ID of the author who created the pad.
 * `author` (**deprecated**): Synonym of `authorId`.

-=== padDefaultContent
+=== `padDefaultContent`

 Called from `src/node/db/Pad.js`

@ -304,7 +304,7 @@ Context properties:
  be updated to match. Plugins must check the value of the `type` property
  before reading this value.

-=== padLoad
+=== `padLoad`

 Called from: `src/node/db/PadManager.js`

@ -315,7 +315,7 @@ Context properties:
 * `pad`: The Pad object.

 [#_padupdate]
-=== padUpdate
+=== `padUpdate`

 Called from: `src/node/db/Pad.js`

@ -329,7 +329,7 @@ Context properties:
 * `revs`: The index of the new revision.
 * `changeset`: The changeset of this revision (see <<_padupdate>>).

-=== padCopy
+=== `padCopy`

 Called from: `src/node/db/Pad.js`

@ -355,7 +355,7 @@ Usage examples:

  * https://github.com/ether/ep_comments_page

-=== padRemove
+=== `padRemove`

 Called from: `src/node/db/Pad.js`

@ -370,7 +370,7 @@ Usage examples:

  * https://github.com/ether/ep_comments_page

-=== padCheck
+=== `padCheck`

 Called from: `src/node/db/Pad.js`

@ -393,7 +393,7 @@ Things in context:

 I have no idea what this is useful for, someone else will have to add this description.

-=== preAuthorize
+=== `preAuthorize`

 Called from: `src/node/hooks/express/webaccess.js`

@ -700,7 +700,7 @@ exports.authzFailure = (hookName, context, cb) => {
 };
 ----

-=== handleMessage
+=== `handleMessage`

 Called from: `src/node/handler/PadMessageHandler.js`

@ -733,7 +733,7 @@ exports.handleMessage = async (hookName, {message, socket}) => {
 };
 ----

-=== handleMessageSecurity
+=== `handleMessageSecurity`

 Called from: `src/node/handler/PadMessageHandler.js`

@ -819,7 +819,7 @@ exports.clientVars = (hookName, context, callback) => {
 };
 ----

-=== getLineHTMLForExport
+=== `getLineHTMLForExport`

 Called from: `src/node/utils/ExportHtml.js`

@ -968,7 +968,7 @@ exports.exportHtmlAdditionalTagsWithData = function(hook, pad, cb){
 };
 ----

-=== exportEtherpadAdditionalContent
+=== `exportEtherpadAdditionalContent`

 Called from `src/node/utils/ExportEtherpad.js` and
 `src/node/utils/ImportEtherpad.js`.
@ -990,7 +990,7 @@ Example:
 exports.exportEtherpadAdditionalContent = () => ['comments'];
 ----

-=== exportEtherpad
+=== `exportEtherpad`

 Called from `src/node/utils/ExportEtherpad.js`.

@ -1013,7 +1013,7 @@ Context properties:
    should not assume that it is either the pad's real writable ID or its
    read-only ID.

-=== importEtherpad
+=== `importEtherpad`

 Called from `src/node/utils/ImportEtherpad.js`.

@ -1032,7 +1032,7 @@ Context properties:
    modified.
  * `srcPadId`: The pad ID used for the pad-specific information in `data`.

-=== import
+=== `import`

 Called from: `src/node/handler/ImportHandler.js`

@ -1062,7 +1062,7 @@ exports.import = async (hookName, {fileEnding, ImportError}) => {
 };
 ----

-=== userJoin
+=== `userJoin`

 Called from: `src/node/handler/PadMessageHandler.js`

@ -1086,7 +1086,7 @@ exports.userJoin = async (hookName, {authorId, displayName, padId}) => {
 };
 ```

-=== userLeave
+=== `userLeave`

 Called from: `src/node/handler/PadMessageHandler.js`

@ -1110,7 +1110,7 @@ exports.userLeave = async (hookName, {author, padId}) => {
 };
 ----

-=== chatNewMessage
+=== `chatNewMessage`

 Called from: `src/node/handler/PadMessageHandler.js`

--- a/doc/assets/style.css
+++ b/doc/assets/style.css
@ -1,9 +1,9 @@
 body {
  border-top: solid #44b492 5pt;
-  line-height: 150%;
-  font-family: "Quicksand", sans-serif;
+  line-height:150%;
+  font-family: 'Quicksand',sans-serif;
  color: #313b4a;
-  max-width: 1440px;
+  max-width:800px;
  margin: 0 auto;
  padding: 20px;
 }
@ -12,25 +12,24 @@ a {
  color: #555;
 }

-h1,
-h2 {
+h1,h2 {
  color: #44b492;
-  line-height: 100%;
+  line-height:100%;
 }

 h2 {
-  font-size: 48px;
+  font-size: 48px ;
 }

 h3 {
  font-size: 1.8rem;
 }

-h4 {
+h4{
  font-size: 1.5rem;
 }

-h5 {
+h5{
  font-size: 1.2rem;
 }

@ -40,7 +39,7 @@ a:hover {

 pre {
  background-color: #e0e0e0;
-  padding: 20px;
+  padding:20px;
 }

 code {
@ -51,9 +50,7 @@ img {
  max-width: 100%;
 }

-table,
-th,
-td {
+table, th, td {
  text-align: left;
  border: 1px solid gray;
  border-collapse: collapse;
@ -61,7 +58,7 @@ td {

 th {
  padding: 0.5em;
-  background: #eee;
+  background: #EEE;
 }

 td {
--- a/doc/cookies.adoc
+++ b/doc/cookies.adoc
@ -19,7 +19,7 @@ Cookies used by Etherpad.
 | Session
 | true
 | true
-| Session ID of the https://expressjs.com[Express web framework]. When Etherpad is behind a reverse proxy, and an administrator wants to use session stickiness, he may use this cookie. If you are behind a reverse proxy, please remember to set `trustProxy: true` in `settings.json`. Set in https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/hooks/express/webaccess.js#L131[webaccess.js#L131].
+| Session ID of the https://expressjs.com[Express web framework]. When Etherpad is behind a reverse proxy, and an administrator wants to use session stickiness, he may use this cookie. If you are behind a reverse proxy, please remember to set `trustProxy: true` in `settings.json`. Set in [webaccess.js#L131](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/hooks/express/webaccess.js#L131).


 |language
@ -29,7 +29,7 @@ Cookies used by Etherpad.
 | Session
 | false
 | true
-| The language of the UI (e.g.: `en-GB`, `it`). Set in https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_editor.js#L111[pad_editor.js#L111].
+| The language of the UI (e.g.: `en-GB`, `it`). Set in [pad_editor.js#L111](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_editor.js#L111).


 |prefs / prefsHttp
@ -39,7 +39,7 @@ Cookies used by Etherpad.
 | year 3000
 | false
 | true
-| Client-side preferences (e.g.: font family, chat always visible, show authorship colors, ...). Set in https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_cookie.js#L49[pad_cookie.js#L49]. `prefs` is used if Etherpad is accessed over HTTPS, `prefsHttp` if accessed over HTTP. For more info see https://github.com/ether/etherpad-lite/issues/3179.
+| Client-side preferences (e.g.: font family, chat always visible, show authorship colors, ...). Set in [pad_cookie.js#L49](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad_cookie.js#L49). `prefs` is used if Etherpad is accessed over HTTPS, `prefsHttp` if accessed over HTTP. For more info see https://github.com/ether/etherpad-lite/issues/3179.



@ -50,7 +50,7 @@ Cookies used by Etherpad.
 | 60 days
 | false
 | true
-| A random token representing the author, of the form `t.randomstring_of_lenght_20`. The random string is generated by the client, at https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L55-L66[pad.js#L55-L66]. This cookie is always set by the client at https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L153-L158[pad.js#L153-L158] without any solicitation from the server. It is used for all the pads accessed via the web UI (not used for the HTTP API). On the server side, its value is accessed at https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/db/SecurityManager.js#L33[SecurityManager.js#L33].
+| A random token representing the author, of the form `t.randomstring_of_lenght_20`. The random string is generated by the client, at (https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L55-L66[pad.js#L55-L66]). This cookie is always set by the client (at (https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/static/js/pad.js#L153-L158[pad.js#L153-L158])) without any solicitation from the server. It is used for all the pads accessed via the web UI (not used for the HTTP API). On the server side, its value is accessed at [SecurityManager.js#L33](https://github.com/ether/etherpad-lite/blob/01497aa399690e44393e91c19917d11d025df71b/src/node/db/SecurityManager.js#L33).
 |===

 For more info, visit the related discussion at https://github.com/ether/etherpad-lite/issues/3563.
--- a/doc/docker.adoc
+++ b/doc/docker.adoc
@ -370,10 +370,6 @@ For the editor container, you can also make it full width by adding `full-width-
 | Description
 | Default

-|`COOKIE_KEY_ROTATION_INTERVAL`
-|How often (ms) to rotate in a new secret for signing cookies
-|`86400000` (1 day)
-
 | `COOKIE_SAME_SITE`
 | Value of the SameSite cookie property.
 | `"Lax"`
--- a/doc/localization.adoc
+++ b/doc/localization.adoc
@ -20,13 +20,12 @@ Translations will be send back to us regularly and will eventually appear in the

 [source,json]
 ----
-{ 
-  "pad.modals.connected": "Connecté.",
-  "pad.modals.uderdup": "Ouvrir dans une nouvelle fenêtre.",
-  "pad.toolbar.unindent.title": "Dèsindenter",
-  "pad.toolbar.undo.title": "Annuler (Ctrl-Z)",
-  "timeslider.pageTitle": "{{appTitle}} Curseur temporel",
-  ...
+{ "pad.modals.connected": "Connecté."
+, "pad.modals.uderdup": "Ouvrir dans une nouvelle fenêtre."
+, "pad.toolbar.unindent.title": "Dèsindenter"
+, "pad.toolbar.undo.title": "Annuler (Ctrl-Z)"
+, "timeslider.pageTitle": "{{appTitle}} Curseur temporel",
+, ...
 }
 ----

@ -72,7 +71,7 @@ alert(window._('pad.chat'));
 ----
 ==== 2. Create translate files in the locales directory of your plugin

-* The name of the file must be the language code of the language it contains translations for (see https://joker-x.github.io/languages4translatewiki/test/[supported lang codes]; e.g. en ? English, es ? Spanish...)
+* The name of the file must be the language code of the language it contains translations for (see https://joker-x.github.com/languages4translatewiki/test/[supported lang codes]; e.g. en ? English, es ? Spanish...)
 * The extension of the file must be `.json`
 * The default language is English, so your plugin should always provide `en.json`
 * In order to avoid naming conflicts, your message keys should start with the name of your plugin followed by a dot (see below)
@ -81,8 +80,7 @@ alert(window._('pad.chat'));

 [source, json]
 ----
-{ 
-  "ep_your-plugin.h1": "Heading 1"
+{ "ep_your-plugin.h1": "Heading 1"
 }
 ----

@ -90,8 +88,7 @@ alert(window._('pad.chat'));

 [source, json]
 ----
-{ 
-  "ep_your-plugin.h1": "Título 1"
+{ "ep_your-plugin.h1": "Título 1"
 }
 ----

@ -106,9 +103,8 @@ For example, if you want to replace `Chat` with `Notes`, simply add...

 [source,json]
 ----
-{ 
-  "ep_your-plugin.h1": "Heading 1",
-  "pad.chat": "Notes"
+{ "ep_your-plugin.h1": "Heading 1"
+, "pad.chat": "Notes"
 }
 ----

--- a/doc/plugins.adoc
+++ b/doc/plugins.adoc
@ -64,7 +64,7 @@ translations into `locales/`, though, in order to have them integrated. (See
 Your plugin definition goes into `ep.json`. In this file you register your hook
 functions, indicate the parts of your plugin and the order of execution. (A
 documentation of all available events to hook into can be found in chapter
-<<Server-side hooks>>.)
+[hooks](#all_hooks).)

 [source,json]
 ----
@ -88,7 +88,7 @@ A hook function registration maps a hook name to a hook function specification.
 The hook function specification looks like `ep_example/file.js:functionName`. It
 consists of two parts separated by a colon: a module name to `require()` and the
 name of a function exported by the named module. See
-https://nodejs.org/docs/latest/api/modules.html#modules_module_exports[`module.exports`]
+[`module.exports`](https://nodejs.org/docs/latest/api/modules.html#modules_module_exports)
 for how to export a function.

 For the module name you can omit the `.js` suffix, and if the file is `index.js`
--- a/settings.json.docker
+++ b/settings.json.docker
@ -207,15 +207,15 @@

  "dbType": "${DB_TYPE:dirty}",
  "dbSettings": {
-    "host":       "${DB_HOST:undefined}",
-    "port":       "${DB_PORT:undefined}",
-    "database":   "${DB_NAME:undefined}",
-    "user":       "${DB_USER:undefined}",
-    "password":   "${DB_PASS:undefined}",
-    "charset":    "${DB_CHARSET:undefined}",
-    "filename":   "${DB_FILENAME:var/dirty.db}",
+    "host":     "${DB_HOST:undefined}",
+    "port":     "${DB_PORT:undefined}",
+    "database": "${DB_NAME:undefined}",
+    "user":     "${DB_USER:undefined}",
+    "password": "${DB_PASS:undefined}",
+    "charset":  "${DB_CHARSET:undefined}",
+    "filename": "${DB_FILENAME:var/dirty.db}",
    "collection": "${DB_COLLECTION:undefined}",
-    "url":        "${DB_URL:undefined}"
+    "url":      "${DB_URL:undefined}"
  },

  /*
@ -363,23 +363,6 @@
   * Settings controlling the session cookie issued by Etherpad.
   */
  "cookie": {
-    /*
-     * How often (in milliseconds) the key used to sign the express_sid cookie
-     * should be rotated. Long rotation intervals reduce signature verification
-     * overhead (because there are fewer historical keys to check) and database
-     * load (fewer historical keys to store, and less frequent queries to
-     * get/update the keys). Short rotation intervals are slightly more secure.
-     *
-     * Multiple Etherpad processes sharing the same database (table) is
-     * supported as long as the clock sync error is significantly less than this
-     * value.
-     *
-     * Key rotation can be disabled (not recommended) by setting this to 0 or
-     * null, or by disabling session expiration (see sessionLifetime).
-     */
-    // 86400000 = 1d * 24h/d * 60m/h * 60s/m * 1000ms/s
-    "keyRotationInterval": "${COOKIE_KEY_ROTATION_INTERVAL:86400000}",
-
    /*
     * Value of the SameSite cookie property. "Lax" is recommended unless
     * Etherpad will be embedded in an iframe from another site, in which case
@ -409,8 +392,6 @@
     *     indefinitely without consulting authentication or authorization
     *     hooks, so once a user has accessed a pad, the user can continue to
     *     use the pad until the user leaves for longer than sessionLifetime.
-     *   - More historical keys (sessionLifetime / keyRotationInterval) must be
-     *     checked when verifying signatures.
     *
     * Session lifetime can be set to infinity (not recommended) by setting this
     * to null or 0. Note that if the session does not expire, most browsers
@ -653,10 +634,5 @@
  "customLocaleStrings": {},

  /* Disable Admin UI tests */
-  "enableAdminUITests": false,
-
-  /*
-   * Enable/Disable case-insensitive pad names.
-   */
-  "lowerCasePadIds": "${LOWER_CASE_PAD_IDS:false}"
+  "enableAdminUITests": false
 }
--- a/settings.json.template
+++ b/settings.json.template
@ -364,22 +364,6 @@
   * Settings controlling the session cookie issued by Etherpad.
   */
  "cookie": {
-    /*
-     * How often (in milliseconds) the key used to sign the express_sid cookie
-     * should be rotated. Long rotation intervals reduce signature verification
-     * overhead (because there are fewer historical keys to check) and database
-     * load (fewer historical keys to store, and less frequent queries to
-     * get/update the keys). Short rotation intervals are slightly more secure.
-     *
-     * Multiple Etherpad processes sharing the same database (table) is
-     * supported as long as the clock sync error is significantly less than this
-     * value.
-     *
-     * Key rotation can be disabled (not recommended) by setting this to 0 or
-     * null, or by disabling session expiration (see sessionLifetime).
-     */
-    "keyRotationInterval": 86400000, // = 1d * 24h/d * 60m/h * 60s/m * 1000ms/s
-
    /*
     * Value of the SameSite cookie property. "Lax" is recommended unless
     * Etherpad will be embedded in an iframe from another site, in which case
@ -409,8 +393,6 @@
     *     indefinitely without consulting authentication or authorization
     *     hooks, so once a user has accessed a pad, the user can continue to
     *     use the pad until the user leaves for longer than sessionLifetime.
-     *   - More historical keys (sessionLifetime / keyRotationInterval) must be
-     *     checked when verifying signatures.
     *
     * Session lifetime can be set to infinity (not recommended) by setting this
     * to null or 0. Note that if the session does not expire, most browsers
@ -653,10 +635,5 @@
  "customLocaleStrings": {},

  /* Disable Admin UI tests */
-  "enableAdminUITests": false,
-
-  /*
-   * Enable/Disable case-insensitive pad names.
-   */
-  "lowerCasePadIds": false
+  "enableAdminUITests": false
 }
--- a/src/bin/buildForWindows.sh
+++ b/src/bin/buildForWindows.sh
@ -20,7 +20,7 @@ try cd "${workdir}"
 [ -f src/package.json ] || fatal "failed to cd to etherpad root directory"

 # See https://github.com/msys2/MSYS2-packages/issues/1216
-export MSYSTEM=winsymlinks:lnk
+export MSYS=winsymlinks:lnk

 OUTPUT=${workdir}/etherpad-win.zip

@ -29,12 +29,10 @@ trap 'exit 1' HUP INT TERM
 trap 'log "cleaning up..."; try cd / && try rm -rf "${TMP_FOLDER}"' EXIT

 log "create a clean environment in $TMP_FOLDER..."
-try export GIT_WORK_TREE=${TMP_FOLDER}; git checkout HEAD -f \
+try git archive --format=tar HEAD | (try cd "${TMP_FOLDER}" && try tar xf -) \
    || fatal "failed to copy etherpad to temporary folder"
 try mkdir "${TMP_FOLDER}"/.git
 try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD
-try cp -r ./src/node_modules "${TMP_FOLDER}"/src/node_modules
-
 try cd "${TMP_FOLDER}"
 [ -f src/package.json ] || fatal "failed to copy etherpad to temporary folder"

--- a/src/bin/doc/package-lock.json
+++ b/src/bin/doc/package-lock.json
@ -5,9 +5,9 @@
  "requires": true,
  "dependencies": {
    "marked": {
-      "version": "9.1.4",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.4.tgz",
-      "integrity": "sha512-Mq83CCaClhXqhf8sLQ57c1unNelHEuFadK36ga+GeXR4FeT/5ssaC5PaCRVqMA74VYorzYRqdAaxxteIanh3Kw=="
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-5.1.0.tgz",
+      "integrity": "sha512-z3/nBe7aTI8JDszlYLk7dDVNpngjw0o1ZJtrA9kIfkkHcIF+xH7mO23aISl4WxP83elU+MFROgahqdpd05lMEQ=="
    }
  }
 }
--- a/src/bin/doc/package.json
+++ b/src/bin/doc/package.json
@ -7,7 +7,7 @@
    "node": ">=12.17.0"
  },
  "dependencies": {
-    "marked": "^9.1.4"
+    "marked": "^5.1.0"
  },
  "devDependencies": {},
  "optionalDependencies": {},
--- a/src/bin/importSqlFile.js
+++ b/src/bin/importSqlFile.js
@ -50,7 +50,7 @@ const unescape = (val) => {
  const log4js = require('log4js');
  const readline = require('readline');
  const settings = require('../node/utils/Settings');
-  const ueberDB = require('ueberdb2');
+  const ueberDB = require('ueberdb2-ts');

  const dbWrapperSettings = {
    cache: 0,
--- a/src/bin/installDeps.sh
+++ b/src/bin/installDeps.sh
@ -1,6 +1,5 @@
 #!/bin/sh

-
 # Move to the Etherpad base directory.
 MY_DIR=$(cd "${0%/*}" && pwd -P) || exit 1
 cd "${MY_DIR}/../.." || exit 1
@ -37,22 +36,14 @@ if [ ! -f "$settings" ]; then
  cp settings.json.template "$settings" || exit 1
 fi

-
 log "Installing dependencies..."
-(mkdir -p node_modules &&
-cd node_modules &&
-{ [ -d ep_etherpad-lite ] || ln -sf ../src ep_etherpad-lite; } &&
-cd ep_etherpad-lite)
-
-cd src
-
-if [ -z "${ETHERPAD_PRODUCTION}" ]; then
-  log "Installing dev dependencies"
- npm ci --no-optional --omit=optional --include=dev --lockfile-version 1 || exit 1
-else
-  log "Installing production dependencies"
-  npm ci --no-optional --omit=optional --omit=dev --lockfile-version 1 --production || exit 1
-fi
+(
+  mkdir -p node_modules &&
+  cd node_modules &&
+  { [ -d ep_etherpad-lite ] || ln -sf ../src ep_etherpad-lite; } &&
+  cd ep_etherpad-lite &&
+  npm ci --no-optional --omit=optional --include=dev --lockfile-version 1
+) || exit 1

 # Remove all minified data to force node creating it new
 log "Clearing minified cache..."
--- a/src/bin/installOnWindows.bat
+++ b/src/bin/installOnWindows.bat
@ -14,7 +14,7 @@ cd /D node_modules
 mklink /D "ep_etherpad-lite" "..\src"

 cd /D "ep_etherpad-lite"
-cmd /C npm ci --legacy-peer-deps || exit /B 1
+cmd /C npm ci || exit /B 1

 cd /D "%~dp0\..\.."

--- a/src/bin/migrateDirtyDBtoRealDB.js
+++ b/src/bin/migrateDirtyDBtoRealDB.js
@ -15,7 +15,7 @@ process.on('unhandledRejection', (err) => { throw err; });
  const dirtyDb = require('dirty');
  const log4js = require('log4js');
  const settings = require('../node/utils/Settings');
-  const ueberDB = require('ueberdb2');
+  const ueberDB = require('ueberdb2-ts');
  const util = require('util');

  const dbWrapperSettings = {
--- a/src/bin/release.js
+++ b/src/bin/release.js
@ -9,12 +9,9 @@ const childProcess = require('child_process');
 const log4js = require('log4js');
 const path = require('path');
 const semver = require('semver');
-const {exec} = require('child_process');
+const {exec} = require("child_process");

-log4js.configure({appenders: {console: {type: 'console'}},
-  categories: {
-    default: {appenders: ['console'], level: 'info'},
-  }});
+log4js.replaceConsole();

 /*

@ -81,11 +78,11 @@ const assertUpstreamOk = (branch, opts = {}) => {
 };

 // Check if asciidoctor is installed
-exec('asciidoctor -v', (err, stdout) => {
-  if (err) {
-    console.log('Please install asciidoctor');
-    console.log('https://asciidoctor.org/docs/install-toolchain/');
-    process.exit(1);
+exec('asciidoctor -v', (err,stdout)=>{
+  if (err){
+    console.log('Please install asciidoctor')
+    console.log('https://asciidoctor.org/docs/install-toolchain/')
+    process.exit(1)
  }
 });

@ -185,8 +182,8 @@ try {
  console.log('Updating ether.github.com master branch...');
  run('git pull --ff-only', {cwd: '../ether.github.com/'});
  console.log('Committing documentation...');
-  run(`cp -R out/doc/ ../ether.github.com/public/doc/v'${newVersion}'`);
-  run(`npm version ${newVersion}`, {cwd: '../ether.github.com'});
+  run(`cp -R out/doc/ ../ether.github.com/doc/v'${newVersion}'`);
+  run(`rm -f latest && ln -s 'v${newVersion}' latest`, {cwd: '../ether.github.com/doc/'});
  run('git add .', {cwd: '../ether.github.com/'});
  run(`git commit -m '${newVersion} docs'`, {cwd: '../ether.github.com/'});
 } catch (err) {
@ -206,9 +203,12 @@ console.log('  (cd ../ether.github.com && git show)');
 console.log('If everything looks good then push:');
 console.log(`  git push origin master develop '${newVersion}'`);
 console.log('  (cd ../ether.github.com && git push)');
-console.log('Creating a Windows build is not necessary anymore and will be created by GitHub action');
+console.log('Create a Windows build:');
+console.log('  bin/buildForWindows.sh');
 console.log('Visit https://github.com/ether/etherpad-lite/releases/new and create a new release ' +
-            `with 'master' as the target and the version is ${newVersion}. `);
-console.log('The docs are updated automatically with the new version. While the windows build' +
-    ' is generated people can still download the older versions.');
+            `with 'master' as the target and the version is ${newVersion}.  Include the windows ` +
+            'zip as an asset');
+console.log('Once the new docs are uploaded then modify the download links (replace ' +
+            `${currentVersion} with ${newVersion} on etherpad.org and then pull master onto ` +
+            'develop)');
 console.log('Finally go public with an announcement via our comms channels :)');
--- a/src/locales/ast.json
+++ b/src/locales/ast.json
@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Xuacu",
-			"YoaR"
+			"Xuacu"
 		]
 	},
 	"index.newPad": "Nuevu bloc",
@ -26,9 +25,9 @@
 	"pad.toolbar.embed.title": "Compartir ya incrustar esti bloc",
 	"pad.toolbar.showusers.title": "Amosar los usuarios d'esti bloc",
 	"pad.colorpicker.save": "Guardar",
-	"pad.colorpicker.cancel": "Zarrar",
+	"pad.colorpicker.cancel": "Encaboxar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies  nun se guarden ente visites. Esto pue debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que l'iFrame padre",
+	"pad.noCookie": "Nun pudo alcontrase la cookie. ¡Por favor, permite les cookies nel navegador! La sesión y preferencies  nun se guarden ente visites. Esto pué debese a qu'Etherpad inclúyese nun iFrame en dalgunos restoladores. Asegúrate de qu'Etherpad tea nel mesmu subdominiu/dominiu que la iFrame padre",
 	"pad.permissionDenied": "Nun tienes permisu pa entrar a esti bloc",
 	"pad.settings.padSettings": "Configuración del bloc",
 	"pad.settings.myView": "la mio vista",
@ -57,7 +56,7 @@
 	"pad.modals.reconnecting": "Reconeutando col to bloc...",
 	"pad.modals.forcereconnect": "Forzar la reconexón",
 	"pad.modals.reconnecttimer": "Tentando reconeutar en",
-	"pad.modals.cancel": "Zarrar",
+	"pad.modals.cancel": "Encaboxar",
 	"pad.modals.userdup": "Abiertu n'otra ventana",
 	"pad.modals.userdup.explanation": "Esti bloc paez que ta abiertu en más d'una ventana del navegador d'esti ordenador.",
 	"pad.modals.userdup.advice": "Reconeutar pa usar esta ventana.",
--- a/src/locales/bcc.json
+++ b/src/locales/bcc.json
@ -2,29 +2,13 @@
 	"@metadata": {
 		"authors": [
 			"Baloch Afghanistan",
-			"Moshtank",
 			"Sultanselim baloch"
 		]
 	},
-	"admin.page-title": "کارمسترءِ کُرسی - اترپَد",
-	"admin_plugins": "گݔشانکانءِ کار ءُ بار",
-	"admin_plugins.available": "دسترسݔن گݔشانک",
-	"admin_plugins.available_not-found": "گݔشانکے نݔست اَت۔",
-	"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": "گݔشانکءِ کارمستری - اترپد",
-	"admin_plugins.version": "ورژن",
 	"index.newPad": "دفترچه یادداشت تازه",
 	"index.createOpenPad": "یا ایجاد/بازکردن یک دفترچه یادداشت با نام:",
 	"pad.toolbar.bold.title": "پررنگ (Ctrl-B)",
-	"pad.toolbar.italic.title": "کَش (Ctrl-I)",
+	"pad.toolbar.italic.title": "کج (Ctrl-I)",
 	"pad.toolbar.underline.title": "زیرخط (Ctrl-U)",
 	"pad.toolbar.strikethrough.title": "خط خورده",
 	"pad.toolbar.ol.title": "فهرست مرتب شده",
@ -37,12 +21,12 @@
 	"pad.toolbar.import_export.title": "درون‌ریزی/برون‌ریزی از/به قالب‌های مختلف",
 	"pad.toolbar.timeslider.title": "لغزندهٔ زمان",
 	"pad.toolbar.savedRevision.title": "ذخیره‌سازی نسخه",
-	"pad.toolbar.settings.title": "ردانکان",
+	"pad.toolbar.settings.title": "تنظیمات",
 	"pad.toolbar.embed.title": "اشتراک و جاسازی این دفترچه یادداشت",
 	"pad.toolbar.showusers.title": "نمایش کاربران در این دفترچه یادداشت",
-	"pad.colorpicker.save": "سَپت",
-	"pad.colorpicker.cancel": "بجَگ",
-	"pad.loading": "بییگئن...",
+	"pad.colorpicker.save": "زاپاس کورتین",
+	"pad.colorpicker.cancel": "کنسیل",
+	"pad.loading": "...بار بیت",
 	"pad.permissionDenied": "شرمنده، شما را اجازت په دسترسی ای صفحه نیست.",
 	"pad.settings.padSettings": "تنظیمات دفترچه یادداشت",
 	"pad.settings.myView": "منی سۏج",
@ -55,7 +39,7 @@
 	"pad.settings.language": "زبان:",
 	"pad.importExport.import_export": "درون‌ریزی/برون‌ریزی",
 	"pad.importExport.import": "بارگذاری پرونده‌ی متنی یا سند",
-	"pad.importExport.importSuccessful": "سۏبݔن بیت!",
+	"pad.importExport.importSuccessful": "موفقیت آمیز بود!",
 	"pad.importExport.export": "برون‌ریزی این دفترچه یادداشت با قالب:",
 	"pad.importExport.exporthtml": "HTML",
 	"pad.importExport.exportplain": "سادگین متن",
@ -82,21 +66,21 @@
 	"pad.modals.badChangeset.cause": "این می‌تواند به دلیل پیکربندی اشتباه یا سایر رفتارهای غیرمنتظره باشد. اگر فکر می‌کنید این یک خطا است لطفاً با مدیر خدمت تماس بگیرید. برای ادامهٔ ویرایش سعی کنید که دوباره متصل شوید.",
 	"pad.modals.corruptPad.explanation": "پدی که شما سعی دارید دسترسی پیدا کنید خراب است.",
 	"pad.modals.corruptPad.cause": "این احتمالاً به دلیل تنظیمات اشتباه کارساز یا سایر رفتارهای غیرمنتظره است. لطفاً با مدیر خدمت تماس حاصل کنید.",
-	"pad.modals.deleted": "گار بیت۔",
-	"pad.modals.deleted.explanation": "اے یادداشت پاک کنگ بیتگ۔",
+	"pad.modals.deleted": "پاک کورتین",
+	"pad.modals.deleted.explanation": "این دفترچه یادداشت پاک شده‌است.",
 	"pad.modals.disconnected": "شمئی سکّی کھت اِنت۔",
 	"pad.modals.disconnected.explanation": "اتصال به سرور قطع شده‌است.",
 	"pad.modals.disconnected.cause": "ممکن است سرور در دسترس نباشد. اگر این مشکل باز هم رخ داد مدیر حدمت را آگاه کنید.",
 	"pad.share": "به اشتراک‌گذاری این دفترچه یادداشت",
 	"pad.share.readonly": "فقط خواندنی",
-	"pad.share.link": "لینک",
+	"pad.share.link": "پیوند",
 	"pad.share.emebdcode": "جاسازی نشانی",
 	"pad.chat": "گفتگو",
 	"pad.chat.title": "بازکردن گفتگو برای این دفترچه یادداشت",
 	"pad.chat.loadmessages": "گݔشترݔں پیگامء چارگ",
 	"timeslider.pageTitle": "لغزندهٔ زمان {{appTitle}}",
-	"timeslider.toolbar.returnbutton": "چَھر کنگ پہ یاددپترا",
-	"timeslider.toolbar.authors": "لککۏک:",
+	"timeslider.toolbar.returnbutton": "بازگشت به دفترچه یادداشت",
+	"timeslider.toolbar.authors": "نویسوک:",
 	"timeslider.toolbar.authorsList": "بدون نویسنده",
 	"timeslider.toolbar.exportlink.title": "درگیزگ",
 	"timeslider.exportCurrent": "برون‌ریزی نگارش کنونی به عنوان:",
--- a/src/locales/da.json
+++ b/src/locales/da.json
@ -4,29 +4,13 @@
 			"Christian List",
 			"Joedalton",
 			"Peter Alberti",
-			"Peterleth",
 			"Saederup92",
 			"Steenth"
 		]
 	},
-	"admin.page-title": "Admin Dashboard - Etherpad",
-	"admin_plugins": "Plugin manager",
-	"admin_plugins.available": "Tilgængelige Plugins",
-	"admin_plugins.available_not-found": "Ingen plugins fundet.",
 	"admin_plugins.available_fetching": "Henter...",
-	"admin_plugins.available_install.value": "Installer",
-	"admin_plugins.available_search.placeholder": "Søg efter plugins der kan installeres",
 	"admin_plugins.description": "Beskrivelse",
-	"admin_plugins.installed": "Installerede plugins",
-	"admin_plugins.installed_fetching": "Henter installerede plugins...",
-	"admin_plugins.installed_nothing": "Du har ikke installeret nogen plugins endnu.",
-	"admin_plugins.installed_uninstall.value": "Afinstaller",
-	"admin_plugins.last-update": "Sidst opdateret",
 	"admin_plugins.name": "Navn",
-	"admin_plugins.page-title": "Plugin manager - Etherpad",
-	"admin_plugins.version": "Version",
-	"admin_plugins_info": "Fejlfindingsoplysninger",
-	"admin_plugins_info.hooks": "Installerede hooks",
 	"admin_settings": "Indstillinger",
 	"index.newPad": "Ny Pad",
 	"index.createOpenPad": "eller opret/åbn en Pad med navnet:",
--- a/src/locales/de.json
+++ b/src/locales/de.json
@ -9,7 +9,6 @@
 			"Mklehr",
 			"Nipsky",
 			"Predatorix",
-			"SamTV",
 			"Sebastian Wallroth",
 			"Thargon",
 			"Tim.krieger",
@ -18,7 +17,7 @@
 		]
 	},
 	"admin.page-title": "Admin Dashboard - Etherpad",
-	"admin_plugins": "Pluginverwaltung",
+	"admin_plugins": "Plugins verwalten",
 	"admin_plugins.available": "Verfügbare Plugins",
 	"admin_plugins.available_not-found": "Keine Plugins gefunden.",
 	"admin_plugins.available_fetching": "Wird abgerufen...",
@ -41,12 +40,12 @@
 	"admin_plugins_info.plugins": "Installierte Plugins",
 	"admin_plugins_info.page-title": "Plugin Informationen - Etherpad",
 	"admin_plugins_info.version": "Etherpad Version",
-	"admin_plugins_info.version_latest": "Neueste verfügbare Version",
+	"admin_plugins_info.version_latest": "Neueste Version",
 	"admin_plugins_info.version_number": "Versionsnummer",
 	"admin_settings": "Einstellungen",
 	"admin_settings.current": "Derzeitige Konfiguration",
 	"admin_settings.current_example-devel": "Beispielhafte Entwicklungseinstellungs-Templates",
-	"admin_settings.current_example-prod": "Beispiel eines produktiven Templates",
+	"admin_settings.current_example-prod": "Beispiel einer Vorlage für Produktionseinstellungen",
 	"admin_settings.current_restart.value": "Etherpad neustarten",
 	"admin_settings.current_save.value": "Einstellungen speichern",
 	"admin_settings.page-title": "Einstellungen - Etherpad",
@ -72,9 +71,9 @@
 	"pad.toolbar.showusers.title": "Benutzer dieses Pads anzeigen",
 	"pad.colorpicker.save": "Speichern",
 	"pad.colorpicker.cancel": "Abbrechen",
-	"pad.loading": "Laden …",
+	"pad.loading": "Lade …",
 	"pad.noCookie": "Das Cookie konnte nicht gefunden werden. Bitte erlaube Cookies in deinem Browser! Deine Sitzung und Einstellungen werden zwischen den Besuchen nicht gespeichert.  Dies kann darauf zurückzuführen sein, dass Etherpad in einigen Browsern in einem iFrame enthalten ist.  Bitte stelle sicher, dass sich Etherpad auf der gleichen Subdomain/Domain wie der übergeordnete iFrame befindet.",
-	"pad.permissionDenied": "Du hast keine Berechtigung, um auf dieses Pad zuzugreifen.",
+	"pad.permissionDenied": "Du hast keine Berechtigung, um auf dieses Pad zuzugreifen",
 	"pad.settings.padSettings": "Pad-Einstellungen",
 	"pad.settings.myView": "Eigene Ansicht",
 	"pad.settings.stickychat": "Unterhaltung immer anzeigen",
@ -86,7 +85,7 @@
 	"pad.settings.fontType.normal": "Normal",
 	"pad.settings.language": "Sprache:",
 	"pad.settings.about": "Über",
-	"pad.settings.poweredBy": "Betrieben von",
+	"pad.settings.poweredBy": "Powered by",
 	"pad.importExport.import_export": "Import/Export",
 	"pad.importExport.import": "Textdatei oder Dokument hochladen",
 	"pad.importExport.importSuccessful": "Erfolgreich!",
@ -121,7 +120,7 @@
 	"pad.modals.corruptPad.cause": "Dies könnte an einer falschen Serverkonfiguration oder einem anderen unerwarteten Verhalten liegen. Bitte kontaktiere den Administrator dieses Dienstes.",
 	"pad.modals.deleted": "Gelöscht.",
 	"pad.modals.deleted.explanation": "Dieses Pad wurde entfernt.",
-	"pad.modals.rateLimited": "Durchsatzratenbegrenzt",
+	"pad.modals.rateLimited": "Begrenzte Rate.",
 	"pad.modals.rateLimited.explanation": "Sie haben zu viele Nachrichten an dieses Pad gesendet, so dass die Verbindung unterbrochen wurde.",
 	"pad.modals.rejected.explanation": "Der Server hat eine Nachricht abgelehnt, die von deinem Browser gesendet wurde.",
 	"pad.modals.rejected.cause": "Möglicherweise wurde der Server aktualisiert, während du das Pad angesehen hast, oder es existiert ein Fehler in Etherpad. Versuche, die Seite neu zu laden.",
@ -141,7 +140,7 @@
 	"timeslider.pageTitle": "{{appTitle}} Bearbeitungsverlauf",
 	"timeslider.toolbar.returnbutton": "Zurück zum Pad",
 	"timeslider.toolbar.authors": "Autoren:",
-	"timeslider.toolbar.authorsList": "Keine Autoren",
+	"timeslider.toolbar.authorsList": "keine Autoren",
 	"timeslider.toolbar.exportlink.title": "Diese Version exportieren",
 	"timeslider.exportCurrent": "Exportiere diese Version als:",
 	"timeslider.version": "Version {{version}}",
@ -164,7 +163,7 @@
 	"timeslider.month.december": "Dezember",
 	"timeslider.unnamedauthors": "{{num}} {[plural(num) one: unbenannter Autor, other: unbenannte Autoren ]}",
 	"pad.savedrevs.marked": "Diese Version wurde jetzt als gespeicherte Version gekennzeichnet",
-	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch den Aufruf des Bearbeitungsverlaufs ansehen.",
+	"pad.savedrevs.timeslider": "Du kannst gespeicherte Versionen durch den Aufruf des Bearbeitungsverlaufes ansehen.",
 	"pad.userlist.entername": "Dein Name?",
 	"pad.userlist.unnamed": "unbenannt",
 	"pad.editbar.clearcolors": "Autorenfarben im gesamten Dokument zurücksetzen? Dies kann nicht rückgängig gemacht werden",
--- a/src/locales/es.json
+++ b/src/locales/es.json
@ -2,7 +2,6 @@
 	"@metadata": {
 		"authors": [
 			"Armando-Martin",
-			"Atzerritik",
 			"DDPAT",
 			"Dgstranz",
 			"Fitoschido",
@ -75,7 +74,7 @@
 	"pad.colorpicker.save": "Guardar",
 	"pad.colorpicker.cancel": "Cancelar",
 	"pad.loading": "Cargando...",
-	"pad.noCookie": "No se pudo encontrar la galleta. ¡Por favor, permita las cookies en su navegador! Su sesión y configuración no se guardarán entre las visitas. Esto puede deberse a que Etherpad está incluido en un iFrame en algunos navegadores. Por favor asegúrese de que Etherpad está en el mismo subdominio/dominio que el iFrame padre",
+	"pad.noCookie": "No se pudo encontrar la «cookie». Permite la utilización de «cookies» en el navegador.",
 	"pad.permissionDenied": "No tienes permiso para acceder a este pad",
 	"pad.settings.padSettings": "Configuración del pad",
 	"pad.settings.myView": "Preferencias personales",
@ -99,7 +98,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Solo se puede importar desde texto plano o formatos HTML. Para obtener funciones de importación más avanzadas, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instale AbiWord o LibreOffice</a>.",
+	"pad.importExport.abiword.innerHTML": "Solo es posible importar texto sin formato o en HTML. Para obtener funciones de importación más avanzadas es necesario <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instalar AbiWord</a>.",
 	"pad.modals.connected": "Conectado.",
 	"pad.modals.reconnecting": "Reconectando a tu pad...",
 	"pad.modals.forcereconnect": "Forzar reconexión",
--- a/src/locales/eu.json
+++ b/src/locales/eu.json
@ -10,7 +10,7 @@
 			"Xabier Armendaritz"
 		]
 	},
-	"admin.page-title": "Kudeaketa panela - Etherpad",
+	"admin.page-title": "Admin Aginte-panela - Etherpad",
 	"admin_plugins": "Plugin-en kudeaketa",
 	"admin_plugins.available": "Eskuragarri dauden plugin-ak",
 	"admin_plugins.available_not-found": "Ez da plugin-ik aurkitu",
--- a/src/locales/lt.json
+++ b/src/locales/lt.json
@ -16,33 +16,8 @@
 	"admin_plugins.available_not-found": "Įskiepių nerasta.",
 	"admin_plugins.available_fetching": "Gaunama…",
 	"admin_plugins.available_install.value": "Įdiegti",
-	"admin_plugins.available_search.placeholder": "Ieškokite įskiepių įdiegimui",
-	"admin_plugins.description": "Aprašymas",
-	"admin_plugins.installed": "Įdiegti įskiepiai",
-	"admin_plugins.installed_fetching": "Gaunami įdiegti papildiniai…",
-	"admin_plugins.installed_nothing": "Dar neįdiegėte jokių papildinių.",
-	"admin_plugins.installed_uninstall.value": "Išinstaluoti",
-	"admin_plugins.last-update": "Paskutinis atnaujinimas",
-	"admin_plugins.name": "Pavadinimas",
-	"admin_plugins.page-title": "Papildinių tvarkyklė – Etherpad",
-	"admin_plugins.version": "Versija",
-	"admin_plugins_info": "Trikčių šalinimo informacija",
-	"admin_plugins_info.parts": "Įdiegtos dalys",
-	"admin_plugins_info.plugins": "Įdiegti papildiniai",
-	"admin_plugins_info.page-title": "Papildinio informacija – Etherpad",
-	"admin_plugins_info.version": "Etherpad versija",
-	"admin_plugins_info.version_latest": "Naujausia prieinama versija",
-	"admin_plugins_info.version_number": "Versijos numeris",
-	"admin_settings": "Nustatymai",
-	"admin_settings.current": "Dabartinė konfigūracija",
-	"admin_settings.current_example-devel": "Kūrimo nustatymų šablono pavyzdys",
-	"admin_settings.current_example-prod": "Gamybos nustatymų šablono pavyzdys",
-	"admin_settings.current_restart.value": "Iš naujo paleisti Etherpad",
-	"admin_settings.current_save.value": "Išsaugoti nustatymus",
-	"admin_settings.page-title": "Nustatymai – Etherpad",
 	"index.newPad": "Naujas bloknotas",
 	"index.createOpenPad": "arba sukurkite/atidarykite Bloknotą su pavadinimu:",
-	"index.openPad": "atidaryti egzistuojantį bloknotą su pavadinimu:",
 	"pad.toolbar.bold.title": "Paryškintasis (Ctrl-B)",
 	"pad.toolbar.italic.title": "Pasvirasis (Ctrl-I)",
 	"pad.toolbar.underline.title": "Pabraukimas (Ctrl-U)",
@ -75,8 +50,6 @@
 	"pad.settings.fontType": "Šrifto tipas:",
 	"pad.settings.fontType.normal": "Normalus",
 	"pad.settings.language": "Kalba:",
-	"pad.settings.about": "Apie",
-	"pad.settings.poweredBy": "Palaiko",
 	"pad.importExport.import_export": "Importuoti/Eksportuoti",
 	"pad.importExport.import": "Įkelkite bet kokį tekstinį failą arba dokumentą",
 	"pad.importExport.importSuccessful": "Pavyko!",
@ -87,9 +60,9 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Atvirasis dokumento formatas)",
-	"pad.importExport.abiword.innerHTML": "Galite importuoti tik iš paprasto teksto ar HTML formatų. Dėl išplėstinių importavimo funkcijų prašome <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">įdiegti AbiWord ar LibreOffice</a>.",
+	"pad.importExport.abiword.innerHTML": "Galite importuoti tik iš paprasto teksto ar HTML formato. Dėl išplėstinių importavimo funkcijų prašome <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">įdiegti AbiWord</a>.",
 	"pad.modals.connected": "Prisijungta.",
-	"pad.modals.reconnecting": "Iš naujo prisijungiama prie jūsų bloknoto…",
+	"pad.modals.reconnecting": "Iš naujo prisijungiama prie Jūsų bloknoto",
 	"pad.modals.forcereconnect": "Priversti prisijungti iš naujo",
 	"pad.modals.reconnecttimer": "Bandoma vėl prisijungti",
 	"pad.modals.cancel": "Atšaukti",
@ -111,9 +84,6 @@
 	"pad.modals.corruptPad.cause": "Tai gali nutikti dėl neteisingos serverio konfigūracijos ar kitos netikėtos elgsenos. Prašome susisiekti su paslaugos administratoriumi.",
 	"pad.modals.deleted": "Ištrintas.",
 	"pad.modals.deleted.explanation": "Bloknotas buvo pašalintas.",
-	"pad.modals.rateLimited.explanation": "Išsiuntėte per daug pranešimų į šį bloknotą, todėl jis atjungė jus.",
-	"pad.modals.rejected.explanation": "Serveris atmetė jūsų naršyklės išsiųstą pranešimą.",
-	"pad.modals.rejected.cause": "Gali būti, kad serveris buvo atnaujintas jums peržiūrint bloknotą, o gal tai Etherpad klaida. Pabandykite iš naujo įkelti puslapį.",
 	"pad.modals.disconnected": "Jūs atsijungėte.",
 	"pad.modals.disconnected.explanation": "Ryšys su serveriu nutrūko",
 	"pad.modals.disconnected.cause": "Gali būti, kad serveris yra nepasiekiamas. Prašome informuoti paslaugos administratorių jei tai tęsiasi.",
@ -126,7 +96,6 @@
 	"pad.chat.loadmessages": "Įkrauti daugiau pranešimų",
 	"pad.chat.stick.title": "Priklijuoti pokalbį",
 	"pad.chat.writeMessage.placeholder": "Rašykite savo žinutę čia",
-	"timeslider.followContents": "Sekite bloknoto turinio atnaujinimus",
 	"timeslider.pageTitle": "{{appTitle}} Laiko slinkiklis",
 	"timeslider.toolbar.returnbutton": "Grįžti į bloknotą",
 	"timeslider.toolbar.authors": "Autoriai:",
@ -156,7 +125,7 @@
 	"pad.savedrevs.timeslider": "Galite peržiūrėti išsaugotas peržiūras apsilankydami laiko slinkiklyje",
 	"pad.userlist.entername": "Įveskite savo vardą",
 	"pad.userlist.unnamed": "bevardis",
-	"pad.editbar.clearcolors": "Išvalyti autorystės spalvas visame dokumente? To negalima atšaukti",
+	"pad.editbar.clearcolors": "Išvalyti autorystės spalvas visame dokumente?",
 	"pad.impexp.importbutton": "Importuoti dabar",
 	"pad.impexp.importing": "Importuojama...",
 	"pad.impexp.confirmimport": "Failo importavimas pakeis dabartinį bloknoto tekstą. Ar tikrai norite tęsti?",
@ -165,6 +134,5 @@
 	"pad.impexp.uploadFailed": "Įkėlimas nepavyko, bandykite dar kartą",
 	"pad.impexp.importfailed": "Importuoti nepavyko",
 	"pad.impexp.copypaste": "Prašome nukopijuoti ir įklijuoti",
-	"pad.impexp.exportdisabled": "Eksportavimas {{type}} formatu yra išjungtas. Prašome susisiekti su savo sistemos administratoriumi dėl informacijos.",
-	"pad.impexp.maxFileSize": "Failas per didelis. Susisiekite su svetainės administratoriumi, kad padidintų leistiną importuoti failo dydį"
+	"pad.impexp.exportdisabled": "Eksportavimas {{type}} formatu yra išjungtas. Prašome susisiekti su savo sistemos administratoriumi dėl informacijos."
 }
--- a/src/locales/sc.json
+++ b/src/locales/sc.json
@ -68,7 +68,7 @@
 	"pad.settings.chatandusers": "Ammustra sa tzarrada e is utentes",
 	"pad.settings.colorcheck": "Colores de autoria",
 	"pad.settings.linenocheck": "Nùmeros de lìnia",
-	"pad.settings.rtlcheck": "Boles lèghere su cuntenutu dae dereta a manca?",
+	"pad.settings.rtlcheck": "Cuntenutu dae manca a dereta",
 	"pad.settings.fontType": "Tipu de caràtere:",
 	"pad.settings.fontType.normal": "Normale",
 	"pad.settings.language": "Lìngua:",
--- a/src/locales/sco.json
+++ b/src/locales/sco.json
@ -2,7 +2,6 @@
 	"@metadata": {
 		"authors": [
 			"AmaryllisGardener",
-			"CiphriusKane",
 			"John Reid",
 			"Nintendofan885"
 		]
@ -51,7 +50,7 @@
 	"pad.importExport.exportword": "Microsoft Word",
 	"pad.importExport.exportpdf": "PDF",
 	"pad.importExport.exportopen": "ODF (Open Document Format)",
-	"pad.importExport.abiword.innerHTML": "Ye can anely import fae plain tex or HTML formats. Fur mair advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
+	"pad.importExport.abiword.innerHTML": "Ye can yinly import fae plain tex or HTML formats. Fer mair advanced import features please <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">install abiword</a>.",
 	"pad.modals.connected": "Connected.",
 	"pad.modals.reconnecting": "Reconnectin til yer pad..",
 	"pad.modals.forcereconnect": "Force reconnect",
@ -77,7 +76,7 @@
 	"pad.modals.disconnected.explanation": "The connection til the server wis loast",
 	"pad.modals.disconnected.cause": "The server micht be onavailable. Please notify the service admeenistrater gif this continues tae happen.",
 	"pad.share": "Share this pad",
-	"pad.share.readonly": "Read anely",
+	"pad.share.readonly": "Read yinly",
 	"pad.share.link": "Airtin",
 	"pad.share.emebdcode": "Embed URL",
 	"pad.chat": "Chait",
--- a/src/locales/zh-hant.json
+++ b/src/locales/zh-hant.json
@ -9,8 +9,7 @@
 			"Shangkuanlc",
 			"Shirayuki",
 			"Simon Shek",
-			"Wehwei",
-			"Winston Sung"
+			"Wehwei"
 		]
 	},
 	"admin.page-title": "管理員面板 - Etherpad",
@ -135,7 +134,7 @@
 	"pad.chat.writeMessage.placeholder": "在此編寫您的訊息",
 	"timeslider.followContents": "關注記事本內容更新",
 	"timeslider.pageTitle": "{{appTitle}}時間軸",
-	"timeslider.toolbar.returnbutton": "返回記事本",
+	"timeslider.toolbar.returnbutton": "返回到記事本",
 	"timeslider.toolbar.authors": "協作者：",
 	"timeslider.toolbar.authorsList": "無協作者",
 	"timeslider.toolbar.exportlink.title": "匯出",
--- a/src/node/db/API.js
+++ b/src/node/db/API.js
@ -33,7 +33,7 @@ const exportTxt = require('../utils/ExportTxt');
 const importHtml = require('../utils/ImportHtml');
 const cleanText = require('./Pad').cleanText;
 const PadDiff = require('../utils/padDiff');
-const {checkValidRev, isInt} = require('../utils/checkValidRev');
+const { checkValidRev, isInt } = require('../utils/checkValidRev');

 /* ********************
 * GROUP FUNCTIONS ****
@ -193,13 +193,6 @@ Example returns:
 {code: 1, message:"padID does not exist", data: null}
 {code: 1, message:"text too long", data: null}
 */
-/**
- *
- * @param {String} padID the id of the pad
- * @param {String} text the text of the pad
- * @param {String} authorId the id of the author, defaulting to empty string
- * @returns {Promise<void>}
- */
 exports.setText = async (padID, text, authorId = '') => {
  // text is required
  if (typeof text !== 'string') {
@ -221,10 +214,7 @@ Example returns:
 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
 {code: 1, message:"text too long", data: null}
- @param {String} padID the id of the pad
- @param {String} text the text of the pad
- @param {String} authorId the id of the author, defaulting to empty string
- */
+*/
 exports.appendText = async (padID, text, authorId = '') => {
  // text is required
  if (typeof text !== 'string') {
@ -243,9 +233,6 @@ Example returns:

 {code: 0, message:"ok", data: {text:"Welcome <strong>Text</strong>"}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
- @param {String} rev the revision number, defaulting to the latest revision
- @return {Promise<{html: string}>} the html of the pad
 */
 exports.getHTML = async (padID, rev) => {
  if (rev !== undefined) {
@ -278,10 +265,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
-
- @param {String} padID the id of the pad
- @param {String} html the html of the pad
- @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.setHTML = async (padID, html, authorId = '') => {
  // html string is required
@ -320,9 +303,6 @@ Example returns:
 {code: 1, message:"start is higher or equal to the current chatHead", data: null}

 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
- @param {Number} start the start point of the chat-history
- @param {Number} end the end point of the chat-history
 */
 exports.getChatHistory = async (padID, start, end) => {
  if (start && end) {
@ -369,10 +349,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
- @param {String} text the text of the chat-message
- @param {String} authorID the id of the author
- @param {Number} time the timestamp of the chat-message
 */
 exports.appendChatMessage = async (padID, text, authorID, time) => {
  // text is required
@ -402,7 +378,6 @@ Example returns:

 {code: 0, message:"ok", data: {revisions: 56}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
 */
 exports.getRevisionsCount = async (padID) => {
  // get the pad
@ -417,7 +392,6 @@ Example returns:

 {code: 0, message:"ok", data: {savedRevisions: 42}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
 */
 exports.getSavedRevisionsCount = async (padID) => {
  // get the pad
@ -432,7 +406,6 @@ Example returns:

 {code: 0, message:"ok", data: {savedRevisions: [2, 42, 1337]}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
 */
 exports.listSavedRevisions = async (padID) => {
  // get the pad
@ -447,8 +420,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
-    @param {String} padID the id of the pad
-     @param {Number} rev the revision number, defaulting to the latest revision
 */
 exports.saveRevision = async (padID, rev) => {
  // check if rev is a number
@ -480,8 +451,6 @@ Example returns:

 {code: 0, message:"ok", data: {lastEdited: 1340815946602}}
 {code: 1, message:"padID does not exist", data: null}
-    @param {String} padID the id of the pad
- @return {Promise<{lastEdited: number}>} the timestamp of the last revision of the pad
 */
 exports.getLastEdited = async (padID) => {
  // get the pad
@ -497,9 +466,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"pad does already exist", data: null}
- @param {String} padName the name of the new pad
-    @param {String} text the initial text of the pad
-     @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.createPad = async (padID, text, authorId = '') => {
  if (padID) {
@ -525,7 +491,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
 */
 exports.deletePad = async (padID) => {
  const pad = await getPadSafe(padID, true);
@ -539,9 +504,6 @@ exports.deletePad = async (padID) => {

 {code:0, message:"ok", data:null}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
- @param {Number} rev the revision number, defaulting to the latest revision
- @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.restoreRevision = async (padID, rev, authorId = '') => {
  // check if rev is a number
@ -606,9 +568,6 @@ Example returns:

 {code: 0, message:"ok", data: {padID: destinationID}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} sourceID the id of the source pad
- @param {String} destinationID the id of the destination pad
- @param {Boolean} force whether to overwrite the destination pad if it exists
 */
 exports.copyPad = async (sourceID, destinationID, force) => {
  const pad = await getPadSafe(sourceID, true);
@ -623,10 +582,6 @@ Example returns:

 {code: 0, message:"ok", data: {padID: destinationID}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} sourceID the id of the source pad
- @param {String} destinationID the id of the destination pad
- @param {Boolean} force whether to overwrite the destination pad if it exists
- @param {String} authorId the id of the author, defaulting to empty string
 */
 exports.copyPadWithoutHistory = async (sourceID, destinationID, force, authorId = '') => {
  const pad = await getPadSafe(sourceID, true);
@ -641,9 +596,6 @@ Example returns:

 {code: 0, message:"ok", data: {padID: destinationID}}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} sourceID the id of the source pad
- @param {String} destinationID the id of the destination pad
- @param {Boolean} force whether to overwrite the destination pad if it exists
 */
 exports.movePad = async (sourceID, destinationID, force) => {
  const pad = await getPadSafe(sourceID, true);
@ -658,7 +610,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
- @param {String} padID the id of the pad
 */
 exports.getReadOnlyID = async (padID) => {
  // we don't need the pad object, but this function does all the security stuff for us
@ -677,7 +628,6 @@ Example returns:

 {code: 0, message:"ok", data: {padID: padID}}
 {code: 1, message:"padID does not exist", data: null}
-    @param {String} roID the readonly id of the pad
 */
 exports.getPadID = async (roID) => {
  // get the PadId
@ -696,8 +646,6 @@ Example returns:

 {code: 0, message:"ok", data: null}
 {code: 1, message:"padID does not exist", data: null}
-    @param {String} padID the id of the pad
-     @param {Boolean} publicStatus the public status of the pad
 */
 exports.setPublicStatus = async (padID, publicStatus) => {
  // ensure this is a group pad
@ -721,7 +669,6 @@ Example returns:

 {code: 0, message:"ok", data: {publicStatus: true}}
 {code: 1, message:"padID does not exist", data: null}
-     @param {String} padID the id of the pad
 */
 exports.getPublicStatus = async (padID) => {
  // ensure this is a group pad
@ -739,7 +686,6 @@ Example returns:

 {code: 0, message:"ok", data: {authorIDs : ["a.s8oes9dhwrvt0zif", "a.akf8finncvomlqva"]}
 {code: 1, message:"padID does not exist", data: null}
-     @param {String} padID the id of the pad
 */
 exports.listAuthorsOfPad = async (padID) => {
  // get the pad
@ -769,8 +715,6 @@ Example returns:

 {code: 0, message:"ok"}
 {code: 1, message:"padID does not exist"}
-     @param {String} padID the id of the pad
-     @param {String} msg the message to send
 */

 exports.sendClientsMessage = async (padID, msg) => {
@ -796,8 +740,6 @@ Example returns:

 {code: 0, message:"ok", data: {chatHead: 42}}
 {code: 1, message:"padID does not exist", data: null}
-     @param {String} padID the id of the pad
-     @return {Promise<{chatHead: number}>} the chatHead of the pad
 */
 exports.getChatHead = async (padID) => {
  // get the pad
@ -821,9 +763,7 @@ Example returns:
  }
 }
 {"code":4,"message":"no or wrong API Key","data":null}
-  @param {String} padID the id of the pad
- @param {Number} startRev the start revision number
- @param {Number} endRev the end revision number
+
 */
 exports.createDiffHTML = async (padID, startRev, endRev) => {
  // check if startRev is a number
@ -839,9 +779,11 @@ exports.createDiffHTML = async (padID, startRev, endRev) => {
  // get the pad
  const pad = await getPadSafe(padID, true);
  const headRev = pad.getHeadRevisionNumber();
-  if (startRev > headRev) startRev = headRev;
+  if (startRev > headRev)
+    startRev = headRev;

-  if (endRev > headRev) endRev = headRev;
+  if (endRev > headRev)
+    endRev = headRev;

  let padDiff;
  try {
@ -868,6 +810,7 @@ exports.createDiffHTML = async (padID, startRev, endRev) => {
 {"code":0,"message":"ok","data":{"totalPads":3,"totalSessions": 2,"totalActivePads": 1}}
 {"code":4,"message":"no or wrong API Key","data":null}
 */
+
 exports.getStats = async () => {
  const sessionInfos = padMessageHandler.sessioninfos;

--- a/src/node/db/AuthorManager.js
+++ b/src/node/db/AuthorManager.js
@ -93,7 +93,6 @@ exports.getColorPalette = () => [

 /**
 * Checks if the author exists
- * @param {String} authorID The id of the author
 */
 exports.doesAuthorExist = async (authorID) => {
  const author = await db.get(`globalAuthor:${authorID}`);
@ -101,12 +100,50 @@ exports.doesAuthorExist = async (authorID) => {
  return author != null;
 };

-/**
- exported for backwards compatibility
- @param {String} authorID The id of the author
-  */
+/* exported for backwards compatibility */
 exports.doesAuthorExists = exports.doesAuthorExist;

+const getAuthor4Token = async (token) => {
+  const author = await mapAuthorWithDBKey('token2author', token);
+
+  // return only the sub value authorID
+  return author ? author.authorID : author;
+};
+
+exports.getAuthorId = async (token, user) => {
+  const context = {dbKey: token, token, user};
+  let [authorId] = await hooks.aCallFirst('getAuthorId', context);
+  if (!authorId) authorId = await getAuthor4Token(context.dbKey);
+  return authorId;
+};
+
+/**
+ * Returns the AuthorID for a token.
+ *
+ * @deprecated Use `getAuthorId` instead.
+ * @param {String} token The token
+ */
+exports.getAuthor4Token = async (token) => {
+  warnDeprecated(
+      'AuthorManager.getAuthor4Token() is deprecated; use AuthorManager.getAuthorId() instead');
+  return await getAuthor4Token(token);
+};
+
+/**
+ * Returns the AuthorID for a mapper.
+ * @param {String} token The mapper
+ * @param {String} name The name of the author (optional)
+ */
+exports.createAuthorIfNotExistsFor = async (authorMapper, name) => {
+  const author = await mapAuthorWithDBKey('mapper2author', authorMapper);
+
+  if (name) {
+    // set the name of this author
+    await exports.setAuthorName(author.authorID, name);
+  }
+
+  return author;
+};

 /**
 * Returns the AuthorID for a mapper. We can map using a mapperkey,
@ -137,60 +174,6 @@ const mapAuthorWithDBKey = async (mapperkey, mapper) => {
  return {authorID: author};
 };

-/**
- * Returns the AuthorID for a token.
- * @param {String} token The token of the author
- * @return {Promise<string|*|{authorID: string}|{authorID: *}>}
- */
-const getAuthor4Token = async (token) => {
-  const author = await mapAuthorWithDBKey('token2author', token);
-
-  // return only the sub value authorID
-  return author ? author.authorID : author;
-};
-
-/**
- * Returns the AuthorID for a token.
- * @param {String} token
- * @param {Object} user
- * @return {Promise<*>}
- */
-exports.getAuthorId = async (token, user) => {
-  const context = {dbKey: token, token, user};
-  let [authorId] = await hooks.aCallFirst('getAuthorId', context);
-  if (!authorId) authorId = await getAuthor4Token(context.dbKey);
-  return authorId;
-};
-
-/**
- * Returns the AuthorID for a token.
- *
- * @deprecated Use `getAuthorId` instead.
- * @param {String} token The token
- */
-exports.getAuthor4Token = async (token) => {
-  warnDeprecated(
-      'AuthorManager.getAuthor4Token() is deprecated; use AuthorManager.getAuthorId() instead');
-  return await getAuthor4Token(token);
-};
-
-/**
- * Returns the AuthorID for a mapper.
- * @param {String} authorMapper The mapper
- * @param {String} name The name of the author (optional)
- */
-exports.createAuthorIfNotExistsFor = async (authorMapper, name) => {
-  const author = await mapAuthorWithDBKey('mapper2author', authorMapper);
-
-  if (name) {
-    // set the name of this author
-    await exports.setAuthorName(author.authorID, name);
-  }
-
-  return author;
-};
-
-
 /**
 * Internal function that creates the database entry for an author
 * @param {String} name The name of the author
@ -248,7 +231,7 @@ exports.setAuthorName = async (author, name) => await db.setSub(

 /**
 * Returns an array of all pads this author contributed to
- * @param {String} authorID The id of the author
+ * @param {String} author The id of the author
 */
 exports.listPadsOfAuthor = async (authorID) => {
  /* There are two other places where this array is manipulated:
@ -272,7 +255,7 @@ exports.listPadsOfAuthor = async (authorID) => {

 /**
 * Adds a new pad to the list of contributions
- * @param {String} authorID The id of the author
+ * @param {String} author The id of the author
 * @param {String} padID The id of the pad the author contributes to
 */
 exports.addPad = async (authorID, padID) => {
@ -299,7 +282,7 @@ exports.addPad = async (authorID, padID) => {

 /**
 * Removes a pad from the list of contributions
- * @param {String} authorID The id of the author
+ * @param {String} author The id of the author
 * @param {String} padID The id of the pad the author contributes to
 */
 exports.removePad = async (authorID, padID) => {
--- a/src/node/db/DB.js
+++ b/src/node/db/DB.js
@ -21,7 +21,7 @@
 * limitations under the License.
 */

-const ueberDB = require('ueberdb2');
+const ueberDB = require('ueberdb2-ts');
 const settings = require('../utils/Settings');
 const log4js = require('log4js');
 const stats = require('../stats');
--- a/src/node/db/GroupManager.js
+++ b/src/node/db/GroupManager.js
@ -25,10 +25,6 @@ const db = require('./DB');
 const padManager = require('./PadManager');
 const sessionManager = require('./SessionManager');

-/**
- * Lists all groups
- * @return {Promise<{groupIDs: string[]}>} The ids of all groups
- */
 exports.listAllGroups = async () => {
  let groups = await db.get('groups');
  groups = groups || {};
@ -37,11 +33,6 @@ exports.listAllGroups = async () => {
  return {groupIDs};
 };

-/**
- * Deletes a group and all associated pads
- * @param {String} groupID The id of the group
- * @return {Promise<void>} Resolves when the group is deleted
- */
 exports.deleteGroup = async (groupID) => {
  const group = await db.get(`group:${groupID}`);

@ -77,11 +68,6 @@ exports.deleteGroup = async (groupID) => {
  await db.remove(`group:${groupID}`);
 };

-/**
- * Checks if a group exists
- * @param {String} groupID the id of the group to delete
- * @return {Promise<boolean>} Resolves to true if the group exists
- */
 exports.doesGroupExist = async (groupID) => {
  // try to get the group entry
  const group = await db.get(`group:${groupID}`);
@ -89,10 +75,6 @@ exports.doesGroupExist = async (groupID) => {
  return (group != null);
 };

-/**
- * Creates a new group
- * @return {Promise<{groupID: string}>} the id of the new group
- */
 exports.createGroup = async () => {
  const groupID = `g.${randomString(16)}`;
  await db.set(`group:${groupID}`, {pads: {}, mappings: {}});
@ -103,11 +85,6 @@ exports.createGroup = async () => {
  return {groupID};
 };

-/**
- * Creates a new group if it does not exist already and returns the group ID
- * @param groupMapper the mapper of the group
- * @return {Promise<{groupID: string}|{groupID: *}>} a promise that resolves to the group ID
- */
 exports.createGroupIfNotExistsFor = async (groupMapper) => {
  if (typeof groupMapper !== 'string') {
    throw new CustomError('groupMapper is not a string', 'apierror');
@ -126,14 +103,6 @@ exports.createGroupIfNotExistsFor = async (groupMapper) => {
  return result;
 };

-/**
- * Creates a group pad
- * @param {String} groupID The id of the group
- * @param {String} padName The name of the pad
- * @param {String} text The text of the pad
- * @param {String} authorId The id of the author
- * @return {Promise<{padID: string}>} a promise that resolves to the id of the new pad
- */
 exports.createGroupPad = async (groupID, padName, text, authorId = '') => {
  // create the padID
  const padID = `${groupID}$${padName}`;
@ -162,11 +131,6 @@ exports.createGroupPad = async (groupID, padName, text, authorId = '') => {
  return {padID};
 };

-/**
- * Lists all pads of a group
- * @param {String} groupID The id of the group
- * @return {Promise<{padIDs: string[]}>} a promise that resolves to the ids of all pads of the group
- */
 exports.listPads = async (groupID) => {
  const exists = await exports.doesGroupExist(groupID);

--- a/src/node/db/Pad.js
+++ b/src/node/db/Pad.js
@ -25,8 +25,7 @@ const promises = require('../utils/promises');
 /**
 * Copied from the Etherpad source code. It converts Windows line breaks to Unix
 * line breaks and convert Tabs to spaces
- * @param {String} txt The text to clean
- * @returns {String} The cleaned text
+ * @param txt
 */
 exports.cleanText = (txt) => txt.replace(/\r\n/g, '\n')
    .replace(/\r/g, '\n')
@ -74,16 +73,9 @@ class Pad {
    return this.publicStatus;
  }

-  /**
-   * Appends a new revision
-   * @param {Object} aChangeset The changeset to append to the pad
-   * @param {String} authorId The id of the author
-   * @return {Promise<number|string>}
-   */
  async appendRevision(aChangeset, authorId = '') {
    const newAText = Changeset.applyToAText(aChangeset, this.atext, this.pool);
-    if (newAText.text === this.atext.text && newAText.attribs === this.atext.attribs &&
-        this.head !== -1) {
+    if (newAText.text === this.atext.text && newAText.attribs === this.atext.attribs) {
      return this.head;
    }
    Changeset.copyAText(newAText, this.atext);
@ -166,10 +158,6 @@ class Pad {
    return await this.db.getSub(`pad:${this.id}:revs:${revNum}`, ['meta', 'atext']);
  }

-  /**
-   * Returns all authors that worked on this pad
-   * @return {[String]} The id of authors who contributed to this pad
-   */
  getAllAuthors() {
    const authorIds = [];

@ -185,7 +173,8 @@ class Pad {
  async getInternalRevisionAText(targetRev) {
    const keyRev = this.getKeyRevisionNumber(targetRev);
    const headRev = this.getHeadRevisionNumber();
-    if (targetRev > headRev) targetRev = headRev;
+    if (targetRev > headRev)
+      targetRev = headRev;
    const [keyAText, changesets] = await Promise.all([
      this._getKeyRevisionAText(keyRev),
      Promise.all(
--- a/src/node/db/PadManager.js
+++ b/src/node/db/PadManager.js
@ -22,7 +22,6 @@
 const CustomError = require('../utils/customError');
 const Pad = require('../db/Pad');
 const db = require('./DB');
-const settings = require('../utils/Settings');

 /**
 * A cache of all loaded Pads.
@ -59,7 +58,6 @@ const padList = new class {

  /**
   * Returns all pads in alphabetical order as array.
-   * @returns {Promise<string[]>} A promise that resolves to an array of pad IDs.
   */
  async getPads() {
    if (!this._loaded) {
@ -172,8 +170,6 @@ exports.sanitizePadId = async (padId) => {
    padId = padId.replace(from, to);
  }

-  if (settings.lowerCasePadIds) padId = padId.toLowerCase();
-
  // we're out of possible transformations, so just return it
  return padId;
 };
--- a/src/node/db/ReadOnlyManager.js
+++ b/src/node/db/ReadOnlyManager.js
@ -26,15 +26,13 @@ const randomString = require('../utils/randomstring');

 /**
 * checks if the id pattern matches a read-only pad id
- * @param {String} id the pad's id
- * @return {Boolean} true if the id is readonly
+ * @param {String} the pad's id
 */
 exports.isReadOnlyId = (id) => id.startsWith('r.');

 /**
 * returns a read only id for a pad
 * @param {String} padId the id of the pad
- * @return {String} the read only id
 */
 exports.getReadOnlyId = async (padId) => {
  // check if there is a pad2readonly entry
@ -55,14 +53,12 @@ exports.getReadOnlyId = async (padId) => {
 /**
 * returns the padId for a read only id
 * @param {String} readOnlyId read only id
- * @return {String} the padId
 */
 exports.getPadId = async (readOnlyId) => await db.get(`readonly2pad:${readOnlyId}`);

 /**
 * returns the padId and readonlyPadId in an object for any id
- * @param {String} id read only id or real pad id
- * @return {Object} an object with the padId and readonlyPadId
+ * @param {String} padIdOrReadonlyPadId read only id or real pad id
 */
 exports.getIds = async (id) => {
  const readonly = exports.isReadOnlyId(id);
--- a/src/node/db/SecurityManager.js
+++ b/src/node/db/SecurityManager.js
@ -49,11 +49,6 @@ const DENY = Object.freeze({accessStatus: 'deny'});
 *
 * WARNING: Tokens and session IDs MUST be kept secret, otherwise users will be able to impersonate
 * each other (which might allow them to gain privileges).
- * @param {String} padID
- * @param {String} sessionCookie
- * @param {String} token
- * @param {Object} userSettings
- * @return {DENY|{accessStatus: String, authorID: String}}
 */
 exports.checkAccess = async (padID, sessionCookie, token, userSettings) => {
  if (!padID) {
--- a/src/node/db/SessionManager.js
+++ b/src/node/db/SessionManager.js
@ -81,11 +81,6 @@ exports.findAuthorID = async (groupID, sessionCookie) => {
  return sessionInfo.authorID;
 };

-/**
- * Checks if a session exists
- * @param {String} sessionID The id of the session
- * @return {Promise<boolean>} Resolves to true if the session exists
- */
 exports.doesSessionExist = async (sessionID) => {
  // check if the database entry of this session exists
  const session = await db.get(`session:${sessionID}`);
@ -94,10 +89,6 @@ exports.doesSessionExist = async (sessionID) => {

 /**
 * Creates a new session between an author and a group
- * @param {String} groupID The id of the group
- * @param {String} authorID The id of the author
- * @param {Number} validUntil The unix timestamp when the session should expire
- * @return {Promise<{sessionID: string}>} the id of the new session
 */
 exports.createSession = async (groupID, authorID, validUntil) => {
  // check if the group exists
@ -155,11 +146,6 @@ exports.createSession = async (groupID, authorID, validUntil) => {
  return {sessionID};
 };

-/**
- * Returns the sessioninfos for a session
- * @param {String} sessionID The id of the session
- * @return {Promise<Object>} the sessioninfos
- */
 exports.getSessionInfo = async (sessionID) => {
  // check if the database entry of this session exists
  const session = await db.get(`session:${sessionID}`);
@ -175,8 +161,6 @@ exports.getSessionInfo = async (sessionID) => {

 /**
 * Deletes a session
- * @param {String} sessionID The id of the session
- * @return {Promise<void>} Resolves when the session is deleted
 */
 exports.deleteSession = async (sessionID) => {
  // ensure that the session exists
@ -202,11 +186,6 @@ exports.deleteSession = async (sessionID) => {
  await db.remove(`session:${sessionID}`);
 };

-/**
- * Returns an array of all sessions of a group
- * @param {String} groupID The id of the group
- * @return {Promise<Object>} The sessioninfos of all sessions of this group
- */
 exports.listSessionsOfGroup = async (groupID) => {
  // check that the group exists
  const exists = await groupManager.doesGroupExist(groupID);
@ -218,11 +197,6 @@ exports.listSessionsOfGroup = async (groupID) => {
  return sessions;
 };

-/**
- * Returns an array of all sessions of an author
- * @param {String} authorID The id of the author
- * @return {Promise<Object>} The sessioninfos of all sessions of this author
- */
 exports.listSessionsOfAuthor = async (authorID) => {
  // check that the author exists
  const exists = await authorManager.doesAuthorExist(authorID);
@ -230,16 +204,12 @@ exports.listSessionsOfAuthor = async (authorID) => {
    throw new CustomError('authorID does not exist', 'apierror');
  }

-  return await listSessionsWithDBKey(`author2sessions:${authorID}`);
+  const sessions = await listSessionsWithDBKey(`author2sessions:${authorID}`);
+  return sessions;
 };

 // this function is basically the code listSessionsOfAuthor and listSessionsOfGroup has in common
 // required to return null rather than an empty object if there are none
-/**
- * Returns an array of all sessions of a group
- * @param {String} dbkey The db key to use to get the sessions
- * @return {Promise<*>}
- */
 const listSessionsWithDBKey = async (dbkey) => {
  // get the group2sessions entry
  const sessionObject = await db.get(dbkey);
@ -248,7 +218,8 @@ const listSessionsWithDBKey = async (dbkey) => {
  // iterate through the sessions and get the sessioninfos
  for (const sessionID of Object.keys(sessions || {})) {
    try {
-      sessions[sessionID] = await exports.getSessionInfo(sessionID);
+      const sessionInfo = await exports.getSessionInfo(sessionID);
+      sessions[sessionID] = sessionInfo;
    } catch (err) {
      if (err.name === 'apierror') {
        console.warn(`Found bad session ${sessionID} in ${dbkey}`);
@ -262,9 +233,5 @@ const listSessionsWithDBKey = async (dbkey) => {
  return sessions;
 };

-/**
- * checks if a number is an int
- * @param {number|string} value
- * @return {boolean} If the value is an integer
- */
+// checks if a number is an int
 const isInt = (value) => (parseFloat(value) === parseInt(value)) && !isNaN(value);
--- a/src/node/handler/APIHandler.js
+++ b/src/node/handler/APIHandler.js
@ -165,13 +165,12 @@ exports.version = version;

 /**
 * Handles a HTTP API call
- * @param {String} apiVersion the version of the api
- * @param {String} functionName the name of the called function
+ * @param functionName the name of the called function
 * @param fields the params of the called function
 * @req express request object
 * @res express response object
 */
-exports.handle = async function (apiVersion, functionName, fields) {
+exports.handle = async function (apiVersion, functionName, fields, req, res) {
  // say goodbye if this is an unknown API version
  if (!(apiVersion in version)) {
    throw new createHTTPError.NotFound('no such api version');
--- a/src/node/handler/ExportHandler.js
+++ b/src/node/handler/ExportHandler.js
@ -38,11 +38,6 @@ const tempDirectory = os.tmpdir();

 /**
 * do a requested export
- * @param {Object} req the request object
- * @param {Object} res the response object
- * @param {String} padId the pad id to export
- * @param {String} readOnlyId the read only id of the pad to export
- * @param {String} type the type to export
 */
 exports.doExport = async (req, res, padId, readOnlyId, type) => {
  // avoid naming the read-only file as the original pad's id
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@ -73,10 +73,6 @@ const tmpDirectory = os.tmpdir();

 /**
 * do a requested import
- * @param {Object} req the request object
- * @param {Object} res the response object
- * @param {String} padId the pad id to export
- * @param {String} authorId the author id to use for the import
 */
 const doImport = async (req, res, padId, authorId) => {
  // pipe to a file
@ -93,24 +89,24 @@ const doImport = async (req, res, padId, authorId) => {
    maxFileSize: settings.importMaxFileSize,
  });

-  let srcFile;
-  let files;
-  let fields;
-  try {
-    [fields, files] = await form.parse(req);
-  } catch (err) {
-    logger.warn(`Import failed due to form error: ${err.stack || err}`);
-    if (err.code === Formidable.formidableErrors.biggerThanMaxFileSize) {
-      throw new ImportError('maxFileSize');
-    }
-    throw new ImportError('uploadFailed');
-  }
-  if (!files.file) {
-    logger.warn('Import failed because form had no file');
-    throw new ImportError('uploadFailed');
-  } else {
-    srcFile = files.file[0].filepath;
-  }
+  // locally wrapped Promise, since form.parse requires a callback
+  let srcFile = await new Promise((resolve, reject) => {
+    form.parse(req, (err, fields, files) => {
+      if (err != null) {
+        logger.warn(`Import failed due to form error: ${err.stack || err}`);
+        // I hate doing indexOf here but I can't see anything to use...
+        if (err && err.stack && err.stack.indexOf('maxFileSize') !== -1) {
+          return reject(new ImportError('maxFileSize'));
+        }
+        return reject(new ImportError('uploadFailed'));
+      }
+      if (!files.file) {
+        logger.warn('Import failed because form had no file');
+        return reject(new ImportError('uploadFailed'));
+      }
+      resolve(files.file.filepath);
+    });
+  });

  // ensure this is a file ending we know, else we change the file ending to .txt
  // this allows us to accept source code files like .c or .java
@ -237,14 +233,6 @@ const doImport = async (req, res, padId, authorId) => {
  return false;
 };

-/**
- * Handles the request to import a file
- * @param {Request} req the request object
- * @param {Response} res the response object
- * @param {String} padId the pad id to export
- * @param {String} authorId the author id to use for the import
- * @return {Promise<void>} a promise
- */
 exports.doImport = async (req, res, padId, authorId = '') => {
  let httpStatus = 200;
  let code = 0;
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@ -236,11 +236,6 @@ exports.handleMessage = async (socket, message) => {
      padID: message.padId,
      token: message.token,
    };
-
-    // Pad does not exist, so we need to sanitize the id
-    if (!(await padManager.doesPadExist(thisSession.auth.padID))) {
-      thisSession.auth.padID = await padManager.sanitizePadId(thisSession.auth.padID);
-    }
    const padIds = await readOnlyManager.getIds(thisSession.auth.padID);
    thisSession.padId = padIds.padId;
    thisSession.readOnlyPadId = padIds.readOnlyPadId;
--- a/src/node/handler/SocketIORouter.js
+++ b/src/node/handler/SocketIORouter.js
@ -35,9 +35,8 @@ const components = {};

 let io;

-/** adds a component
- * @param {string} moduleName
- * @param {Module} module
+/**
+ * adds a component
 */
 exports.addComponent = (moduleName, module) => {
  if (module == null) return exports.deleteComponent(moduleName);
@ -45,15 +44,10 @@ exports.addComponent = (moduleName, module) => {
  module.setSocketIO(io);
 };

-/**
- * removes a component
- * @param {Module} moduleName
- */
 exports.deleteComponent = (moduleName) => { delete components[moduleName]; };

 /**
 * sets the socket.io and adds event functions for routing
- * @param {Object} _io the socket.io instance
 */
 exports.setSocketIO = (_io) => {
  io = _io;
--- a/src/node/hooks/express.js
+++ b/src/node/hooks/express.js
@ -1,7 +1,6 @@
 'use strict';

 const _ = require('underscore');
-const SecretRotator = require('../security/SecretRotator');
 const cookieParser = require('cookie-parser');
 const events = require('events');
 const express = require('express');
@ -15,7 +14,6 @@ const stats = require('../stats');
 const util = require('util');
 const webaccess = require('./express/webaccess');

-let secretRotator = null;
 const logger = log4js.getLogger('http');
 let serverName;
 let sessionStore;
@ -55,8 +53,6 @@ const closeServer = async () => {
  }
  if (sessionStore) sessionStore.shutdown();
  sessionStore = null;
-  if (secretRotator) secretRotator.stop();
-  secretRotator = null;
 };

 exports.createServer = async () => {
@ -178,23 +174,13 @@ exports.restartServer = async () => {
    }));
  }

-  const {keyRotationInterval, sessionLifetime} = settings.cookie;
-  let secret = settings.sessionKey;
-  if (keyRotationInterval && sessionLifetime) {
-    secretRotator = new SecretRotator(
-        'expressSessionSecrets', keyRotationInterval, sessionLifetime, settings.sessionKey);
-    await secretRotator.start();
-    secret = secretRotator.secrets;
-  }
-  if (!secret) throw new Error('missing cookie signing secret');
-
-  app.use(cookieParser(secret, {}));
+  app.use(cookieParser(settings.sessionKey, {}));

  sessionStore = new SessionStore(settings.cookie.sessionRefreshInterval);
  exports.sessionMiddleware = expressSession({
    propagateTouch: true,
    rolling: true,
-    secret,
+    secret: settings.sessionKey,
    store: sessionStore,
    resave: false,
    saveUninitialized: false,
@ -202,7 +188,7 @@ exports.restartServer = async () => {
    // cleaner :)
    name: 'express_sid',
    cookie: {
-      maxAge: sessionLifetime || null, // Convert 0 to null.
+      maxAge: settings.cookie.sessionLifetime || null, // Convert 0 to null.
      sameSite: settings.cookie.sameSite,

      // The automatic express-session mechanism for determining if the application is being served
--- a/src/node/hooks/express/admin.js
+++ b/src/node/hooks/express/admin.js
@ -1,14 +1,6 @@
 'use strict';
 const eejs = require('../../eejs');

-
-/**
- * Add the admin navigation link
- * @param hookName {String} the name of the hook
- * @param args {Object} the object containing the arguments
- * @param {Function} cb  the callback function
- * @return {*}
- */
 exports.expressCreateServer = (hookName, args, cb) => {
  args.app.get('/admin', (req, res) => {
    if ('/' !== req.path[req.path.length - 1]) return res.redirect('./admin/');
--- a/src/node/hooks/express/adminplugins.js
+++ b/src/node/hooks/express/adminplugins.js
@ -121,13 +121,6 @@ exports.socketio = (hookName, args, cb) => {
  return cb();
 };

-/**
- * Sorts  a list of plugins by a property
- * @param {Object} plugins The plugins to sort
- * @param {Object} property The property to sort by
- * @param  {String} dir The directory of the plugin
- * @return {Object[]}
- */
 const sortPluginList = (plugins, property, /* ASC?*/dir) => plugins.sort((a, b) => {
  if (a[property] < b[property]) {
    return dir ? -1 : 1;
--- a/src/node/hooks/express/apicalls.js
+++ b/src/node/hooks/express/apicalls.js
@ -8,19 +8,20 @@ const util = require('util');

 exports.expressPreSession = async (hookName, {app}) => {
  // The Etherpad client side sends information about how a disconnect happened
-  app.post('/ep/pad/connection-diagnostic-info', async (req, res) => {
-    const [fields, files] = await (new Formidable({})).parse(req);
-    clientLogger.info(`DIAGNOSTIC-INFO: ${fields.diagnosticInfo}`);
-    res.end('OK');
+  app.post('/ep/pad/connection-diagnostic-info', (req, res) => {
+    new Formidable().parse(req, (err, fields, files) => {
+      clientLogger.info(`DIAGNOSTIC-INFO: ${fields.diagnosticInfo}`);
+      res.end('OK');
+    });
  });

-  const parseJserrorForm = async (req) => {
+  const parseJserrorForm = async (req) => await new Promise((resolve, reject) => {
    const form = new Formidable({
      maxFileSize: 1, // Files are not expected. Not sure if 0 means unlimited, so 1 is used.
    });
-    const [fields, files] = await form.parse(req);
-    return fields.errorInfo;
-  };
+    form.on('error', (err) => reject(err));
+    form.parse(req, (err, fields) => err != null ? reject(err) : resolve(fields.errorInfo));
+  });

  // The Etherpad client side sends information about client side javscript errors
  app.post('/jserror', (req, res, next) => {
--- a/src/node/hooks/express/importexport.js
+++ b/src/node/hooks/express/importexport.js
@ -11,16 +11,13 @@ const securityManager = require('../../db/SecurityManager');
 const webaccess = require('./webaccess');

 exports.expressCreateServer = (hookName, args, cb) => {
-  const limiter = rateLimit({
-    ...settings.importExportRateLimiting,
-    handler: (request, response, next, options) => {
-      if (request.rateLimit.current === request.rateLimit.limit + 1) {
-        // when the rate limiter triggers, write a warning in the logs
-        console.warn('Import/Export rate limiter triggered on ' +
-            `"${request.originalUrl}" for IP address ${request.ip}`);
-      }
-    },
-  });
+  settings.importExportRateLimiting.onLimitReached = (req, res, options) => {
+    // when the rate limiter triggers, write a warning in the logs
+    console.warn('Import/Export rate limiter triggered on ' +
+                 `"${req.originalUrl}" for IP address ${req.ip}`);
+  };
+  // The rate limiter is created in this hook so that restarting the server resets the limiter.
+  const limiter = rateLimit(settings.importExportRateLimiting);

  // handle export requests
  args.app.use('/p/:pad/:rev?/export/:type', limiter);
--- a/src/node/hooks/express/openapi.js
+++ b/src/node/hooks/express/openapi.js
@ -15,7 +15,8 @@
 */

 const OpenAPIBackend = require('openapi-backend').default;
-const IncomingForm = require('formidable').IncomingForm;
+const formidable = require('formidable');
+const {promisify} = require('util');
 const cloneDeep = require('lodash.clonedeep');
 const createHTTPError = require('http-errors');

@ -595,13 +596,9 @@ exports.expressPreSession = async (hookName, {app}) => {
          // read form data if method was POST
          let formData = {};
          if (c.request.method === 'post') {
-            const form = new IncomingForm();
-            formData = (await form.parse(req))[0];
-            for (const k of Object.keys(formData)) {
-              if (formData[k] instanceof Array) {
-                formData[k] = formData[k][0];
-              }
-            }
+            const form = new formidable.IncomingForm();
+            const parseForm = promisify(form.parse).bind(form);
+            formData = await parseForm(req);
          }

          const fields = Object.assign({}, header, params, query, formData);
@ -696,20 +693,10 @@ exports.expressPreSession = async (hookName, {app}) => {
  }
 };

-/**
- * Helper to get the current root path for an API version
- * @param {String} version The API version
- * @param {APIPathStyle} style The style of the API path
- * @return {String} The root path for the API version
- */
+// helper to get api root
 const getApiRootForVersion = (version, style = APIPathStyle.FLAT) => `/${style}/${version}`;

-/**
- * Helper to generate an OpenAPI server object when serving definitions
- * @param {String} apiRoot The root path for the API version
- * @param {Request} req The express request object
- * @return {url: String} The server object for the OpenAPI definition location
- */
+// helper to generate an OpenAPI server object when serving definitions
 const generateServerForApiVersion = (apiRoot, req) => ({
  url: `${settings.ssl ? 'https' : 'http'}://${req.headers.host}${apiRoot}`,
 });
--- a/src/node/hooks/express/webaccess.js
+++ b/src/node/hooks/express/webaccess.js
@ -149,10 +149,7 @@ const checkAccess = async (req, res, next) => {
  if (!(await aCallFirst0('authenticate', ctx))) {
    // Fall back to HTTP basic auth.
    const {[ctx.username]: {password} = {}} = settings.users;
-
-    if (!httpBasicAuth ||
-        !ctx.username ||
-        password == null || password.toString() !== ctx.password) {
+    if (!httpBasicAuth || !ctx.username || password == null || password !== ctx.password) {
      httpLogger.info(`Failed authentication from IP ${req.ip}`);
      if (await aCallFirst0('authnFailure', {req, res})) return;
      if (await aCallFirst0('authFailure', {req, res, next})) return;
--- a/src/node/security/SecretRotator.js
+++ b/src/node/security/SecretRotator.js
@ -1,251 +0,0 @@
-'use strict';
-
-const {Buffer} = require('buffer');
-const crypto = require('./crypto');
-const db = require('../db/DB');
-const log4js = require('log4js');
-
-class Kdf {
-  async generateParams() { throw new Error('not implemented'); }
-  async derive(params, info) { throw new Error('not implemented'); }
-}
-
-class LegacyStaticSecret extends Kdf {
-  async derive(params, info) { return params; }
-}
-
-class Hkdf extends Kdf {
-  constructor(digest, keyLen) {
-    super();
-    this._digest = digest;
-    this._keyLen = keyLen;
-  }
-
-  async generateParams() {
-    const [secret, salt] = (await Promise.all([
-      crypto.randomBytes(this._keyLen),
-      crypto.randomBytes(this._keyLen),
-    ])).map((b) => b.toString('hex'));
-    return {digest: this._digest, keyLen: this._keyLen, salt, secret};
-  }
-
-  async derive(p, info) {
-    return Buffer.from(
-        await crypto.hkdf(p.digest, p.secret, p.salt, info, p.keyLen)).toString('hex');
-  }
-}
-
-// Key derivation algorithms. Do not modify entries in this array, except:
-//   * It is OK to replace an unused algorithm with `null` after any entries in the database
-//     using the algorithm have been deleted.
-//   * It is OK to append a new algorithm to the end.
-// If the entries are modified in any other way then key derivation might fail or produce invalid
-// results due to broken compatibility with existing database records.
-const algorithms = [
-  new LegacyStaticSecret(),
-  new Hkdf('sha256', 32),
-];
-const defaultAlgId = algorithms.length - 1;
-
-// In JavaScript, the % operator is remainder, not modulus.
-const mod = (a, n) => ((a % n) + n) % n;
-const intervalStart = (t, interval) => t - mod(t, interval);
-
-/**
- * Maintains an array of secrets across one or more Etherpad instances sharing the same database,
- * periodically rotating in a new secret and removing the oldest secret.
- *
- * The secrets are generated using a key derivation function (KDF) with input keying material coming
- * from a long-lived secret stored in the database (generated if missing).
- */
-class SecretRotator {
-  /**
-   * @param {string} dbPrefix - Database key prefix to use for tracking secret metadata.
-   * @param {number} interval - How often to rotate in a new secret.
-   * @param {number} lifetime - How long after the end of an interval before the secret is no longer
-   *     useful.
-   * @param {string} [legacyStaticSecret] - Optional secret to facilitate migration to secret
-   *     rotation. If the oldest known secret starts after `lifetime` ago, this secret will cover
-   *     the time period starting `lifetime` ago and ending at the start of that secret.
-   */
-  constructor(dbPrefix, interval, lifetime, legacyStaticSecret = null) {
-    /**
-     * The secrets. The first secret in this array is the one that should be used to generate new
-     * MACs. All of the secrets in this array should be used when attempting to authenticate an
-     * existing MAC. The contents of this array will be updated every `interval` milliseconds, but
-     * the Array object itself will never be replaced with a new Array object.
-     *
-     * @type {string[]}
-     * @public
-     */
-    this.secrets = [];
-    Object.defineProperty(this, 'secrets', {writable: false}); // Defend against bugs.
-
-    if (/[*:%]/.test(dbPrefix)) throw new Error(`dbPrefix contains an invalid char: ${dbPrefix}`);
-    this._dbPrefix = dbPrefix;
-    this._interval = interval;
-    this._legacyStaticSecret = legacyStaticSecret;
-    this._lifetime = lifetime;
-    this._logger = log4js.getLogger(`secret-rotation ${dbPrefix}`);
-    this._logger.debug(`new secret rotator (interval ${interval}, lifetime: ${lifetime})`);
-    this._updateTimeout = null;
-
-    // Indirections to facilitate testing.
-    this._t = {now: Date.now.bind(Date), setTimeout, clearTimeout, algorithms};
-  }
-
-  async _publish(params, id = null) {
-    // Params are published to the db with a randomly generated key to avoid race conditions with
-    // other instances.
-    if (id == null) id = `${this._dbPrefix}:${(await crypto.randomBytes(32)).toString('hex')}`;
-    await db.set(id, params);
-    return id;
-  }
-
-  async start() {
-    this._logger.debug('starting secret rotation');
-    if (this._updateTimeout != null) return; // Already started.
-    await this._update();
-  }
-
-  stop() {
-    this._logger.debug('stopping secret rotation');
-    this._t.clearTimeout(this._updateTimeout);
-    this._updateTimeout = null;
-  }
-
-  async _deriveSecrets(p, now) {
-    this._logger.debug('deriving secrets from', p);
-    if (!p.interval) return [await algorithms[p.algId].derive(p.algParams, null)];
-    const t0 = intervalStart(now, p.interval);
-    // Start of the first interval covered by these params. To accommodate clock skew, p.interval is
-    // subtracted. If we did not do this, then the following could happen:
-    //   1. Instance (A) starts up and publishes params starting at the current interval.
-    //   2. Instance (B) starts up with a clock that is in the previous interval.
-    //   3. Instance (B) reads the params published by instance (A) and sees that there's no
-    //      coverage of what it thinks is the current interval.
-    //   4. Instance (B) generates and publishes new params that covers what it thinks is the
-    //      current interval.
-    //   5. Instance (B) starts generating MACs from a secret derived from the new params.
-    //   6. Instance (A) fails to validate the MACs generated by instance (B) until it re-reads
-    //      the published params, which might take as long as interval.
-    // An alternative approach is to backdate p.start by p.interval when creating new params, but
-    // this could affect the end time of legacy secrets.
-    const tA = intervalStart(p.start - p.interval, p.interval);
-    const tZ = intervalStart(p.end - 1, p.interval);
-    this._logger.debug('now:', now, 't0:', t0, 'tA:', tA, 'tZ:', tZ);
-    // Starts of intervals to derive keys for.
-    const tNs = [];
-    // Whether the derived secret for the interval starting at tN is still relevant. If there was no
-    // clock skew, a derived secret is relevant until p.lifetime has elapsed since the end of the
-    // interval. To accommodate clock skew, this end time is extended by p.interval.
-    const expired = (tN) => now >= tN + (2 * p.interval) + p.lifetime;
-    // Walk from t0 back until either the start of coverage or the derived secret is expired. t0
-    // must always be the first entry in case p is the current params. (The first derived secret is
-    // used for generating MACs, so the secret derived for t0 must be before the secrets derived for
-    // other times.)
-    for (let tN = Math.min(t0, tZ); tN >= tA && !expired(tN); tN -= p.interval) tNs.push(tN);
-    // Include a future derived secret to accommodate clock skew.
-    if (t0 + p.interval <= tZ) tNs.push(t0 + p.interval);
-    this._logger.debug('deriving secrets for intervals with start times:', tNs);
-    return await Promise.all(
-        tNs.map(async (tN) => await algorithms[p.algId].derive(p.algParams, `${tN}`)));
-  }
-
-  async _update() {
-    const now = this._t.now();
-    const t0 = intervalStart(now, this._interval);
-    let next = t0 + this._interval; // When this._update() should be called again.
-    let legacyEnd = now;
-    // TODO: This is racy. If two instances start up at the same time and there are no existing
-    // matching publications, each will generate and publish their own paramters. In practice this
-    // is unlikely to happen, and if it does it can be fixed by restarting both Etherpad instances.
-    const dbKeys = await db.findKeys(`${this._dbPrefix}:*`, null) || [];
-    let currentParams = null;
-    let currentId = null;
-    const dbWrites = [];
-    const allParams = [];
-    const legacyParams = [];
-    await Promise.all(dbKeys.map(async (dbKey) => {
-      const p = await db.get(dbKey);
-      if (p.algId === 0 && p.algParams === this._legacyStaticSecret) legacyParams.push(p);
-      if (p.start < legacyEnd) legacyEnd = p.start;
-      // Check if the params have expired. Params are still useful if a MAC generated by a secret
-      // derived from the params is still valid, which can be true up to p.end + p.lifetime if
-      // there was no clock skew. The p.interval factor is added to accommodate clock skew.
-      // p.interval is null for legacy secrets, so fall back to this._interval.
-      if (now >= p.end + p.lifetime + (p.interval || this._interval)) {
-        // This initial keying material (or legacy secret) is expired.
-        dbWrites.push(db.remove(dbKey));
-        dbWrites[dbWrites.length - 1].catch(() => {}); // Prevent unhandled Promise rejections.
-        return;
-      }
-      const t1 = p.interval && intervalStart(now, p.interval) + p.interval; // Start of next intrvl.
-      const tA = intervalStart(p.start, p.interval); // Start of interval containing p.start.
-      if (p.interval) next = Math.min(next, t1);
-      // Determine if these params can be used to generate the current (active) secret. Note that
-      // p.start is allowed to be in the next interval in case there is clock skew.
-      if (p.interval && p.interval === this._interval && p.lifetime === this._lifetime &&
-          tA <= t1 && p.end > now && (currentParams == null || p.start > currentParams.start)) {
-        if (currentParams) allParams.push(currentParams);
-        currentParams = p;
-        currentId = dbKey;
-      } else {
-        allParams.push(p);
-      }
-    }));
-    if (this._legacyStaticSecret && now < legacyEnd + this._lifetime + this._interval &&
-        !legacyParams.find((p) => p.end + p.lifetime >= legacyEnd + this._lifetime)) {
-      const d = new Date(legacyEnd).toJSON();
-      this._logger.debug(`adding legacy static secret for ${d} with lifetime ${this._lifetime}`);
-      const p = {
-        algId: 0,
-        algParams: this._legacyStaticSecret,
-        // The start time is equal to the end time so that this legacy secret does not affect the
-        // end times of any legacy secrets published by other instances.
-        start: legacyEnd,
-        end: legacyEnd,
-        interval: null,
-        lifetime: this._lifetime,
-      };
-      allParams.push(p);
-      dbWrites.push(this._publish(p));
-      dbWrites[dbWrites.length - 1].catch(() => {}); // Prevent unhandled Promise rejections.
-    }
-    if (currentParams == null) {
-      currentParams = {
-        algId: defaultAlgId,
-        algParams: await algorithms[defaultAlgId].generateParams(),
-        start: now,
-        end: now, // Extended below.
-        interval: this._interval,
-        lifetime: this._lifetime,
-      };
-    }
-    // Advance currentParams's expiration time to the end of the next interval if needed. (The next
-    // interval is used so that the parameters never expire under normal circumstances.) This must
-    // be done before deriving any secrets from currentParams so that a secret for the next interval
-    // can be included (in case there is clock skew).
-    currentParams.end = Math.max(currentParams.end, t0 + (2 * this._interval));
-    dbWrites.push(this._publish(currentParams, currentId));
-    dbWrites[dbWrites.length - 1].catch(() => {}); // Prevent unhandled Promise rejections.
-    // The secrets derived from currentParams MUST be the first secrets.
-    const secrets = await this._deriveSecrets(currentParams, now);
-    await Promise.all(
-        allParams.map(async (p) => secrets.push(...await this._deriveSecrets(p, now))));
-    // Update this.secrets all at once to avoid race conditions.
-    this.secrets.length = 0;
-    this.secrets.push(...secrets);
-    this._logger.debug('active secrets:', this.secrets);
-    // Wait for db writes to finish after updating this.secrets so that the new secrets become
-    // active as soon as possible.
-    await Promise.all(dbWrites);
-    // Use an async function so that test code can tell when it's done publishing the new secrets.
-    // The standard setTimeout() function ignores the callback's return value, but some of the tests
-    // await the returned Promise.
-    this._updateTimeout =
-        this._t.setTimeout(async () => await this._update(), next - this._t.now());
-  }
-}
-
-module.exports = SecretRotator;
--- a/src/node/security/crypto.js
+++ b/src/node/security/crypto.js
@ -1,15 +0,0 @@
-'use strict';
-
-const crypto = require('crypto');
-const util = require('util');
-
-
-/**
- * Promisified version of Node.js's crypto.hkdf.
- */
-exports.hkdf = util.promisify(crypto.hkdf);
-
-/**
- * Promisified version of Node.js's crypto.randomBytes
- */
-exports.randomBytes = util.promisify(crypto.randomBytes);
--- a/src/node/server.js
+++ b/src/node/server.js
@ -25,6 +25,7 @@
 */

 const log4js = require('log4js');
+log4js.replaceConsole();

 const settings = require('./utils/Settings');

@ -275,4 +276,3 @@ exports.exit = async (err = null) => {
 };

 if (require.main === module) exports.start();
-if (typeof(PhusionPassenger) !== 'undefined') exports.start();
--- a/src/node/utils/Cli.js
+++ b/src/node/utils/Cli.js
@ -45,7 +45,7 @@ for (let i = 0; i < argv.length; i++) {
    exports.argv.sessionkey = arg;
  }

-  // Override location of APIKEY.txt file
+  // Override location of settings.json file
  if (prevArg === '--apikey') {
    exports.argv.apikey = arg;
  }
--- a/src/node/utils/ImportEtherpad.js
+++ b/src/node/utils/ImportEtherpad.js
@ -24,7 +24,7 @@ const db = require('../db/DB');
 const hooks = require('../../static/js/pluginfw/hooks');
 const log4js = require('log4js');
 const supportedElems = require('../../static/js/contentcollector').supportedElems;
-const ueberdb = require('ueberdb2');
+const ueberdb = require('ueberdb2-ts');

 const logger = log4js.getLogger('ImportEtherpad');

--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@ -50,24 +50,15 @@ const nonSettings = [

 // This is a function to make it easy to create a new instance. It is important to not reuse a
 // config object after passing it to log4js.configure() because that method mutates the object. :(
-const defaultLogConfig = () => ({appenders: {console: {type: 'console'}},
-  categories: {
-    default: {appenders: ['console'], level: 'info'},
-  }});
+const defaultLogConfig = () => ({appenders: [{type: 'console'}]});
 const defaultLogLevel = 'INFO';

 const initLogging = (logLevel, config) => {
  // log4js.configure() modifies exports.logconfig so check for equality first.
  const logConfigIsDefault = deepEqual(config, defaultLogConfig());
  log4js.configure(config);
-  log4js.getLogger('console');
-
-  // Overwrites for console output methods
-  console.debug = logger.debug.bind(logger);
-  console.log = logger.info.bind(logger);
-  console.warn = logger.warn.bind(logger);
-  console.error = logger.error.bind(logger);
-
+  log4js.setGlobalLogLevel(logLevel);
+  log4js.replaceConsole();
  // Log the warning after configuring log4js to increase the chances the user will see it.
  if (!logConfigIsDefault) logger.warn('The logconfig setting is deprecated.');
 };
@ -306,9 +297,9 @@ exports.indentationOnNewLine = true;
 exports.logconfig = defaultLogConfig();

 /*
- * Deprecated cookie signing key.
+ * Session Key, do not sure this.
 */
-exports.sessionKey = null;
+exports.sessionKey = false;

 /*
 * Trust Proxy, whether or not trust the x-forwarded-for header.
@ -319,7 +310,6 @@ exports.trustProxy = false;
 * Settings controlling the session cookie issued by Etherpad.
 */
 exports.cookie = {
-  keyRotationInterval: 1 * 24 * 60 * 60 * 1000,
  /*
   * Value of the SameSite cookie property. "Lax" is recommended unless
   * Etherpad will be embedded in an iframe from another site, in which case
@ -440,11 +430,6 @@ exports.importMaxFileSize = 50 * 1024 * 1024;
 */
 exports.enableAdminUITests = false;

-/*
- * Enable auto conversion of pad Ids to lowercase.
- * e.g. /p/EtHeRpAd to /p/etherpad
- */
-exports.lowerCasePadIds = false;

 // checks if abiword is avaiable
 exports.abiwordAvailable = () => {
@ -815,14 +800,12 @@ exports.reloadSettings = () => {
    });
  }

-  const sessionkeyFilename = absolutePaths.makeAbsolute(argv.sessionkey || './SESSIONKEY.txt');
  if (!exports.sessionKey) {
+    const sessionkeyFilename = absolutePaths.makeAbsolute(argv.sessionkey || './SESSIONKEY.txt');
    try {
      exports.sessionKey = fs.readFileSync(sessionkeyFilename, 'utf8');
      logger.info(`Session key loaded from: ${sessionkeyFilename}`);
-    } catch (err) { /* ignored */ }
-    const keyRotationEnabled = exports.cookie.keyRotationInterval && exports.cookie.sessionLifetime;
-    if (!exports.sessionKey && !keyRotationEnabled) {
+    } catch (e) {
      logger.info(
          `Session key file "${sessionkeyFilename}" not found. Creating with random contents.`);
      exports.sessionKey = randomString(32);
@ -834,10 +817,6 @@ exports.reloadSettings = () => {
                'If you are seeing this error after restarting using the Admin User ' +
                'Interface then you can ignore this message.');
  }
-  if (exports.sessionKey) {
-    logger.warn(`The sessionKey setting and ${sessionkeyFilename} file are deprecated; ` +
-        'use automatic key rotation instead (see the cookie.keyRotationInterval setting).');
-  }

  if (exports.dbType === 'dirty') {
    const dirtyWarning = 'DirtyDB is used. This is not recommended for production.';
--- a/src/node/utils/UpdateCheck.js
+++ b/src/node/utils/UpdateCheck.js
@ -2,39 +2,28 @@
 const semver = require('semver');
 const settings = require('./Settings');
 const axios = require('axios');
-const headers = {
-  'User-Agent': 'Etherpad/' + settings.getEpVersion(),
-}
-
-const updateInterval = 60 * 60 * 1000; // 1 hour
 let infos;
-let lastLoadingTime = null;

-const loadEtherpadInformations = () => {
-  if (lastLoadingTime !== null && Date.now() - lastLoadingTime < updateInterval) {
-    return Promise.resolve(infos);
-  }
-
-  return axios.get('https://static.etherpad.org/info.json', {headers: headers})
-  .then(async resp => {
-    infos = await resp.data;
-    if (infos === undefined || infos === null) {
-      await Promise.reject("Could not retrieve current version")
-      return
-    }
-
-    lastLoadingTime = Date.now();
-    return await Promise.resolve(infos);
-  })
-  .catch(async err => {
-    return await Promise.reject(err);
-  });
-}
+const loadEtherpadInformations = () =>
+    axios.get('https://static.etherpad.org/info.json')
+        .then(async resp => {
+          try {
+            infos = await resp.data;
+            if (infos === undefined || infos === null) {
+              await Promise.reject("Could not retrieve current version")
+              return
+            }
+            return await Promise.resolve(infos);
+          }
+          catch (err) {
+            return   await Promise.reject(err);
+          }
+        })


 exports.getLatestVersion = () => {
-  exports.needsUpdate().catch();
-  return infos?.latestVersion;
+  exports.needsUpdate();
+  return infos.latestVersion;
 };

 exports.needsUpdate = async (cb) => {
--- a/src/package-lock.json
+++ b/src/package-lock.json
--- a/src/package.json
+++ b/src/package.json
@ -31,7 +31,7 @@
  ],
  "dependencies": {
    "async": "^3.2.4",
-    "axios": "^1.6.0",
+    "axios": "^1.4.0",
    "clean-css": "^5.3.2",
    "cookie-parser": "^1.4.6",
    "cross-spawn": "^7.0.3",
@ -39,35 +39,35 @@
    "etherpad-require-kernel": "^1.0.15",
    "etherpad-yajsml": "0.0.12",
    "express": "4.18.2",
-    "express-rate-limit": "^7.1.3",
-    "express-session": "npm:@etherpad/express-session@^1.18.2",
+    "express-rate-limit": "^6.7.0",
+    "express-session": "npm:@etherpad/express-session@^1.18.1",
    "fast-deep-equal": "^3.1.3",
    "find-root": "1.1.0",
-    "formidable": "^3.5.1",
+    "formidable": "^2.1.2",
    "http-errors": "^2.0.0",
    "js-cookie": "^3.0.5",
    "jsdom": "^20.0.0",
    "jsonminify": "0.4.2",
    "languages4translatewiki": "0.1.3",
    "lodash.clonedeep": "4.5.0",
-    "log4js": "^6.9.1",
+    "log4js": "0.6.38",
    "measured-core": "^2.0.0",
    "mime-types": "^2.1.35",
    "npm": "^6.14.18",
-    "openapi-backend": "^5.10.5",
+    "openapi-backend": "^5.9.2",
    "proxy-addr": "^2.0.7",
-    "rate-limiter-flexible": "^3.0.3",
-    "rehype": "^13.0.1",
-    "rehype-minify-whitespace": "^6.0.0",
-    "resolve": "1.22.8",
+    "rate-limiter-flexible": "^2.4.1",
+    "rehype": "^12.0.1",
+    "rehype-minify-whitespace": "^5.0.1",
+    "resolve": "1.22.2",
    "security": "1.0.0",
-    "semver": "^7.5.4",
+    "semver": "^7.5.3",
    "socket.io": "^2.5.0",
-    "superagent": "^8.1.2",
-    "terser": "^5.24.0",
+    "superagent": "^8.0.9",
+    "terser": "^5.18.2",
    "threads": "^1.7.0",
    "tinycon": "0.6.8",
-    "ueberdb2": "^4.2.35",
+    "ueberdb2-ts": "^4.0.14",
    "underscore": "1.13.6",
    "unorm": "1.6.0",
    "wtfnode": "^0.9.1"
@ -78,16 +78,16 @@
    "etherpad-lite": "node/server.js"
  },
  "devDependencies": {
-    "eslint": "^8.52.0",
-    "eslint-config-etherpad": "^3.0.22",
+    "eslint": "^8.43.0",
+    "eslint-config-etherpad": "^3.0.15",
    "etherpad-cli-client": "^2.0.2",
    "mocha": "^10.0.0",
    "mocha-froth": "^0.2.10",
    "nodeify": "^1.0.1",
    "openapi-schema-validation": "^0.4.2",
-    "selenium-webdriver": "^4.15.0",
+    "selenium-webdriver": "^4.10.0",
    "set-cookie-parser": "^2.6.0",
-    "sinon": "^17.0.1",
+    "sinon": "^15.2.0",
    "split-grid": "^1.0.11",
    "supertest": "^6.3.3",
    "typescript": "^4.9.5"
@ -105,6 +105,6 @@
    "test": "mocha --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
    "test-container": "mocha --timeout 5000 tests/container/specs/api"
  },
-  "version": "1.9.4",
+  "version": "1.9.1",
  "license": "Apache-2.0"
 }
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@ -2585,17 +2585,17 @@ function Ace2Inner(editorInfo, cssManagers) {
          const firstEditbarElement = parent.parent.$('#editbar')
              .children('ul').first().children().first()
              .children().first().children().first();
-          $(this).trigger('blur');
-          firstEditbarElement.trigger('focus');
+          $(this).blur();
+          firstEditbarElement.focus();
          evt.preventDefault();
        }
        if (!specialHandled && type === 'keydown' &&
            altKey && keyCode === 67 &&
            padShortcutEnabled.altC) {
          // Alt c focuses on the Chat window
-          $(this).trigger('blur');
+          $(this).blur();
          parent.parent.chat.show();
-          parent.parent.$('#chatinput').trigger('focus');
+          parent.parent.$('#chatinput').focus();
          evt.preventDefault();
        }
        if (!specialHandled && type === 'keydown' &&
--- a/src/static/js/admin/jquery.autosize.js
+++ b/src/static/js/admin/jquery.autosize.js
@ -164,7 +164,7 @@
 				$(window).resize(adjust);

 				// Allow for manual triggering if needed.
-				$ta.on('autosize', adjust);
+				$ta.bind('autosize', adjust);

 				// Call adjust in case the textarea already contains text.
 				adjust();
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@ -112,15 +112,15 @@ $(document).ready(() => {

  const updateHandlers = () => {
    // Search
-    $('#search-query').off('keyup').on('keyup', () => {
+    $('#search-query').unbind('keyup').keyup(() => {
      search($('#search-query').val());
    });

    // Prevent form submit
-    $('#search-query').parent().on('submit', () => false);
+    $('#search-query').parent().bind('submit', () => false);

    // update & install
-    $('.do-install, .do-update').off('click').on('click', function (e) {
+    $('.do-install, .do-update').unbind('click').click(function (e) {
      const $row = $(e.target).closest('tr');
      const plugin = $row.data('plugin');
      if ($(this).hasClass('do-install')) {
@ -134,7 +134,7 @@ $(document).ready(() => {
    });

    // uninstall
-    $('.do-uninstall').off('click').on('click', (e) => {
+    $('.do-uninstall').unbind('click').click((e) => {
      const $row = $(e.target).closest('tr');
      const pluginName = $row.data('plugin');
      socket.emit('uninstall', pluginName);
@ -143,14 +143,14 @@ $(document).ready(() => {
    });

    // Sort
-    $('.sort.up').off('click').on('click', function () {
+    $('.sort.up').unbind('click').click(function () {
      search.sortBy = $(this).attr('data-label').toLowerCase();
      search.sortDir = false;
      search.offset = 0;
      search(search.searchTerm, search.results.length);
      search.results = [];
    });
-    $('.sort.down, .sort.none').off('click').on('click', function () {
+    $('.sort.down, .sort.none').unbind('click').click(function () {
      search.sortBy = $(this).attr('data-label').toLowerCase();
      search.sortDir = true;
      search.offset = 0;
@ -164,7 +164,7 @@ $(document).ready(() => {
    if (data.query.offset === 0) search.results = [];
    search.messages.hide('nothing-found');
    search.messages.hide('fetching');
-    $('#search-query').prop('disabled', false);
+    $('#search-query').removeAttr('disabled');

    console.log('got search results', data);

--- a/src/static/js/admin/settings.js
+++ b/src/static/js/admin/settings.js
@ -25,7 +25,7 @@ $(document).ready(() => {
    /* Check to make sure the JSON is clean before proceeding */
    if (isJSONClean(settings.results)) {
      $('.settings').append(settings.results);
-      $('.settings').trigger('focus');
+      $('.settings').focus();
      $('.settings').autosize();
    } else {
      alert('Invalid JSON');
@ -40,7 +40,7 @@ $(document).ready(() => {
      socket.emit('saveSettings', $('.settings').val());
    } else {
      alert('Invalid JSON');
-      $('.settings').trigger('focus');
+      $('.settings').focus();
    }
  });

@ -62,7 +62,7 @@ const isJSONClean = (data) => {
  // this is a bit naive. In theory some key/value might contain the sequences ',]' or ',}'
  cleanSettings = cleanSettings.replace(',]', ']').replace(',}', '}');
  try {
-    return typeof JSON.parse(cleanSettings) === 'object';
+    return typeof jQuery.parseJSON(cleanSettings) === 'object';
  } catch (e) {
    return false; // the JSON failed to be parsed
  }
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@ -67,7 +67,7 @@ const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => {
      newSavedRevision.css(
          'left', (position * ($('#ui-slider-bar').width() - 2) / (sliderLength * 1.0)) - 1);
      $('#ui-slider-bar').append(newSavedRevision);
-      newSavedRevision.on('mouseup', (evt) => {
+      newSavedRevision.mouseup((evt) => {
        BroadcastSlider.setSliderPosition(position);
      });
      savedRevisions.push(newSavedRevision);
@ -209,21 +209,21 @@ const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => {

    // assign event handlers to html UI elements after page load
    fireWhenAllScriptsAreLoaded.push(() => {
-      $(document).on('keyup', (e) => {
+      $(document).keyup((e) => {
        if (!e) e = window.event;
        const code = e.keyCode || e.which;

        if (code === 37) { // left
          if (e.shiftKey) {
-            $('#leftstar').trigger('click');
+            $('#leftstar').click();
          } else {
-            $('#leftstep').trigger('click');
+            $('#leftstep').click();
          }
        } else if (code === 39) { // right
          if (e.shiftKey) {
-            $('#rightstar').trigger('click');
+            $('#rightstar').click();
          } else {
-            $('#rightstep').trigger('click');
+            $('#rightstep').click();
          }
        } else if (code === 32) { // spacebar
          $('#playpause_button_icon').trigger('click');
@ -231,22 +231,22 @@ const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => {
      });

      // Resize
-      $(window).on('resize', () => {
+      $(window).resize(() => {
        updateSliderElements();
      });

      // Slider click
-      $('#ui-slider-bar').on('mousedown', (evt) => {
+      $('#ui-slider-bar').mousedown((evt) => {
        $('#ui-slider-handle').css('left', (evt.clientX - $('#ui-slider-bar').offset().left));
        $('#ui-slider-handle').trigger(evt);
      });

      // Slider dragging
-      $('#ui-slider-handle').on('mousedown', function (evt) {
+      $('#ui-slider-handle').mousedown(function (evt) {
        this.startLoc = evt.clientX;
        this.currentLoc = parseInt($(this).css('left'));
        sliderActive = true;
-        $(document).on('mousemove', (evt2) => {
+        $(document).mousemove((evt2) => {
          $(this).css('pointer', 'move');
          let newloc = this.currentLoc + (evt2.clientX - this.startLoc);
          if (newloc < 0) newloc = 0;
@ -257,9 +257,9 @@ const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => {
          $(this).css('left', newloc);
          if (getSliderPosition() !== version) _callSliderCallbacks(version);
        });
-        $(document).on('mouseup', (evt2) => {
-          $(document).off('mousemove');
-          $(document).off('mouseup');
+        $(document).mouseup((evt2) => {
+          $(document).unbind('mousemove');
+          $(document).unbind('mouseup');
          sliderActive = false;
          let newloc = this.currentLoc + (evt2.clientX - this.startLoc);
          if (newloc < 0) newloc = 0;
@ -276,12 +276,12 @@ const loadBroadcastSliderJS = (fireWhenAllScriptsAreLoaded) => {
      });

      // play/pause toggling
-      $('#playpause_button_icon').on('click', (evt) => {
+      $('#playpause_button_icon').click((evt) => {
        BroadcastSlider.playpause();
      });

      // next/prev saved revision and changeset
-      $('.stepper').on('click', function (evt) {
+      $('.stepper').click(function (evt) {
        switch ($(this).attr('id')) {
          case 'leftstep':
            setSliderPosition(getSliderPosition() - 1);
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@ -42,14 +42,11 @@ exports.chat = (() => {
    },
    focus: () => {
      setTimeout(() => {
-        $('#chatinput').trigger('focus');
+        $('#chatinput').focus();
      }, 100);
    },
    // Make chat stick to right hand side of screen
    stickToScreen(fromInitialCall) {
-      if ($('#options-stickychat').prop('checked')) {
-        $('#options-stickychat').prop('checked', false);
-      }
      if (pad.settings.hideChat) {
        return;
      }
@ -71,7 +68,7 @@ exports.chat = (() => {
        this.stickToScreen(true);
        $('#options-stickychat').prop('checked', true);
        $('#options-chatandusers').prop('checked', true);
-        $('#options-stickychat').prop('disabled', true);
+        $('#options-stickychat').prop('disabled', 'disabled');
        userAndChat = true;
      } else {
        $('#options-stickychat').prop('disabled', false);
@ -226,14 +223,14 @@ exports.chat = (() => {
        // Send the users focus back to the pad
        if ((evt.altKey === true && evt.which === 67) || evt.which === 27) {
          // If we're in chat already..
-          $(':focus').trigger('blur'); // required to do not try to remove!
+          $(':focus').blur(); // required to do not try to remove!
          padeditor.ace.focus(); // Sends focus back to pad
          evt.preventDefault();
          return false;
        }
      });
      // Clear the chat mentions when the user clicks on the chat input box
-      $('#chatinput').on('click', () => {
+      $('#chatinput').click(() => {
        chatMentions = 0;
        Tinycon.setBubble(0);
      });
@ -242,14 +239,14 @@ exports.chat = (() => {
      $('body:not(#chatinput)').on('keypress', function (evt) {
        if (evt.altKey && evt.which === 67) {
          // Alt c focuses on the Chat window
-          $(this).trigger('blur');
+          $(this).blur();
          self.show();
-          $('#chatinput').trigger('focus');
+          $('#chatinput').focus();
          evt.preventDefault();
        }
      });

-      $('#chatinput').on('keypress', (evt) => {
+      $('#chatinput').keypress((evt) => {
        // if the user typed enter, fire the send
        if (evt.key === 'Enter' && !evt.shiftKey) {
          evt.preventDefault();
@ -260,7 +257,7 @@ exports.chat = (() => {
      // initial messages are loaded in pad.js' _afterHandshake

      $('#chatcounter').text(0);
-      $('#chatloadmessagesbutton').on('click', () => {
+      $('#chatloadmessagesbutton').click(() => {
        const start = Math.max(this.historyPointer - 20, 0);
        const end = this.historyPointer;

--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@ -66,7 +66,7 @@ const getCollabClient = (ace2editor, serverVars, initialUserInfo, options, _pad)
  if (browser.firefox) {
    // Prevent "escape" from taking effect and canceling a comet connection;
    // doesn't work if focus is on an iframe.
-    $(window).on('keydown', (evt) => {
+    $(window).bind('keydown', (evt) => {
      if (evt.which === 27) {
        evt.preventDefault();
      }
--- a/src/static/js/index.js
+++ b/src/static/js/index.js
@ -41,7 +41,7 @@ const randomPadName = () => {
 };

 $(() => {
-  $('#go2Name').on('submit', () => {
+  $('#go2Name').submit(() => {
    const padname = $('#padname').val();
    if (padname.length > 0) {
      window.location = `p/${encodeURIComponent(padname.trim())}`;
@ -51,7 +51,7 @@ $(() => {
    return false;
  });

-  $('#button').on('click', () => {
+  $('#button').click(() => {
    window.location = `p/${randomPadName()}`;
  });

--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@ -412,12 +412,10 @@ const pad = {
      setTimeout(() => {
        padeditor.ace.focus();
      }, 0);
-      const optionsStickyChat = $('#options-stickychat');
-      optionsStickyChat.on('click', () => { chat.stickToScreen(); });
      // if we have a cookie for always showing chat then show it
      if (padcookie.getPref('chatAlwaysVisible')) {
        chat.stickToScreen(true); // stick it to the screen
-        optionsStickyChat.prop('checked', true); // set the checkbox to on
+        $('#options-stickychat').prop('checked', true); // set the checkbox to on
      }
      // if we have a cookie for always showing chat then show it
      if (padcookie.getPref('chatAndUsers')) {
@ -439,8 +437,8 @@ const pad = {
      // Prevent sticky chat or chat and users to be checked for mobiles
      const checkChatAndUsersVisibility = (x) => {
        if (x.matches) { // If media query matches
-          $('#options-chatandusers:checked').trigger('click');
-          $('#options-stickychat:checked').trigger('click');
+          $('#options-chatandusers:checked').click();
+          $('#options-stickychat:checked').click();
        }
      };
      const mobileMatch = window.matchMedia('(max-width: 800px)');
@ -713,7 +711,7 @@ const pad = {
    $('form#reconnectform input.diagnosticInfo').val(JSON.stringify(pad.diagnosticInfo));
    $('form#reconnectform input.missedChanges')
        .val(JSON.stringify(pad.collabClient.getMissedChanges()));
-    $('form#reconnectform').trigger('submit');
+    $('form#reconnectform').submit();
  },
  callWhenNotCommitting: (f) => {
    pad.collabClient.callWhenNotCommitting(f);
--- a/src/static/js/pad_automatic_reconnect.js
+++ b/src/static/js/pad_automatic_reconnect.js
@ -96,7 +96,7 @@ const whenConnectionIsRestablishedWithServer = (callback, pad) => {
 };

 const forceReconnection = ($modal) => {
-  $modal.find('#forcereconnect').trigger('click');
+  $modal.find('#forcereconnect').click();
 };

 const updateCountDownTimerMessage = ($modal, minutes, seconds) => {
--- a/src/static/js/pad_connectionstatus.js
+++ b/src/static/js/pad_connectionstatus.js
@ -31,7 +31,7 @@ const padconnectionstatus = (() => {

  const self = {
    init: () => {
-      $('button#forcereconnect').on('click', () => {
+      $('button#forcereconnect').click(() => {
        window.location.reload();
      });
    },
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@ -65,13 +65,13 @@ class ToolbarItem {

  bind(callback) {
    if (this.isButton()) {
-      this.$el.on('click', (event) => {
-        $(':focus').trigger('blur');
+      this.$el.click((event) => {
+        $(':focus').blur();
        callback(this.getCommand(), this);
        event.preventDefault();
      });
    } else if (this.isSelect()) {
-      this.$el.find('select').on('change', () => {
+      this.$el.find('select').change(() => {
        callback(this.getCommand(), this);
      });
    }
@ -134,7 +134,7 @@ exports.padeditbar = new class {
    $('#editbar .editbarbutton').attr('unselectable', 'on'); // for IE
    this.enable();
    $('#editbar [data-key]').each((i, elt) => {
-      $(elt).off('click');
+      $(elt).unbind('click');
      new ToolbarItem($(elt)).bind((command, item) => {
        this.triggerCommand(command, item);
      });
@ -144,11 +144,11 @@ exports.padeditbar = new class {
      this._bodyKeyEvent(evt);
    });

-    $('.show-more-icon-btn').on('click', () => {
+    $('.show-more-icon-btn').click(() => {
      $('.toolbar').toggleClass('full-icons');
    });
    this.checkAllIconsAreDisplayedInToolbar();
-    $(window).on('resize', _.debounce(() => this.checkAllIconsAreDisplayedInToolbar(), 100));
+    $(window).resize(_.debounce(() => this.checkAllIconsAreDisplayedInToolbar(), 100));

    this._registerDefaultCommands();

@ -168,7 +168,7 @@ exports.padeditbar = new class {
    }

    // When editor is scrolled, we add a class to style the editbar differently
-    $('iframe[name="ace_outer"]').contents().on('scroll', (ev) => {
+    $('iframe[name="ace_outer"]').contents().scroll((ev) => {
      $('#editbar').toggleClass('editor-scrolled', $(ev.currentTarget).scrollTop() > 2);
    });
  }
@ -305,12 +305,12 @@ exports.padeditbar = new class {
        // Close any dropdowns we have open..
        this.toggleDropDown('none');
        // Shift focus away from any drop downs
-        $(':focus').trigger('blur'); // required to do not try to remove!
+        $(':focus').blur(); // required to do not try to remove!
        // Check we're on a pad and not on the timeslider
        // Or some other window I haven't thought about!
        if (typeof pad === 'undefined') {
          // Timeslider probably..
-          $('#editorcontainerbox').trigger('focus'); // Focus back onto the pad
+          $('#editorcontainerbox').focus(); // Focus back onto the pad
        } else {
          padeditor.ace.focus(); // Sends focus back to pad
          // The above focus doesn't always work in FF, you have to hit enter afterwards
@ -318,10 +318,10 @@ exports.padeditbar = new class {
        }
      } else {
        // Focus on the editbar :)
-        const firstEditbarElement = $('#editbar button').first();
+        const firstEditbarElement = parent.parent.$('#editbar button').first();

-        $(evt.currentTarget).trigger('blur');
-        firstEditbarElement.trigger('focus');
+        $(evt.currentTarget).blur();
+        firstEditbarElement.focus();
        evt.preventDefault();
      }
    }
@ -341,7 +341,7 @@ exports.padeditbar = new class {
        this._editbarPosition--;
        // Allow focus to shift back to end of row and start of row
        if (this._editbarPosition === -1) this._editbarPosition = focusItems.length - 1;
-        $(focusItems[this._editbarPosition]).trigger('focus');
+        $(focusItems[this._editbarPosition]).focus();
      }

      // On right arrow move to next button in editbar
@ -352,7 +352,7 @@ exports.padeditbar = new class {
        this._editbarPosition++;
        // Allow focus to shift back to end of row and start of row
        if (this._editbarPosition >= focusItems.length) this._editbarPosition = 0;
-        $(focusItems[this._editbarPosition]).trigger('focus');
+        $(focusItems[this._editbarPosition]).focus();
      }
    }
  }
@ -366,7 +366,7 @@ exports.padeditbar = new class {

    this.registerCommand('settings', () => {
      this.toggleDropDown('settings');
-      $('#options-stickychat').trigger('focus');
+      $('#options-stickychat').focus();
    });

    this.registerCommand('import_export', () => {
@ -374,22 +374,22 @@ exports.padeditbar = new class {
      // If Import file input exists then focus on it..
      if ($('#importfileinput').length !== 0) {
        setTimeout(() => {
-          $('#importfileinput').trigger('focus');
+          $('#importfileinput').focus();
        }, 100);
      } else {
-        $('.exportlink').first().trigger('focus');
+        $('.exportlink').first().focus();
      }
    });

    this.registerCommand('showusers', () => {
      this.toggleDropDown('users');
-      $('#myusernameedit').trigger('focus');
+      $('#myusernameedit').focus();
    });

    this.registerCommand('embed', () => {
      this.setEmbedLinks();
      this.toggleDropDown('embed');
-      $('#linkinput').trigger('focus').trigger('select');
+      $('#linkinput').focus().select();
    });

    this.registerCommand('savedRevision', () => {
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@ -76,7 +76,7 @@ const padeditor = (() => {
      });

      // font family change
-      $('#viewfontmenu').on('change', () => {
+      $('#viewfontmenu').change(() => {
        pad.changeViewOption('padFontFamily', $('#viewfontmenu').val());
      });

@ -97,7 +97,7 @@ const padeditor = (() => {
        });
      });
      $('#languagemenu').val(html10n.getLanguage());
-      $('#languagemenu').on('change', () => {
+      $('#languagemenu').change(() => {
        Cookies.set('language', $('#languagemenu').val());
        window.html10n.localize([$('#languagemenu').val(), 'en']);
        if ($('select').niceSelect) {
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@ -38,7 +38,7 @@ const padimpexp = (() => {
  const fileInputUpdated = () => {
    $('#importsubmitinput').addClass('throbbold');
    $('#importformfilediv').addClass('importformenabled');
-    $('#importsubmitinput').prop('disabled', false);
+    $('#importsubmitinput').removeAttr('disabled');
    $('#importmessagefail').fadeOut('fast');
  };

@ -69,8 +69,8 @@ const padimpexp = (() => {
        $('#import_export').removeClass('popup-show');
        if (directDatabaseAccess) window.location.reload();
      }
-      $('#importsubmitinput').prop('disabled', false).val(html10n.get('pad.impexp.importbutton'));
-      window.setTimeout(() => $('#importfileinput').prop('disabled', false), 0);
+      $('#importsubmitinput').removeAttr('disabled').val(html10n.get('pad.impexp.importbutton'));
+      window.setTimeout(() => $('#importfileinput').removeAttr('disabled'), 0);
      $('#importstatusball').hide();
      addImportFrames();
    })();
@ -162,9 +162,9 @@ const padimpexp = (() => {
      }

      addImportFrames();
-      $('#importfileinput').on('change', fileInputUpdated);
-      $('#importform').off('submit').on('submit', fileInputSubmit);
-      $('.disabledexport').on('click', cantExport);
+      $('#importfileinput').change(fileInputUpdated);
+      $('#importform').unbind('submit').submit(fileInputSubmit);
+      $('.disabledexport').click(cantExport);
    },
    disable: () => {
      $('#impexp-disabled-clickcatcher').show();
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@ -325,23 +325,23 @@ const paduserlist = (() => {
  };

  const setUpEditable = (jqueryNode, valueGetter, valueSetter) => {
-    jqueryNode.on('focus', (evt) => {
+    jqueryNode.bind('focus', (evt) => {
      const oldValue = valueGetter();
      if (jqueryNode.val() !== oldValue) {
        jqueryNode.val(oldValue);
      }
      jqueryNode.addClass('editactive').removeClass('editempty');
    });
-    jqueryNode.on('blur', (evt) => {
+    jqueryNode.bind('blur', (evt) => {
      const newValue = jqueryNode.removeClass('editactive').val();
      valueSetter(newValue);
    });
    padutils.bindEnterAndEscape(jqueryNode, () => {
-      jqueryNode.trigger('blur');
+      jqueryNode.blur();
    }, () => {
-      jqueryNode.val(valueGetter()).trigger('blur');
+      jqueryNode.val(valueGetter()).blur();
    });
-    jqueryNode.prop('disabled', false).addClass('editable');
+    jqueryNode.removeAttr('disabled').addClass('editable');
  };

  let pad = undefined;
@ -369,15 +369,15 @@ const paduserlist = (() => {
      });

      // color picker
-      $('#myswatchbox').on('click', showColorPicker);
-      $('#mycolorpicker .pickerswatchouter').on('click', function () {
+      $('#myswatchbox').click(showColorPicker);
+      $('#mycolorpicker .pickerswatchouter').click(function () {
        $('#mycolorpicker .pickerswatchouter').removeClass('picked');
        $(this).addClass('picked');
      });
-      $('#mycolorpickersave').on('click', () => {
+      $('#mycolorpickersave').click(() => {
        closeColorPicker(true);
      });
-      $('#mycolorpickercancel').on('click', () => {
+      $('#mycolorpickercancel').click(() => {
        closeColorPicker(false);
      });
      //
@ -587,7 +587,7 @@ const showColorPicker = () => {

        li.appendTo(colorsList);

-        li.on('click', (event) => {
+        li.bind('click', (event) => {
          $('#colorpickerswatches li').removeClass('picked');
          $(event.target).addClass('picked');

--- a/src/static/js/pad_utils.js
+++ b/src/static/js/pad_utils.js
@ -224,7 +224,7 @@ const padutils = {
    // It is work on Windows (IE8, Chrome 6.0.472), CentOs (Firefox 3.0) and Mac OSX (Firefox
    // 3.6.10, Chrome 6.0.472, Safari 5.0).
    if (onEnter) {
-      node.on('keypress', (evt) => {
+      node.keypress((evt) => {
        if (evt.which === 13) {
          onEnter(evt);
        }
@ -232,7 +232,7 @@ const padutils = {
    }

    if (onEscape) {
-      node.on('keydown', (evt) => {
+      node.keydown((evt) => {
        if (evt.which === 27) {
          onEscape(evt);
        }
@ -299,7 +299,7 @@ const padutils = {
      }
      field.removeClass('editempty');
    });
-    field.on('blur', () => {
+    field.blur(() => {
      if (!field.val()) {
        clear();
      }
@ -313,11 +313,11 @@ const padutils = {
    if (value) {
      $(node).attr('checked', 'checked');
    } else {
-      $(node).prop('checked', false);
+      $(node).removeAttr('checked');
    }
  },
  bindCheckboxChange: (node, func) => {
-    $(node).on('change', func);
+    $(node).change(func);
  },
  encodeUserId: (userId) => userId.replace(/[^a-y0-9]/g, (c) => {
    if (c === '.') return '-';
--- a/src/static/js/skin_variants.js
+++ b/src/static/js/skin_variants.js
@ -46,7 +46,7 @@ if (window.location.hash.toLowerCase() === '#skinvariantsbuilder') {
    $('#skin-variant-full-width').prop('checked', $('html').hasClass('full-width-editor'));
  };

-  $('.skin-variant').on('change', () => {
+  $('.skin-variant').change(() => {
    updateSkinVariantsClasses();
  });

--- a/src/static/js/timeslider.js
+++ b/src/static/js/timeslider.js
@ -82,7 +82,7 @@ const init = () => {
    // get all the export links
    exportLinks = $('#export > .exportlink');

-    $('button#forcereconnect').on('click', () => {
+    $('button#forcereconnect').click(() => {
      window.location.reload();
    });

@ -159,7 +159,7 @@ const handleClientVars = (message) => {
  $('#rightstep').attr('title', html10n.get('timeslider.forwardRevision'));

  // font family change
-  $('#viewfontmenu').on('change', function () {
+  $('#viewfontmenu').change(function () {
    $('#innerdocbody').css('font-family', $(this).val() || '');
  });
 };
--- a/src/static/js/vendors/farbtastic.js
+++ b/src/static/js/vendors/farbtastic.js
@ -33,7 +33,7 @@ $._farbtastic = function (container, options) {
  fb.linkTo = function (callback) {
    // Unbind previous nodes
    if (typeof fb.callback == 'object') {
-      $(fb.callback).off('keyup').on('keyup', fb.updateValue);
+      $(fb.callback).unbind('keyup', fb.updateValue);
    }

    // Reset color
@ -45,7 +45,7 @@ $._farbtastic = function (container, options) {
    }
    else if (typeof callback == 'object' || typeof callback == 'string') {
      fb.callback = $(callback);
-      fb.callback.on('keyup', fb.updateValue);
+      fb.callback.bind('keyup', fb.updateValue);
      if (fb.callback[0].value) {
        fb.setColor(fb.callback[0].value);
      }
@ -388,7 +388,7 @@ $._farbtastic = function (container, options) {
  fb.mousedown = function (event) {
    // Capture mouse
    if (!$._farbtastic.dragging) {
-      $(document).on('mousemove', fb.mousemove).on('mouseup', fb.mouseup);
+      $(document).bind('mousemove', fb.mousemove).bind('mouseup', fb.mouseup);
      $._farbtastic.dragging = true;
    }

@ -429,8 +429,8 @@ $._farbtastic = function (container, options) {
   */
  fb.mouseup = function () {
    // Uncapture mouse
-    $(document).off('mousemove', fb.mousemove);
-    $(document).off('mouseup',  fb.mouseup);
+    $(document).unbind('mousemove', fb.mousemove);
+    $(document).unbind('mouseup', fb.mouseup);
    $._farbtastic.dragging = false;
  }

@ -519,7 +519,7 @@ $._farbtastic = function (container, options) {
  fb.initWidget();

  // Install mousedown handler (the others are set on the document on-demand)
-  $('canvas.farbtastic-overlay', container).on('mousedown',fb.mousedown);
+  $('canvas.farbtastic-overlay', container).mousedown(fb.mousedown);

  // Set linked elements/callback
  if (options.callback) {
--- a/src/static/js/vendors/jquery.js
+++ b/src/static/js/vendors/jquery.js
--- a/src/static/js/vendors/nice-select.js
+++ b/src/static/js/vendors/nice-select.js
@ -123,7 +123,7 @@
        $dropdown.find('.list').css('max-height', $maxListHeight + 'px');

      } else {
-        $dropdown.trigger('focus');
+        $dropdown.focus();
      }
    });

--- a/src/static/skins/colibris/pad.js
+++ b/src/static/skins/colibris/pad.js
@ -2,6 +2,6 @@

 window.customStart = () => {
  $('#pad_title').show();
-  $('.buttonicon').on('mousedown', function () { $(this).parent().addClass('pressed'); });
-  $('.buttonicon').on('mouseup', function () { $(this).parent().removeClass('pressed'); });
+  $('.buttonicon').mousedown(function () { $(this).parent().addClass('pressed'); });
+  $('.buttonicon').mouseup(function () { $(this).parent().removeClass('pressed'); });
 };
--- a/src/templates/export_html.html
+++ b/src/templates/export_html.html
@ -2,10 +2,10 @@
 <html lang="en">
 <head>
 <title><%- padId %></title>
-<meta name="generator" content="Etherpad"/>
-<meta name="author" content="Etherpad"/>
-<meta name="changedby" content="Etherpad"/>
-<meta charset="utf-8"/>
+<meta name="generator" content="Etherpad">
+<meta name="author" content="Etherpad">
+<meta name="changedby" content="Etherpad">
+<meta charset="utf-8">
 <style>
 ol {
  counter-reset: item;
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@ -122,7 +122,7 @@
          <% e.begin_block("mySettings"); %>
          <h2 data-l10n-id="pad.settings.myView"></h2>
          <p class="hide-for-mobile">
-              <input type="checkbox" id="options-stickychat">
+              <input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
              <label for="options-stickychat" data-l10n-id="pad.settings.stickychat"></label>
          </p>
          <p class="hide-for-mobile">
--- a/src/tests/backend/common.js
+++ b/src/tests/backend/common.js
@ -42,6 +42,8 @@ exports.init = async function () {
  if (!logLevel.isLessThanOrEqualTo(log4js.levels.DEBUG)) {
    logger.warn('Disabling non-test logging for the duration of the test. ' +
                'To enable non-test logging, change the loglevel setting to DEBUG.');
+    log4js.setGlobalLogLevel(log4js.levels.OFF);
+    logger.setLevel(logLevel);
  }

  // Note: This is only a shallow backup.
@ -49,7 +51,7 @@ exports.init = async function () {
  // Start the Etherpad server on a random unused port.
  settings.port = 0;
  settings.ip = 'localhost';
-  settings.importExportRateLimiting = {max: 999999};
+  settings.importExportRateLimiting = {max: 0};
  settings.commitRateLimiting = {duration: 0.001, points: 1e6};
  exports.httpServer = await server.start();
  exports.baseUrl = `http://localhost:${exports.httpServer.address().port}`;
@ -64,6 +66,7 @@ exports.init = async function () {
    webaccess.authnFailureDelayMs = backups.authnFailureDelayMs;
    // Note: This does not unset settings that were added.
    Object.assign(settings, backups.settings);
+    log4js.setGlobalLogLevel(logLevel);
    await server.exit();
  });

--- a/src/tests/backend/specs/SecretRotator.js
+++ b/src/tests/backend/specs/SecretRotator.js
@ -1,555 +0,0 @@
-'use strict';
-
-const SecretRotator = require('../../../node/security/SecretRotator');
-const assert = require('assert').strict;
-const common = require('../common');
-const crypto = require('../../../node/security/crypto');
-const db = require('../../../node/db/DB');
-
-const logger = common.logger;
-
-// Greatest common divisor.
-const gcd = (...args) => (
-  args.length === 1 ? args[0]
-  : args.length === 2 ? ((args[1]) ? gcd(args[1], args[0] % args[1]) : Math.abs(args[0]))
-  : gcd(args[0], gcd(...args.slice(1))));
-// Least common multiple.
-const lcm = (...args) => (
-  args.length === 1 ? args[0]
-  : args.length === 2 ? Math.abs(args[0] * args[1]) / gcd(...args)
-  : lcm(args[0], lcm(...args.slice(1))));
-
-class FakeClock {
-  constructor() {
-    logger.debug('new fake clock');
-    this._now = 0;
-    this._nextId = 1;
-    this._idle = Promise.resolve();
-    this.timeouts = new Map();
-  }
-
-  _next() { return Math.min(...[...this.timeouts.values()].map((x) => x.when)); }
-  async setNow(t) {
-    logger.debug(`setting fake time to ${t}`);
-    assert(t >= this._now);
-    assert(t < Infinity);
-    let n;
-    while ((n = this._next()) <= t) {
-      this._now = Math.max(this._now, Math.min(n, t));
-      logger.debug(`fake time set to ${this._now}; firing timeouts...`);
-      await this._fire();
-    }
-    this._now = t;
-    logger.debug(`fake time set to ${this._now}`);
-  }
-  async advance(t) { await this.setNow(this._now + t); }
-  async advanceToNext() {
-    const n = this._next();
-    if (n < this._now) await this._fire();
-    else if (n < Infinity) await this.setNow(n);
-  }
-  async _fire() {
-    // This method MUST NOT execute any of the setTimeout callbacks synchronously, otherwise
-    // fc.setTimeout(fn, 0) would execute fn before fc.setTimeout() returns. Fortunately, the
-    // ECMAScript standard guarantees that a function passed to Promise.prototype.then() will run
-    // asynchronously.
-    this._idle = this._idle.then(() => Promise.all(
-        [...this.timeouts.values()]
-            .filter(({when}) => when <= this._now)
-            .sort((a, b) => a.when - b.when)
-            .map(async ({id, fn}) => {
-              this.clearTimeout(id);
-              // With the standard setTimeout(), the callback function's return value is ignored.
-              // Here we await the return value so that test code can block until timeout work is
-              // done.
-              await fn();
-            })));
-    await this._idle;
-  }
-
-  get now() { return this._now; }
-  setTimeout(fn, wait = 0) {
-    const when = this._now + wait;
-    const id = this._nextId++;
-    this.timeouts.set(id, {id, fn, when});
-    this._fire();
-    return id;
-  }
-  clearTimeout(id) { this.timeouts.delete(id); }
-}
-
-// In JavaScript, the % operator is remainder, not modulus.
-const mod = (a, n) => ((a % n) + n) % n;
-
-describe(__filename, function () {
-  let dbPrefix;
-  let sr;
-  let interval = 1e3;
-  const lifetime = 1e4;
-  const intervalStart = (t) => t - mod(t, interval);
-  const hkdf = async (secret, salt, tN) => Buffer.from(
-      await crypto.hkdf('sha256', secret, salt, `${tN}`, 32)).toString('hex');
-
-  const newRotator = (s = null) => new SecretRotator(dbPrefix, interval, lifetime, s);
-
-  const setFakeClock = (sr, fc = null) => {
-    if (fc == null) fc = new FakeClock();
-    sr._t = {
-      now: () => fc.now,
-      setTimeout: fc.setTimeout.bind(fc),
-      clearTimeout: fc.clearTimeout.bind(fc),
-    };
-    return fc;
-  };
-
-  before(async function () {
-    await common.init();
-  });
-
-  beforeEach(async function () {
-    dbPrefix = `test-SecretRotator-${common.randomString()}`;
-    interval = 1e3;
-  });
-
-  afterEach(async function () {
-    if (sr != null) sr.stop();
-    sr = null;
-    await Promise.all(
-        (await db.findKeys(`${dbPrefix}:*`, null)).map(async (dbKey) => await db.remove(dbKey)));
-  });
-
-  describe('constructor', function () {
-    it('creates empty secrets array', async function () {
-      sr = newRotator();
-      assert.deepEqual(sr.secrets, []);
-    });
-
-    for (const invalidChar of '*:%') {
-      it(`rejects database prefixes containing ${invalidChar}`, async function () {
-        dbPrefix += invalidChar;
-        assert.throws(newRotator, /invalid char/);
-      });
-    }
-  });
-
-  describe('start', function () {
-    it('does not replace secrets array', async function () {
-      sr = newRotator();
-      setFakeClock(sr);
-      const {secrets} = sr;
-      await sr.start();
-      assert.equal(sr.secrets, secrets);
-    });
-
-    it('derives secrets', async function () {
-      sr = newRotator();
-      setFakeClock(sr);
-      await sr.start();
-      assert.equal(sr.secrets.length, 3); // Current (active), previous, and next.
-      for (const s of sr.secrets) {
-        assert.equal(typeof s, 'string');
-        assert(s);
-      }
-      assert.equal(new Set(sr.secrets).size, sr.secrets.length); // The secrets should all differ.
-    });
-
-    it('publishes params', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const dbKeys = await db.findKeys(`${dbPrefix}:*`, null);
-      assert.equal(dbKeys.length, 1);
-      const [id] = dbKeys;
-      assert(id.startsWith(`${dbPrefix}:`));
-      assert.notEqual(id.slice(dbPrefix.length + 1), '');
-      const p = await db.get(id);
-      const {secret, salt} = p.algParams;
-      assert.deepEqual(p, {
-        algId: 1,
-        algParams: {
-          digest: 'sha256',
-          keyLen: 32,
-          salt,
-          secret,
-        },
-        start: fc.now,
-        end: fc.now + (2 * interval),
-        interval,
-        lifetime,
-      });
-      assert.equal(typeof salt, 'string');
-      assert.match(salt, /^[0-9a-f]{64}$/);
-      assert.equal(typeof secret, 'string');
-      assert.match(secret, /^[0-9a-f]{64}$/);
-      assert.deepEqual(sr.secrets, await Promise.all(
-          [0, -interval, interval].map(async (tN) => await hkdf(secret, salt, tN))));
-    });
-
-    it('reuses matching publication if unexpired', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const {secrets} = sr;
-      const dbKeys = await db.findKeys(`${dbPrefix}:*`, null);
-      sr.stop();
-      sr = newRotator();
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert.deepEqual(sr.secrets, secrets);
-      assert.deepEqual(await db.findKeys(`${dbPrefix}:*`, null), dbKeys);
-    });
-
-    it('deletes expired publications', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const [oldId] = await db.findKeys(`${dbPrefix}:*`, null);
-      assert(oldId != null);
-      sr.stop();
-      const p = await db.get(oldId);
-      await fc.setNow(p.end + p.lifetime + p.interval);
-      sr = newRotator();
-      setFakeClock(sr, fc);
-      await sr.start();
-      const ids = await db.findKeys(`${dbPrefix}:*`, null);
-      assert.equal(ids.length, 1);
-      const [newId] = ids;
-      assert.notEqual(newId, oldId);
-    });
-
-    it('keeps expired publications until interval past expiration', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const [, , future] = sr.secrets;
-      sr.stop();
-      const [origId] = await db.findKeys(`${dbPrefix}:*`, null);
-      const p = await db.get(origId);
-      await fc.advance(p.end + p.lifetime + p.interval - 1);
-      sr = newRotator();
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert(sr.secrets.slice(1).includes(future));
-      // It should have created a new publication, not extended the life of the old publication.
-      assert.equal((await db.findKeys(`${dbPrefix}:*`, null)).length, 2);
-      assert.deepEqual(await db.get(origId), p);
-    });
-
-    it('idempotent', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      assert.equal(fc.timeouts.size, 1);
-      const secrets = [...sr.secrets];
-      const dbKeys = await db.findKeys(`${dbPrefix}:*`, null);
-      await sr.start();
-      assert.equal(fc.timeouts.size, 1);
-      assert.deepEqual(sr.secrets, secrets);
-      assert.deepEqual(await db.findKeys(`${dbPrefix}:*`, null), dbKeys);
-    });
-
-    describe(`schedules update at next interval (= ${interval})`, function () {
-      const testCases = [
-        {now: 0, want: interval},
-        {now: 1, want: interval},
-        {now: interval - 1, want: interval},
-        {now: interval, want: 2 * interval},
-        {now: interval + 1, want: 2 * interval},
-      ];
-      for (const {now, want} of testCases) {
-        it(`${now} -> ${want}`, async function () {
-          sr = newRotator();
-          const fc = setFakeClock(sr);
-          await fc.setNow(now);
-          await sr.start();
-          assert.equal(fc.timeouts.size, 1);
-          const [{when}] = fc.timeouts.values();
-          assert.equal(when, want);
-        });
-      }
-
-      it('multiple active params with different intervals', async function () {
-        const intervals = [400, 600, 1000];
-        const lcmi = lcm(...intervals);
-        const wants = new Set();
-        for (const i of intervals) for (let t = i; t <= lcmi; t += i) wants.add(t);
-        const fcs = new FakeClock();
-        const srs = intervals.map((i) => {
-          interval = i;
-          const sr = newRotator();
-          setFakeClock(sr, fcs);
-          return sr;
-        });
-        try {
-          for (const sr of srs) await sr.start(); // Don't use Promise.all() otherwise they race.
-          interval = intervals[intervals.length - 1];
-          sr = newRotator();
-          const fc = setFakeClock(sr); // Independent clock to test a single instance's behavior.
-          await sr.start();
-          for (const want of [...wants].sort((a, b) => a - b)) {
-            logger.debug(`next timeout should be at ${want}`);
-            await fc.advanceToNext();
-            await fcs.setNow(fc.now); // Keep all of the publications alive.
-            assert.equal(fc.now, want);
-          }
-        } finally {
-          for (const sr of srs) sr.stop();
-        }
-      });
-    });
-  });
-
-  describe('stop', function () {
-    it('clears timeout', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      assert.notEqual(fc.timeouts.size, 0);
-      sr.stop();
-      assert.equal(fc.timeouts.size, 0);
-    });
-
-    it('safe to call multiple times', async function () {
-      sr = newRotator();
-      setFakeClock(sr);
-      await sr.start();
-      sr.stop();
-      sr.stop();
-    });
-  });
-
-  describe('legacy secret', function () {
-    it('ends at now if there are no previously published secrets', async function () {
-      sr = newRotator('legacy');
-      const fc = setFakeClock(sr);
-      // Use a time that isn't a multiple of interval in case there is a modular arithmetic bug that
-      // would otherwise go undetected.
-      await fc.setNow(1);
-      assert(mod(fc.now, interval) !== 0);
-      await sr.start();
-      assert.equal(sr.secrets.length, 4); // 1 for the legacy secret, 3 for past, current, future
-      assert(sr.secrets.slice(1).includes('legacy')); // Should not be the current secret.
-      const ids = await db.findKeys(`${dbPrefix}:*`, null);
-      const params = (await Promise.all(ids.map(async (id) => await db.get(id))))
-          .sort((a, b) => a.algId - b.algId);
-      assert.deepEqual(params, [
-        {
-          algId: 0,
-          algParams: 'legacy',
-          // The start time must equal the end time so that legacy secrets do not affect the end
-          // times of legacy secrets published by other instances.
-          start: fc.now,
-          end: fc.now,
-          lifetime,
-          interval: null,
-        },
-        {
-          algId: 1,
-          algParams: params[1].algParams,
-          start: fc.now,
-          end: intervalStart(fc.now) + (2 * interval),
-          interval,
-          lifetime,
-        },
-      ]);
-    });
-
-    it('ends at the start of the oldest previously published secret', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await fc.setNow(1);
-      assert(mod(fc.now, interval) !== 0);
-      const wantTime = fc.now;
-      await sr.start();
-      assert.equal(sr.secrets.length, 3);
-      const [s1, s0, s2] = sr.secrets; // s1=current, s0=previous, s2=next
-      sr.stop();
-      // Use a time that is not a multiple of interval off of epoch or wantTime just in case there
-      // is a modular arithmetic bug that would otherwise go undetected.
-      await fc.advance(interval + 1);
-      assert(mod(fc.now, interval) !== 0);
-      assert(mod(fc.now - wantTime, interval) !== 0);
-      sr = newRotator('legacy');
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert.equal(sr.secrets.length, 5); // s0 through s3 and the legacy secret.
-      assert.deepEqual(sr.secrets, [s2, s1, s0, sr.secrets[3], 'legacy']);
-      const ids = await db.findKeys(`${dbPrefix}:*`, null);
-      const params = (await Promise.all(ids.map(async (id) => await db.get(id))))
-          .sort((a, b) => a.algId - b.algId);
-      assert.deepEqual(params, [
-        {
-          algId: 0,
-          algParams: 'legacy',
-          start: wantTime,
-          end: wantTime,
-          interval: null,
-          lifetime,
-        },
-        {
-          algId: 1,
-          algParams: params[1].algParams,
-          start: wantTime,
-          end: intervalStart(fc.now) + (2 * interval),
-          interval,
-          lifetime,
-        },
-      ]);
-    });
-
-    it('multiple instances with different legacy secrets', async function () {
-      sr = newRotator('legacy1');
-      const fc = setFakeClock(sr);
-      await sr.start();
-      sr.stop();
-      sr = newRotator('legacy2');
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert(sr.secrets.slice(1).includes('legacy1'));
-      assert(sr.secrets.slice(1).includes('legacy2'));
-    });
-
-    it('multiple instances with the same legacy secret', async function () {
-      sr = newRotator('legacy');
-      const fc = setFakeClock(sr);
-      await sr.start();
-      sr.stop();
-      sr = newRotator('legacy');
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert.deepEqual(sr.secrets, [...new Set(sr.secrets)]);
-      // There shouldn't be multiple publications for the same legacy secret.
-      assert.equal((await db.findKeys(`${dbPrefix}:*`, null)).length, 2);
-    });
-
-    it('legacy secret is included for interval after expiration', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      sr.stop();
-      await fc.advance(lifetime + interval - 1);
-      sr = newRotator('legacy');
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert(sr.secrets.slice(1).includes('legacy'));
-    });
-
-    it('legacy secret is not included if the oldest secret is old enough', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      sr.stop();
-      await fc.advance(lifetime + interval);
-      sr = newRotator('legacy');
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert(!sr.secrets.includes('legacy'));
-    });
-
-    it('dead secrets still affect legacy secret end time', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const secrets = new Set(sr.secrets);
-      sr.stop();
-      await fc.advance(lifetime + (3 * interval));
-      sr = newRotator('legacy');
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert(!sr.secrets.includes('legacy'));
-      assert(!sr.secrets.some((s) => secrets.has(s)));
-    });
-  });
-
-  describe('rotation', function () {
-    it('no rotation before start of interval', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      assert.equal(fc.now, 0);
-      await sr.start();
-      const secrets = [...sr.secrets];
-      await fc.advance(interval - 1);
-      assert.deepEqual(sr.secrets, secrets);
-    });
-
-    it('does not replace secrets array', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const [current] = sr.secrets;
-      const secrets = sr.secrets;
-      await fc.advance(interval);
-      assert.notEqual(sr.secrets[0], current);
-      assert.equal(sr.secrets, secrets);
-    });
-
-    it('future secret becomes current, new future is generated', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const secrets = new Set(sr.secrets);
-      assert.equal(secrets.size, 3);
-      const [s1, s0, s2] = sr.secrets;
-      await fc.advance(interval);
-      assert.deepEqual(sr.secrets, [s2, s1, s0, sr.secrets[3]]);
-      assert(!secrets.has(sr.secrets[3]));
-    });
-
-    it('expired publications are deleted', async function () {
-      const origInterval = interval;
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      sr.stop();
-      ++interval; // Force new params so that the old params can expire.
-      sr = newRotator();
-      setFakeClock(sr, fc);
-      await sr.start();
-      assert.equal((await db.findKeys(`${dbPrefix}:*`, null)).length, 2);
-      await fc.advance(lifetime + (3 * origInterval));
-      assert.equal((await db.findKeys(`${dbPrefix}:*`, null)).length, 1);
-    });
-
-    it('old secrets are eventually removed', async function () {
-      sr = newRotator();
-      const fc = setFakeClock(sr);
-      await sr.start();
-      const [, s0] = sr.secrets;
-      await fc.advance(lifetime + interval - 1);
-      assert(sr.secrets.slice(1).includes(s0));
-      await fc.advance(1);
-      assert(!sr.secrets.includes(s0));
-    });
-  });
-
-  describe('clock skew', function () {
-    it('out of sync works if in adjacent interval', async function () {
-      const srs = [newRotator(), newRotator()];
-      const fcs = srs.map((sr) => setFakeClock(sr));
-      for (const sr of srs) await sr.start(); // Don't use Promise.all() otherwise they race.
-      assert.deepEqual(srs[0].secrets, srs[1].secrets);
-      // Advance fcs[0] to the end of the interval after fcs[1].
-      await fcs[0].advance((2 * interval) - 1);
-      assert(srs[0].secrets.includes(srs[1].secrets[0]));
-      assert(srs[1].secrets.includes(srs[0].secrets[0]));
-      // Advance both by an interval.
-      await Promise.all([fcs[1].advance(interval), fcs[0].advance(interval)]);
-      assert(srs[0].secrets.includes(srs[1].secrets[0]));
-      assert(srs[1].secrets.includes(srs[0].secrets[0]));
-      // Advance fcs[1] to the end of the interval after fcs[0].
-      await Promise.all([fcs[1].advance((3 * interval) - 1), fcs[0].advance(1)]);
-      assert(srs[0].secrets.includes(srs[1].secrets[0]));
-      assert(srs[1].secrets.includes(srs[0].secrets[0]));
-    });
-
-    it('start up out of sync', async function () {
-      const srs = [newRotator(), newRotator()];
-      const fcs = srs.map((sr) => setFakeClock(sr));
-      await fcs[0].advance((2 * interval) - 1);
-      await srs[0].start(); // Must start before srs[1] so that srs[1] starts in srs[0]'s past.
-      await srs[1].start();
-      assert(srs[0].secrets.includes(srs[1].secrets[0]));
-      assert(srs[1].secrets.includes(srs[0].secrets[0]));
-    });
-  });
-});
--- a/src/tests/backend/specs/api/chat.js
+++ b/src/tests/backend/specs/api/chat.js
@ -1,7 +1,6 @@
 'use strict';

 const common = require('../../common');
-const assert = require('assert').strict;

 let agent;
 const apiKey = common.apiKey;
@ -16,14 +15,14 @@ describe(__filename, function () {
  before(async function () { agent = await common.init(); });

  describe('API Versioning', function () {
-    it('errors if can not connect', async function () {
-      await agent.get('/api/')
+    it('errors if can not connect', function (done) {
+      agent.get('/api/')
          .expect((res) => {
            apiVersion = res.body.currentVersion;
            if (!res.body.currentVersion) throw new Error('No version set in API');
            return;
          })
-          .expect(200);
+          .expect(200, done);
    });
  });

@ -39,18 +38,20 @@ describe(__filename, function () {
      -> getChatHistory(padID)
  */

-  describe('Chat functionality', function () {
-    it('creates a new Pad', async function () {
-      await agent.get(`${endPoint('createPad')}&padID=${padID}`)
+  describe('createPad', function () {
+    it('creates a new Pad', function (done) {
+      agent.get(`${endPoint('createPad')}&padID=${padID}`)
          .expect((res) => {
            if (res.body.code !== 0) throw new Error('Unable to create new Pad');
          })
          .expect('Content-Type', /json/)
-          .expect(200);
+          .expect(200, done);
    });
+  });

-    it('Creates an author with a name set', async function () {
-      await agent.get(endPoint('createAuthor'))
+  describe('createAuthor', function () {
+    it('Creates an author with a name set', function (done) {
+      agent.get(endPoint('createAuthor'))
          .expect((res) => {
            if (res.body.code !== 0 || !res.body.data.authorID) {
              throw new Error('Unable to create author');
@ -58,51 +59,47 @@ describe(__filename, function () {
            authorID = res.body.data.authorID; // we will be this author for the rest of the tests
          })
          .expect('Content-Type', /json/)
-          .expect(200);
+          .expect(200, done);
    });
+  });

-    it('Gets the head of chat before the first chat msg', async function () {
-      await agent.get(`${endPoint('getChatHead')}&padID=${padID}`)
-          .expect((res) => {
-            if (res.body.data.chatHead !== -1) throw new Error('Chat Head Length is wrong');
-            if (res.body.code !== 0) throw new Error('Unable to get chat head');
-          })
-          .expect('Content-Type', /json/)
-          .expect(200);
-    });
-
-    it('Adds a chat message to the pad', async function () {
-      await agent.get(`${endPoint('appendChatMessage')}&padID=${padID}&text=blalblalbha` +
+  describe('appendChatMessage', function () {
+    it('Adds a chat message to the pad', function (done) {
+      agent.get(`${endPoint('appendChatMessage')}&padID=${padID}&text=blalblalbha` +
                `&authorID=${authorID}&time=${timestamp}`)
          .expect((res) => {
            if (res.body.code !== 0) throw new Error('Unable to create chat message');
          })
          .expect('Content-Type', /json/)
-          .expect(200);
+          .expect(200, done);
    });
+  });

-    it('Gets the head of chat', async function () {
-      await agent.get(`${endPoint('getChatHead')}&padID=${padID}`)
+
+  describe('getChatHead', function () {
+    it('Gets the head of chat', function (done) {
+      agent.get(`${endPoint('getChatHead')}&padID=${padID}`)
          .expect((res) => {
            if (res.body.data.chatHead !== 0) throw new Error('Chat Head Length is wrong');

            if (res.body.code !== 0) throw new Error('Unable to get chat head');
          })
          .expect('Content-Type', /json/)
-          .expect(200);
+          .expect(200, done);
    });
+  });

-    it('Gets Chat History of a Pad', async function () {
-      await agent.get(`${endPoint('getChatHistory')}&padID=${padID}`)
-          .expect('Content-Type', /json/)
-          .expect(200)
+  describe('getChatHistory', function () {
+    it('Gets Chat History of a Pad', function (done) {
+      agent.get(`${endPoint('getChatHistory')}&padID=${padID}`)
          .expect((res) => {
-            assert.equal(res.body.code, 0, 'Unable to get chat history');
-            assert.equal(res.body.data.messages.length, 1, 'Chat History Length is wrong');
-            assert.equal(res.body.data.messages[0].text, 'blalblalbha', 'Chat text does not match');
-            assert.equal(res.body.data.messages[0].userId, authorID, 'Message author does not match');
-            assert.equal(res.body.data.messages[0].time, timestamp.toString(), 'Message time does not match');
-          });
+            if (res.body.data.messages.length !== 1) {
+              throw new Error('Chat History Length is wrong');
+            }
+            if (res.body.code !== 0) throw new Error('Unable to get chat history');
+          })
+          .expect('Content-Type', /json/)
+          .expect(200, done);
    });
  });
 });
--- a/src/tests/backend/specs/api/instance.js
+++ b/src/tests/backend/specs/api/instance.js
@ -17,16 +17,16 @@ describe(__filename, function () {
  before(async function () { agent = await common.init(); });

  describe('Connectivity for instance-level API tests', function () {
-    it('can connect', async function () {
-      await agent.get('/api/')
+    it('can connect', function (done) {
+      agent.get('/api/')
          .expect('Content-Type', /json/)
-          .expect(200);
+          .expect(200, done);
    });
  });

  describe('getStats', function () {
-    it('Gets the stats of a running instance', async function () {
-      await agent.get(endPoint('getStats'))
+    it('Gets the stats of a running instance', function (done) {
+      agent.get(endPoint('getStats'))
          .expect((res) => {
            if (res.body.code !== 0) throw new Error('getStats() failed');

@ -48,7 +48,7 @@ describe(__filename, function () {
            }
          })
          .expect('Content-Type', /json/)
-          .expect(200);
+          .expect(200, done);
    });
  });
 });
--- a/src/tests/backend/specs/api/pad.js
+++ b/src/tests/backend/specs/api/pad.js
@ -17,7 +17,6 @@ let apiVersion = 1;
 const testPadId = makeid();
 const newPadId = makeid();
 const copiedPadId = makeid();
-const anotherPadId = makeid();
 let lastEdited = '';
 const text = generateLongText();

@ -503,31 +502,6 @@ describe(__filename, function () {
          .expect('Content-Type', /json/);
      assert.equal(res.body.data.revisions, revCount);
    });
-
-    it('creates a new Pad with empty text', async function () {
-      await agent.get(`${endPoint('createPad')}&padID=${anotherPadId}&text=`)
-          .expect('Content-Type', /json/)
-          .expect(200)
-          .expect((res) => {
-            assert.equal(res.body.code, 0, 'Unable to create new Pad');
-          });
-      await agent.get(`${endPoint('getText')}&padID=${anotherPadId}`)
-          .expect('Content-Type', /json/)
-          .expect(200)
-          .expect((res) => {
-            assert.equal(res.body.code, 0, 'Unable to get pad text');
-            assert.equal(res.body.data.text, '\n', 'Pad text is not empty');
-          });
-    });
-
-    it('deletes with empty text', async function () {
-      await agent.get(`${endPoint('deletePad')}&padID=${anotherPadId}`)
-          .expect('Content-Type', /json/)
-          .expect(200)
-          .expect((res) => {
-            assert.equal(res.body.code, 0, 'Unable to delete empty Pad');
-          });
-    });
  });

  describe('copyPadWithoutHistory', function () {
--- a/Show More
+++ b/Show More