Skip to content

Commit 4506804

Browse files
authored
Merge branch 'master' into feat/s3-sse-kms-primary-storage
2 parents 57e979e + 3ed736d commit 4506804

273 files changed

Lines changed: 31122 additions & 2431 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/*/groupware/calendar.rst @SebastianKrupinski @st3iny @tcitworld
22
/*/groupware/contacts.rst @GVodyanov @hamza221 @SebastianKrupinski
33
/*/groupware/mail.rst @ChristophWurst @GretaD @kesselb
4-
/*/security.rst @nickvergessen
5-
/admin_manual/configuration_database @nickvergessen
64
/admin_manual/file_workflows @nickvergessen
75
/developer_manual/client_apis/OCS/ocs-status-api.rst @Antreesy @nickvergessen
86
/developer_manual/digging_deeper/groupware/calendar.rst @SebastianKrupinski @st3iny @tcitworld

.github/actions-lock.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
9f2b534bea27e8ec2dda7c1d772a664b block-merge-eol.yml
44
2581a67c5bcdcd570427e6d51db767d7 fixup.yml
55
d1821b8a816578070ed8fd018f321f6d pr-feedback.yml
6-
9799b1a6a842b5c0076b76de651a0e0d sync-workflow-templates.yml
6+
94c65e30a77686c079c6dfa54a008440 sync-workflow-templates.yml

.github/workflows/build-docs.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
steps:
7676
- name: Checkout repository
77-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
77+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7878
with:
7979
ref: ${{ inputs.ref }}
8080

@@ -137,7 +137,7 @@ jobs:
137137
fi
138138
139139
- name: Set up Python
140-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
140+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
141141
with:
142142
python-version: ${{ steps.pyver.outputs.version }}
143143
cache: "pip"
@@ -183,7 +183,7 @@ jobs:
183183

184184
steps:
185185
- name: Checkout repository
186-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
186+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
187187
with:
188188
ref: ${{ inputs.ref }}
189189

@@ -197,7 +197,7 @@ jobs:
197197
fi
198198
199199
- name: Set up Python
200-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
200+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
201201
with:
202202
python-version: ${{ steps.pyver.outputs.version }}
203203
cache: "pip"
@@ -235,7 +235,7 @@ jobs:
235235

236236
steps:
237237
- name: Checkout repository
238-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
238+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
239239
with:
240240
ref: ${{ inputs.ref }}
241241
fetch-depth: 2
@@ -255,7 +255,7 @@ jobs:
255255

256256
- name: Login to GitHub Container Registry
257257
if: steps.changed.outputs.dockerfile_changed == 'true'
258-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
258+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
259259
with:
260260
registry: ghcr.io
261261
username: ${{ github.actor }}
@@ -303,7 +303,7 @@ jobs:
303303

304304
steps:
305305
- name: Checkout repository
306-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
306+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
307307
with:
308308
ref: ${{ inputs.ref }}
309309

@@ -317,7 +317,7 @@ jobs:
317317
fi
318318
319319
- name: Set up Python
320-
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
320+
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
321321
with:
322322
python-version: ${{ steps.pyver.outputs.version }}
323323
# pip cache is not compatible with the Docker container
@@ -372,7 +372,7 @@ jobs:
372372

373373
steps:
374374
- name: Checkout repository
375-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
375+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
376376
with:
377377
ref: ${{ inputs.ref }}
378378

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest-low
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
17+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1818
with:
1919
persist-credentials: false
2020

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: self-hosted
1616
steps:
1717
- name: Check out code
18-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
18+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1919
with:
2020
persist-credentials: false
2121

.github/workflows/deploy-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
branches: ${{ steps.set.outputs.branches }}
3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
40+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4141

4242
- name: Setup PHP
4343
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
@@ -111,7 +111,7 @@ jobs:
111111

112112
steps:
113113
- name: Checkout gh-pages branch
114-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
114+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
115115
with:
116116
ref: gh-pages
117117
fetch-depth: 1

.github/workflows/docker-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
25+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2626

2727
- name: Set up Docker Buildx
2828
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
2929

3030
- name: Login to GitHub Container Registry
3131
if: github.event_name != 'pull_request'
32-
uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
32+
uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
3333
with:
3434
registry: ghcr.io
3535
username: ${{ github.actor }}

.github/workflows/generate-top-index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
27+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2828
with:
2929
fetch-depth: 0
3030

@@ -53,7 +53,7 @@ jobs:
5353
5454
- name: Checkout gh-pages branch
5555
if: github.event_name == 'push'
56-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
56+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5757
with:
5858
ref: gh-pages
5959
fetch-depth: 1

.github/workflows/generate_catalog_templates.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
19+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
2020
with:
2121
persist-credentials: false
2222

23-
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
23+
- uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
2424
with:
2525
python-version: '3.13'
2626

.github/workflows/labeling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Apply labels based on changed files
28-
uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0
28+
uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0
2929
with:
3030
repo-token: ${{ secrets.GITHUB_TOKEN }}
3131
sync-labels: false

0 commit comments

Comments
 (0)