Skip to content

Commit 1a93e00

Browse files
max-nextcloudmax-nextcloud
authored
Merge branch 'main' into fix/smartpicker_page_title
2 parents 7ea43ab + 1238a37 commit 1a93e00

59 files changed

Lines changed: 1720 additions & 1228 deletions

Some content is hidden

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

‎.github/workflows/app-upgrade-mysql.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ jobs:
6464
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
6565
6666
- name: Checkout server
67-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
67+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6868
with:
6969
submodules: true
7070
repository: nextcloud/server
7171
ref: ${{ matrix.server-versions }}
7272

7373
- name: Checkout circles app
74-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
74+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7575
with:
7676
repository: nextcloud/circles
7777
path: apps/circles
@@ -83,14 +83,14 @@ jobs:
8383
echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
8484
8585
- name: Checkout text app
86-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
86+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8787
with:
8888
repository: nextcloud/text
8989
path: apps/text
9090
ref: ${{ env.text_app_ref }}
9191

9292
- name: Checkout viewer app
93-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
93+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9494
with:
9595
repository: nextcloud/viewer
9696
path: apps/viewer
@@ -104,7 +104,7 @@ jobs:
104104
download: true
105105

106106
- name: Set up php ${{ matrix.php-versions }}
107-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
107+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
108108
with:
109109
php-version: ${{ matrix.php-versions }}
110110
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -134,7 +134,7 @@ jobs:
134134
rm -r apps/collectives
135135
136136
- name: Checkout app
137-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
137+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
138138
with:
139139
path: apps/${{ env.APP_NAME }}
140140

‎.github/workflows/app-upgrade-postgres.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ jobs:
6666
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
6767
6868
- name: Checkout server
69-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
69+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7070
with:
7171
submodules: true
7272
repository: nextcloud/server
7373
ref: ${{ matrix.server-versions }}
7474

7575
- name: Checkout circles app
76-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
76+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7777
with:
7878
repository: nextcloud/circles
7979
path: apps/circles
@@ -85,14 +85,14 @@ jobs:
8585
echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
8686
8787
- name: Checkout text app
88-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
88+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8989
with:
9090
repository: nextcloud/text
9191
path: apps/text
9292
ref: ${{ env.text_app_ref }}
9393

9494
- name: Checkout viewer app
95-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
95+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9696
with:
9797
repository: nextcloud/viewer
9898
path: apps/viewer
@@ -106,7 +106,7 @@ jobs:
106106
download: true
107107

108108
- name: Set up php ${{ matrix.php-versions }}
109-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
109+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
110110
with:
111111
php-version: ${{ matrix.php-versions }}
112112
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -131,7 +131,7 @@ jobs:
131131
rm -r apps/collectives
132132
133133
- name: Checkout app
134-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
134+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
135135
with:
136136
path: apps/${{ env.APP_NAME }}
137137

‎.github/workflows/behat-sqlite-encryption.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@ jobs:
5959
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
6060
6161
- name: Checkout server
62-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
62+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6363
with:
6464
persist-credentials: false
6565
submodules: true
6666
repository: nextcloud/server
6767
ref: ${{ matrix.server-versions }}
6868

6969
- name: Checkout circles app
70-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
70+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7171
with:
7272
persist-credentials: false
7373
repository: nextcloud/circles
7474
path: apps/circles
7575
ref: ${{ matrix.server-versions }}
7676

7777
- name: Checkout app
78-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
78+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7979
with:
8080
persist-credentials: false
8181
path: apps/${{ env.APP_NAME }}
8282

8383
- name: Set up php ${{ matrix.php-versions }}
84-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
84+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
8585
with:
8686
php-version: ${{ matrix.php-versions }}
8787
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/behat-sqlite.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,29 +58,29 @@ jobs:
5858
echo "APP_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
5959
6060
- name: Checkout server
61-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
61+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6262
with:
6363
persist-credentials: false
6464
submodules: true
6565
repository: nextcloud/server
6666
ref: ${{ matrix.server-versions }}
6767

6868
- name: Checkout circles app
69-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
69+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7070
with:
7171
persist-credentials: false
7272
repository: nextcloud/circles
7373
path: apps/circles
7474
ref: ${{ matrix.server-versions }}
7575

