Merge branch 'release/3.14.0'

.github/workflows/auto-merge-dependency-updates.yaml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.5
+        uses: dependabot/fetch-metadata@v2.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve

.github/workflows/crowdin-actions.yaml

@@ -16,15 +16,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Upload or update source files to Crowdin
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: true
 
     - name: Download German translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true
@@ -42,7 +42,7 @@ jobs:
         config: crowdin.yaml
 
     - name: Download Spanish translations
-      uses: crowdin/github-action@1.5.2
+      uses: crowdin/github-action@v1.20.2
       with:
         upload_sources: false
         download_translations: true

.github/workflows/test-and-deploy.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create Docker network
         run: docker network create uccser-development-stack
         # Required for the node service
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create Docker network
         run: docker network create uccser-development-stack
         # Required for the node service
@@ -58,13 +58,13 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run general tests
         run: ./dev ci test_general
       - name: Create coverage file
         run: docker compose -f docker-compose.local.yml run --rm --user="root" django coverage xml -i
       - name: Upload coverage file
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ./csfieldguide/coverage.xml
           verbose: true
@@ -74,13 +74,13 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run management tests
         run: ./dev ci test_management
       - name: Create coverage file
         run: docker compose -f docker-compose.local.yml run --rm --user="root" django coverage xml -i
       - name: Upload coverage file
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           files: ./csfieldguide/coverage.xml
           verbose: true
@@ -90,7 +90,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run style tests
         run: ./dev ci style
 
@@ -99,9 +99,9 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
       - name: Install dependencies
@@ -127,7 +127,7 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Docker network
         run: docker network create uccser-development-stack
@@ -148,7 +148,7 @@ jobs:
         run: tar czf static-files.tar.gz --directory csfieldguide/staticfiles/ .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: static-files
           path: static-files.tar.gz
@@ -178,7 +178,7 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create Docker network
         run: docker network create uccser-development-stack
@@ -209,7 +209,7 @@ jobs:
         run: tar czf interactive-thumbnails.tar.gz --directory csfieldguide/build/img/interactives/thumbnails/ .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: interactive-thumbnails-${{ matrix.language }}
           path: interactive-thumbnails.tar.gz
@@ -228,10 +228,10 @@ jobs:
     ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download all workflow run artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts/
 
@@ -246,23 +246,23 @@ jobs:
           ls artifacts/interactive-thumbnails-*/interactive-thumbnails.tar.gz | xargs -n1 tar -xz --directory csfieldguide/staticfiles/img/interactives/thumbnails --file
 
       - name: Log in to ${{ env.REGISTRY }}
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.1.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
             type=ref,event=tag,priority=1
             type=ref,event=branch,priority=2
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v5.3.0
         with:
           file: ./infrastructure/production/django/Dockerfile
           context: .

.gitignore

@@ -4,6 +4,9 @@ csfieldguide/build/**
 csfieldguide/staticfiles/**
 !csfieldguide/staticfiles/.keep
 
+# NPM
+node_modules/
+
 # Files for using HTTPS on local development
 infrastructure/local/traefik/certs/
 

csfieldguide/chapters/content/en/human-computer-interaction/sections/accessibility.md

@@ -0,0 +1,5 @@
+# Accessibility
+The accessibility of software needs to take into account the diverse range of people who might be using it. It includes taking account of imperfections and disabilities; common examples would be eyesight issues (e.g., small fonts are hard to read for many users), colour blindness (for example, about 8% of the male population have trouble distinguishing red and green), and timeouts that require fast responses from the user. But other considerations for accessibility include the quality of the hardware and internet connection a user might have; for example, educational software might be used by students at home on an old laptop connected through a slow or unreliable internet connection, so it is inadvisable to test the software only on a new computer using a fast internet connection. Accessibility can also include considering the different languages and cultures of the users: is the interface limited to one language, or does it use terminology that might mean something different in another culture? For example, in Western countries red is often used to denote danger, whereas in other countries it can denote good luck.
+
+There are specific guidelines for accessibility (such as the [Web Content Accessibility Guidelines](https://en.wikipedia.org/wiki/Web_Content_Accessibility_Guidelines) for web sites, which includes things like having “alt” descriptions of images, and avoiding flashing images that might cause seizures for some people), but organisations can also do better at designing accessible software if they have a diverse team of developers who are able to consider what they are building from a range of perspectives.
+