Skip to content

Commit df0cb8d

Browse files
authored
Merge branch 'master' into patch-1
Signed-off-by: rakekniven <[email protected]>
2 parents 8c28795 + 2e313ae commit df0cb8d

File tree

915 files changed

+66219
-10389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

915 files changed

+66219
-10389
lines changed

.codespellignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
SME
2+
te
3+
jus
4+
nin

.codespellrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[codespell]
2+
skip = ./build/*,**/_build/*,*.pot,conf.py,./static/*,./admin_manual/configuration_server/config_sample_php_parameters.rst,./_shared_assets/*,./COPYING
3+
ignore-words = .codespellignore
4+
check-filenames = true

.github/CODEOWNERS

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
/*/groupware/ @ChristophWurst
2-
/*/groupware/calendar.rst @miaulalala
3-
/*/groupware/contacts.rst @hamza221
4-
/*/groupware/mail.rst @GretaD
1+
/*/groupware/calendar.rst @SebastianKrupinski @st3iny @tcitworld
2+
/*/groupware/contacts.rst @GVodyanov @hamza221 @SebastianKrupinski
3+
/*/groupware/mail.rst @ChristophWurst @GretaD @kesselb
54
/*/security.rst @nickvergessen
65
/admin_manual/configuration_database @nickvergessen
76
/admin_manual/file_workflows @nickvergessen
87
/developer_manual/client_apis/OCS/ocs-status-api.rst @Antreesy @nickvergessen
9-
/developer_manual/digging_deeper/groupware/ @ChristophWurst
10-
/developer_manual/digging_deeper/groupware/calendar.rst @miaulalala
8+
/developer_manual/digging_deeper/groupware/calendar.rst @SebastianKrupinski @st3iny @tcitworld
119
/developer_manual/digging_deeper/talk.rst @nickvergessen
1210
/user_manual/talk/ @Antreesy @DorraJaouad @nickvergessen

.github/workflows/block-merge-freeze.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#
33
# https://github.com/nextcloud/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2022-2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
58

69
name: Block merges during freezes
710

@@ -27,10 +30,10 @@ jobs:
2730
steps:
2831
- name: Register server reference to fallback to master branch
2932
run: |
30-
server_ref="$(if [ "${{ github.base_ref }}" = "main" ]; then echo -n "master"; else echo -n "${{ github.base_ref }}"; fi)"
33+
server_ref="$(if [ '${{ github.base_ref }}' = 'main' ]; then echo -n 'master'; else echo -n '${{ github.base_ref }}'; fi)"
3134
echo "server_ref=$server_ref" >> $GITHUB_ENV
3235
- name: Download version.php from ${{ env.server_ref }}
33-
run: curl https://raw.githubusercontent.com/nextcloud/server/${{ env.server_ref }}/version.php --output version.php
36+
run: curl 'https://raw.githubusercontent.com/nextcloud/server/${{ env.server_ref }}/version.php' --output version.php
3437

3538
- name: Run check
3639
run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC'

.github/workflows/codespell.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: 'Codespell'
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
codespell:
11+
name: Check spelling
12+
runs-on: self-hosted
13+
steps:
14+
- name: Check out code
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
16+
with:
17+
persist-credentials: false
18+
19+
- name: Check spelling
20+
uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2.1
21+
with:
22+
skip: '**.svg, **.js'

.github/workflows/command-rebase.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/fixup.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#
33
# https://github.com/nextcloud/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
5+
#
6+
# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
7+
# SPDX-License-Identifier: MIT
58

69
name: Block fixup and squash commits
710

@@ -28,6 +31,6 @@ jobs:
2831

2932
steps:
3033
- name: Run check
31-
uses: skjnldsv/block-fixup-merge-action@42d26e1b536ce61e5cf467d65fb76caf4aa85acf # v1
34+
uses: skjnldsv/block-fixup-merge-action@c138ea99e45e186567b64cf065ce90f7158c236a # v2
3235
with:
3336
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generate_catalog_templates.yml

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,30 +12,45 @@ jobs:
1212
user_manual:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
15+
- name: Checkout repository
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
17+
with:
18+
persist-credentials: false
19+
20+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
21+
with:
22+
python-version: '3.13'
1623

17-
- uses: ammaraskar/sphinx-action@master
24+
- uses: ammaraskar/sphinx-action@54e52bfb642e9b60ea5b6bcb05fe3f74b40d290a # v8.2.3
1825
with:
1926
docs-folder: "user_manual/"
20-
pre-build-command: pip install -r requirements.txt
21-
build-command: make gettext
27+
pre-build-command: "pip install -r requirements.txt"
28+
build-command: "make gettext"
29+
30+
- name: Change file owner to correct user
31+
run: |
32+
ls -la user_manual/locale/source
33+
sudo chown -R 1001:1001 user_manual/locale/source
34+
ls -la user_manual/locale/source
2235
23-
- uses: peter-evans/create-pull-request@v6
36+
- uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
2437
id: cpr
2538
with:
2639
token: ${{ secrets.COMMAND_BOT_PAT }}
27-
commit-message: "chore(l10n): Updates catalog templates (POT files fetched automatically by transifex)"
28-
title: Updates catalog templates
29-
branch: update-l10n
40+
commit-message: 'chore(l10n): Updates catalog templates (POT files fetched automatically by transifex)'
41+
committer: GitHub <[email protected]>
42+
author: nextcloud-command <[email protected]>
3043
signoff: true
44+
branch: 'automated/noid/update-l10n'
45+
title: 'Updates catalog templates'
3146

32-
- uses: hmarr/[email protected]
47+
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
3348
if: steps.cpr.outputs.pull-request-operation == 'created'
3449
with:
3550
github-token: "${{ secrets.GITHUB_TOKEN }}"
3651
pull-request-number: ${{ steps.cpr.outputs.pull-request-number }}
3752

38-
- uses: pascalgn/[email protected].3
53+
- uses: pascalgn/automerge-action@7961b8b5eec56cc088c140b56d864285eabd3f67 # v0.16.4
3954
if: steps.cpr.outputs.pull-request-operation == 'created'
4055
env:
4156
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/openapi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
18+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
with:
2020
submodules: true
2121

2222
- name: Set up php
23-
uses: shivammathur/setup-php@c665c7a15b5295c2488ac8a87af9cb806cd72198 # v2
23+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2
2424
with:
2525
php-version: '8.1'
2626
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

.github/workflows/pr-feedback.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ on:
1717

1818
jobs:
1919
pr-feedback:
20+
if: ${{ github.repository_owner == 'nextcloud' }}
2021
runs-on: ubuntu-latest
2122
steps:
2223
- name: The get-github-handles-from-website action
23-
uses: marcelklehr/get-github-handles-from-website-action@a739600f6b91da4957f51db0792697afbb2f143c # v1.0.0
24+
uses: marcelklehr/get-github-handles-from-website-action@06b2239db0a48fe1484ba0bfd966a3ab81a08308 # v1.0.1
2425
id: scrape
2526
with:
2627
website: 'https://nextcloud.com/team/'
@@ -35,7 +36,7 @@ jobs:
3536
with:
3637
feedback-message: |
3738
Hello there,
38-
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
39+
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.
3940
4041
We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.
4142
@@ -45,6 +46,6 @@ jobs:
4546
4647
(If you believe you should not receive this message, you can add yourself to the [blocklist](https://github.com/nextcloud/.github/blob/master/non-community-usernames.txt).)
4748
days-before-feedback: 14
48-
start-date: "2024-04-30"
49-
exempt-authors: "${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }},nextcloud-command,nextcloud-android-bot"
49+
start-date: '2024-04-30'
50+
exempt-authors: '${{ steps.blocklist.outputs.blocklist }},${{ steps.scrape.outputs.users }}'
5051
exempt-bots: true

0 commit comments

Comments
 (0)