Merge branch 'main' into feature/motion-forward

OpenSlides · Sep 17, 2024 · d35d56a · d35d56a
2 parents 55d1590 + 2453411
commit d35d56a
Show file tree

Hide file tree

Showing 278 changed files with 10,307 additions and 9,839 deletions.
diff --git a/.github/workflows/pick-to-staging.yml b/.github/workflows/pick-to-staging.yml
@@ -53,7 +53,7 @@ jobs:
           private_key: ${{ secrets.AUTOMATION_APP_PRIVATE_KEY }}
 
       - name: Create or update PR
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.generate-token.outputs.token }}
           branch: apply/commit-${{ github.sha }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.16 as build
+FROM node:20.17 as build
 ENV NODE_VERSION=20.14.0
 
 WORKDIR /app

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM node:20.16-alpine
+FROM node:20.17-alpine
 ENV NODE_VERSION=20.14.0
 
 RUN apk add --no-cache git

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ run-tests: | build-dev
 	docker run -t openslides-client-dev npm run test-silently
 	docker run -t openslides-client-dev npm run build-debug
 
-run-karma-tests:
+run-karma-tests: | build-dev
 	docker run -t openslides-client-dev /bin/sh -c "apk add chromium && npm run test-silently -- --browsers=ChromiumHeadlessNoSandbox"
 
 run-check-linting:

diff --git a/client/.eslintrc.js b/client/.eslintrc.js
@@ -102,9 +102,7 @@ module.exports = {
                 '@angular-eslint/template/attributes-order': ['error', {
                     alphabetical: true
                 }],
-                '@angular-eslint/template/prefer-control-flow': ['error'],
-                // Should be switched to error
-                '@angular-eslint/template/elements-content': ['warn']
+                '@angular-eslint/template/prefer-control-flow': ['error']
             }
         },
         {

diff --git a/client/angular.json b/client/angular.json
@@ -39,6 +39,11 @@
                                 "glob": "**/*",
                                 "input": "node_modules/cm-chessboard/assets/",
                                 "output": "/chess/"
+                            },
+                            {
+                                "glob": "**/*",
+                                "input": "node_modules/pdfjs-dist/legacy/build/",
+                                "output": "/pdfjs/"
                             }
                         ],
                         "styles": ["src/styles.scss"],

diff --git a/client/ngsw-config.json b/client/ngsw-config.json
@@ -1,7 +1,6 @@
 {
     "$schema": "./node_modules/@angular/service-worker/config/schema.json",
     "index": "/index.html",
-    "version": 2,
     "assetGroups": [
         {
             "name": "app",