7676
- name: Checkout app
77-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
77+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7878
with:
7979
persist-credentials: false
8080
path: apps/${{ env.APP_NAME }}
8181

8282
- name: Set up php ${{ matrix.php-versions }}
83-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
83+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
8484
with:
8585
php-version: ${{ matrix.php-versions }}
8686
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/cypress-e2e.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,39 +73,39 @@ jobs:
7373

7474
steps:
7575
- name: Checkout server
76-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
76+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7777
with:
7878
persist-credentials: false
7979
submodules: true
8080
repository: nextcloud/server
8181
ref: ${{ matrix.server-versions }}
8282

8383
- name: Checkout circles app
84-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
84+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8585
with:
8686
persist-credentials: false
8787
repository: nextcloud/circles
8888
path: apps/circles
8989
ref: ${{ matrix.server-versions }}
9090

9191
- name: Checkout files_pdfviewer app
92-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
92+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9393
with:
9494
persist-credentials: false
9595
repository: nextcloud/files_pdfviewer
9696
path: apps/files_pdfviewer
9797
ref: ${{ matrix.server-versions }}
9898

9999
- name: Checkout notifications app
100-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
100+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
101101
with:
102102
persist-credentials: false
103103
repository: nextcloud/notifications
104104
path: apps/notifications
105105
ref: ${{ matrix.server-versions }}
106106

107107
- name: Checkout password_policy app
108-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
108+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
109109
with:
110110
persist-credentials: false
111111
repository: nextcloud/password_policy
@@ -118,15 +118,15 @@ jobs:
118118
echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
119119
120120
- name: Checkout text app
121-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
121+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
122122
with:
123123
persist-credentials: false
124124
repository: nextcloud/text
125125
path: apps/text
126126
ref: ${{ env.text_app_ref }}
127127

128128
- name: Checkout viewer app
129-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
129+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
130130
with:
131131
persist-credentials: false
132132
repository: nextcloud/viewer
@@ -142,7 +142,7 @@ jobs:
142142
download: true
143143

144144
- name: Checkout app
145-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
145+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
146146
with:
147147
persist-credentials: false
148148
path: apps/${{ env.APP_NAME }}
@@ -216,7 +216,7 @@ jobs:
216216
run: npm i -g 'npm@${{ needs.init.outputs.npmVersion }}'
217217

218218
- name: Set up php ${{ matrix.php-versions }}
219-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
219+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
220220
with:
221221
php-version: ${{ matrix.php-versions }}
222222
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation

‎.github/workflows/dependabot-approve-merge.yml‎

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

5353
# Enable GitHub auto merge
5454
- name: Auto merge
55-
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
55+
uses: alexwilson/enable-github-automerge-action@2c32e18a76e0726ffe7a573bfff2d42a20885126 # v3.0.0
5656
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
5757
with:
5858
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/lint-eslint.yml‎

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

5757
steps:
5858
- name: Checkout
59-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
59+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6060
with:
6161
persist-credentials: false
6262

‎.github/workflows/lint-info-xml.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: info.xml lint
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
with:
2929
persist-credentials: false
3030

‎.github/workflows/lint-php-cs.yml‎

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

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
28+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2929
with:
3030
persist-credentials: false
3131

@@ -34,7 +34,7 @@ jobs:
3434
uses: icewind1991/nextcloud-version-matrix@8a7bac6300b2f0f3100088b297995a229558ddba # v1.3.2.3.1.3.2
3535

3636
- name: Set up php${{ steps.versions.outputs.php-min }}
37-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
37+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
3838
with:
3939
php-version: ${{ steps.versions.outputs.php-min }}
4040
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

‎.github/workflows/lint-php.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
php-versions: ${{ steps.versions.outputs.php-versions }}
2525
steps:
2626
- name: Checkout app
27-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
27+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
with:
2929
persist-credentials: false
3030

@@ -43,12 +43,12 @@ jobs:
4343

4444
steps:
4545
- name: Checkout
46-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
46+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4747
with:
4848
persist-credentials: false
4949

5050
- name: Set up php ${{ matrix.php-versions }}
51-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
51+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
5252
with:
5353
php-version: ${{ matrix.php-versions }}
5454
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite

0 commit comments

Comments
 (0)