Merge branch 'master' into patch-2

Signed-off-by: Gilles Quénot <[email protected]>

Author: sputnick-dev

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9 as final
+FROM python:3.10 as final
 
 USER root
 
@@ -12,4 +12,4 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && mv composer.phar /usr/local/bin/composer \
     && npm install svgexport -g \
     && rm -f /tmp/composer-setup.php \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*

.github/workflows/check-occ-command.yml

@@ -0,0 +1,28 @@
+name: Check occ command syntax
+
+on:
+  pull_request:
+    paths:
+      - '**.rst'
+
+jobs:
+  check-occ-command:
+    name: Check occ command syntax
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run script
+        run: |
+          RST_FILE="$(find ./ -name '*.rst')"
+          mapfile -t RST_FILE <<< "$RST_FILE"
+          for file in "${RST_FILE[@]}"; do
+            if [ "$(grep "php occ" "$file" | grep -v "sudo -E -u www-data php occ" | wc -l)" -gt 0 ]; then
+              printf "%b%s%b\n" "\e[0;31m" "$file does not use the 'sudo -E -u www-data php occ' syntax in some places which is required." "\e[0m"
+              echo "See $(grep "php occ" "$file" | grep -v "sudo -E -u www-data php occ")"
+              FAIL=1
+            fi
+          done
+          if [ -n "$FAIL" ]; then
+            exit 1
+          fi

.github/workflows/codespell.yml

@@ -12,6 +12,11 @@ jobs:
     runs-on: self-hosted
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
       - name: Check spelling
-        uses: codespell-project/actions-codespell@v2
+        uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2.1
+        with:
+          skip: '**.svg,**.js'

.github/workflows/generate_catalog_templates.yml

@@ -12,30 +12,45 @@ jobs:
   user_manual:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - name: Checkout repository
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
+        with:
+          python-version: '3.13'
 
-      - uses: ammaraskar/sphinx-action@master
+      - uses: ammaraskar/sphinx-action@54e52bfb642e9b60ea5b6bcb05fe3f74b40d290a # v8.2.3
         with:
           docs-folder: "user_manual/"
-          pre-build-command: pip install -r requirements.txt
-          build-command: make gettext
+          pre-build-command: "pip install -r requirements.txt"
+          build-command: "make gettext"
+
+      - name: Change file owner to correct user
+        run: |
+          ls -la user_manual/locale/source
+          sudo chown -R 1001:1001 user_manual/locale/source
+          ls -la user_manual/locale/source
 
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         id: cpr
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: "chore(l10n): Updates catalog templates (POT files fetched automatically by transifex)"
-          title: Updates catalog templates
-          branch: update-l10n
+          commit-message: 'chore(l10n): Updates catalog templates (POT files fetched automatically by transifex)'
+          committer: GitHub <[email protected]>
+          author: nextcloud-command <[email protected]>
           signoff: true
+          branch: 'automated/noid/update-l10n'
+          title: 'Updates catalog templates'
 
-      - uses: hmarr/[email protected]
+      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
         if: steps.cpr.outputs.pull-request-operation == 'created'
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
 
-      - uses: pascalgn/[email protected]
+      - uses: pascalgn/automerge-action@7961b8b5eec56cc088c140b56d864285eabd3f67 # v0.16.4
         if: steps.cpr.outputs.pull-request-operation == 'created'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/openapi.yml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: true
 
       - name: Set up php
-        uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2
         with:
           php-version: '8.1'
           # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/pr-feedback.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: The get-github-handles-from-website action
-        uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
+        uses: marcelklehr/get-github-handles-from-website-action@06b2239db0a48fe1484ba0bfd966a3ab81a08308 # v1.0.1
         id: scrape
         with:
           website: 'https://nextcloud.com/team/'

.github/workflows/sphinxbuild.yml

@@ -11,7 +11,7 @@ jobs:
   user_manual:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
     - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
@@ -23,15 +23,15 @@ jobs:
       shell: bash
       run: tar czf /tmp/documentation.tar.gz -C user_manual/_build/html .
     - name: Upload static documentation
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: User manual.zip
         path: "/tmp/documentation.tar.gz"
 
   user_manual-en:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
     - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
@@ -43,7 +43,7 @@ jobs:
   developer_manual:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
     - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
@@ -55,15 +55,15 @@ jobs:
       shell: bash
       run: tar czf /tmp/documentation.tar.gz -C developer_manual/_build/html/com .
     - name: Upload static documentation
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: Developer manual.zip
         path: "/tmp/documentation.tar.gz"
 
   admin_manual:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
     - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
@@ -75,7 +75,7 @@ jobs:
       shell: bash
       run: tar czf /tmp/documentation.tar.gz -C admin_manual/_build/html/com .
     - name: Upload static documentation
-      uses: actions/upload-artifact@v4.4.3
+      uses: actions/upload-artifact@v4.6.2
       with:
         name: Administration manual.zip
         path: "/tmp/documentation.tar.gz"

.gitmodules

@@ -30,12 +30,7 @@ get-server-sources:
 	cd build && sh get-server-sources.sh $(DRONE_BRANCH)
 
 openapi-spec: get-server-sources
-	git submodule update --init
-	cd build/openapi-extractor && composer install
-	cd build && ./openapi-extractor/merge-specs \
-		--core server/core/openapi.json \
-		--merged ../developer_manual/_static/openapi.json \
-		$$(ls server/apps/*/openapi.json)
+	cp build/server/openapi.json developer_manual/_static/openapi.json
 	cd developer_manual/_static && \
 		wget https://unpkg.com/@stoplight/[email protected]/web-components.min.js -O stoplight-elements.js && \
 		wget https://unpkg.com/@stoplight/[email protected]/styles.min.css -O stoplight-elements.css

Makefile

@@ -55,6 +55,14 @@
 	background: rgba(0, 130, 201, 0.1)
 }
 
+/* Fix code within tables - remove too big margins */
+.rst-content td {
+	div[class^="highlight"]:last-of-type,
+	pre.literal-block:last-of-type {
+		margin-block: 1px !important;
+	}
+}
+
 /* ICONS LIST */
 div#list-of-available-icons > blockquote {
 	margin: 0;
@@ -95,5 +103,17 @@ div#list-of-available-icons > blockquote > div > div > p {
 }
 
 .wy-nav-content {
-	max-width: max(800px, calc(100vw - 600px)) !important;
+	max-width: clamp(800px, calc(100vw - 600px), 1200px) !important;
+}
+
+.wy-nav-content section {
+	max-width: 900px;
+}
+
+table.docutils {
+	min-width: 50%;
+}
+
+#code-style table.docutils {
+	width: 100%;
 }