Skip to content

Commit 55bfadb

Browse files
GVodyanovGVodyanov
authored
Merge branch 'main' into fix/calendar-delegation-deck
2 parents 7669e04 + 7820bcc commit 55bfadb

461 files changed

Lines changed: 18897 additions & 5217 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# App maintainers
2-
* @luka-nextcloud @grnd-alt @elzody
2+
* @luka-nextcloud @grnd-alt

‎.github/dependabot.yml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ updates:
88
day: saturday
99
time: "03:00"
1010
timezone: Europe/Paris
11+
cooldown:
12+
default-days: 10
1113
open-pull-requests-limit: 10
1214
labels:
1315
- 3. to review
@@ -17,14 +19,16 @@ updates:
1719
- luka-nextcloud
1820

1921
- package-ecosystem: npm
20-
target-branch: stable33
22+
target-branch: stable34
2123
versioning-strategy: lockfile-only
2224
directory: "/"
2325
schedule:
2426
interval: weekly
2527
day: saturday
2628
time: "03:15"
2729
timezone: Europe/Paris
30+
cooldown:
31+
default-days: 10
2832
ignore:
2933
- dependency-name: "*"
3034
update-types: ["version-update:semver-major"]
@@ -37,14 +41,16 @@ updates:
3741
- luka-nextcloud
3842

3943
- package-ecosystem: npm
40-
target-branch: stable32
44+
target-branch: stable33
4145
versioning-strategy: lockfile-only
4246
directory: "/"
4347
schedule:
4448
interval: weekly
4549
day: saturday
4650
time: "03:15"
4751
timezone: Europe/Paris
52+
cooldown:
53+
default-days: 10
4854
ignore:
4955
- dependency-name: "*"
5056
update-types: ["version-update:semver-major"]
@@ -57,14 +63,16 @@ updates:
5763
- luka-nextcloud
5864

5965
- package-ecosystem: npm
60-
target-branch: stable31
66+
target-branch: stable32
6167
versioning-strategy: lockfile-only
6268
directory: "/"
6369
schedule:
6470
interval: weekly
6571
day: saturday
6672
time: "03:15"
6773
timezone: Europe/Paris
74+
cooldown:
75+
default-days: 10
6876
ignore:
6977
- dependency-name: "*"
7078
update-types: ["version-update:semver-major"]
@@ -83,6 +91,8 @@ updates:
8391
day: saturday
8492
time: "03:45"
8593
timezone: Europe/Paris
94+
cooldown:
95+
default-days: 10
8696
open-pull-requests-limit: 10
8797
reviewers:
8898
- juliushaertl
@@ -95,6 +105,8 @@ updates:
95105
day: saturday
96106
time: "04:00"
97107
timezone: Europe/Paris
108+
cooldown:
109+
default-days: 10
98110
open-pull-requests-limit: 10
99111
reviewers:
100112
- juliushaertl
@@ -107,6 +119,8 @@ updates:
107119
day: saturday
108120
time: "04:15"
109121
timezone: Europe/Paris
122+
cooldown:
123+
default-days: 10
110124
open-pull-requests-limit: 10
111125
reviewers:
112126
- juliushaertl

‎.github/workflows/appstore-build-publish.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
3636
3737
- name: Checkout
38-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
38+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3939
with:
4040
persist-credentials: false
4141
path: ${{ env.APP_NAME }}
@@ -71,7 +71,7 @@ jobs:
7171
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
7272
# Skip if no package.json
7373
if: ${{ steps.versions.outputs.nodeVersion }}
74-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
74+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
7575
with:
7676
node-version: ${{ steps.versions.outputs.nodeVersion }}
7777

@@ -87,7 +87,7 @@ jobs:
8787
filename: ${{ env.APP_NAME }}/appinfo/info.xml
8888

8989
- name: Set up php ${{ steps.php-versions.outputs.php-min }}
90-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
90+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
9191
with:
9292
php-version: ${{ steps.php-versions.outputs.php-min }}
9393
coverage: none
@@ -156,7 +156,7 @@ jobs:
156156
unzip nextcloud.zip
157157
158158
- name: Checkout server master fallback
159-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
159+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
160160
if: ${{ steps.server-download.outcome != 'success' }}
161161
with:
162162
persist-credentials: false
@@ -181,7 +181,7 @@ jobs:
181181
tar -zcvf ${{ env.APP_NAME }}.tar.gz ${{ env.APP_NAME }}
182182
183183
- name: Attach tarball to github release
184-
uses: svenstaro/upload-release-action@b98a3b12e86552593f3e4e577ca8a62aa2f3f22b # v2.11.4
184+
uses: svenstaro/upload-release-action@29e53e917877a24fad85510ded594ab3c9ca12de # v2.11.5
185185
id: attach_to_release
186186
with:
187187
repo_token: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
node-version: [20.x]
2626
containers: [1, 2, 3]
27-
php-versions: [ '8.2' ]
27+
php-versions: [ '8.3' ]
2828
server-versions: [ 'master' ]
2929

3030
name: runner ${{ matrix.containers }}
@@ -42,7 +42,7 @@ jobs:
4242

4343
steps:
4444
- name: Use Node.js ${{ matrix.node-version }}
45-
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
45+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
4646
with:
4747
node-version: ${{ matrix.node-version }}
4848

@@ -52,29 +52,29 @@ jobs:
5252
echo "text_app_ref=$text_app_ref" >> $GITHUB_ENV
5353
5454
- name: Checkout server
55-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
55+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5656
with:
5757
persist-credentials: false
5858
repository: nextcloud/server
5959
submodules: true
6060
ref: ${{ matrix.server-versions }}
6161

6262
- name: Checkout ${{ env.APP_NAME }}
63-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
63+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6464
with:
6565
persist-credentials: false
6666
path: apps/${{ env.APP_NAME }}
6767

6868
- name: Checkout text
69-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
69+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7070
with:
7171
persist-credentials: false
7272
repository: nextcloud/text
7373
ref: ${{ env.text_app_ref }}
7474
path: apps/text
7575

7676
- name: Set up php ${{ matrix.php-versions }}
77-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
77+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
7878
with:
7979
php-version: ${{ matrix.php-versions }}
8080
# https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
@@ -110,7 +110,7 @@ jobs:
110110
curl -v http://localhost:8081/index.php/login
111111
112112
- name: Cypress run
113-
uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
113+
uses: cypress-io/github-action@fa4a118725a8f001170d49631ea89e5d66fee626 # v7.4.1
114114
with:
115115
build: npm run dev
116116
record: false
@@ -126,15 +126,15 @@ jobs:
126126
SPLIT_INDEX: ${{ strategy.job-index }}
127127

128128
- name: Upload test failure screenshots
129-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
129+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
130130
if: failure()
131131
with:
132132
name: Upload screenshots
133133
path: apps/${{ env.APP_NAME }}/cypress/screenshots/
134134
retention-days: 5
135135

136136
- name: Upload nextcloud logs
137-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
137+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
138138
if: failure()
139139
with:
140140
name: Upload nextcloud log

‎.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/integration-federation.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,36 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
php-versions: ['8.2']
32+
php-versions: ['8.4']
3333
server-versions: ['master']
3434

3535
name: php${{ matrix.php-versions }}-${{ matrix.server-versions }}
3636

3737
steps:
3838
- name: Checkout server
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4040
with:
4141
persist-credentials: false
4242
repository: nextcloud/server
4343
ref: ${{ matrix.server-versions }}
4444
submodules: true
4545

4646
- name: Checkout app
47-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4848
with:
4949
persist-credentials: false
5050
path: apps/${{ env.APP_NAME }}
5151

5252
- name: Checkout activity
53-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
53+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5454
with:
5555
persist-credentials: false
5656
repository: nextcloud/activity
5757
ref: ${{ matrix.server-versions }}
5858
path: apps/activity
5959

6060
- name: Set up php ${{ matrix.php-versions }}
61-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
61+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
6262
with:
6363
php-version: ${{ matrix.php-versions }}
6464
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, apcu, gd

‎.github/workflows/integration.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
php-versions: ['8.2']
33+
php-versions: ['8.4']
3434
databases: ['sqlite', 'mysql', 'pgsql']
3535
server-versions: ['master']
3636

@@ -56,29 +56,29 @@ jobs:
5656

5757
steps:
5858
- name: Checkout server
59-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
59+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6060
with:
6161
persist-credentials: false
6262
repository: nextcloud/server
6363
ref: ${{ matrix.server-versions }}
6464
submodules: true
6565

6666
- name: Checkout app
67-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
67+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6868
with:
6969
persist-credentials: false
7070
path: apps/${{ env.APP_NAME }}
7171

7272
- name: Checkout activity
73-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
73+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7474
with:
7575
persist-credentials: false
7676
repository: nextcloud/activity
7777
ref: ${{ matrix.server-versions }}
7878
path: apps/activity
7979

8080
- name: Set up php ${{ matrix.php-versions }}
81-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
81+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # v2.37.2
8282
with:
8383
php-version: ${{ matrix.php-versions }}
8484
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, mysql, pdo_mysql, pgsql, pdo_pgsql, apcu, gd

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

Lines changed: 2 additions & 2 deletions
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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6060
with:
6161
persist-credentials: false
6262

@@ -68,7 +68,7 @@ jobs:
6868
fallbackNpm: '^11.3'
6969

7070
- name: Set up node ${{ steps.versions.outputs.nodeVersion }}
71-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
71+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
7272
with:
7373
node-version: ${{ steps.versions.outputs.nodeVersion }}
7474

‎.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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
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@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4747
with:
4848
persist-credentials: false
4949

5050
- name: Set up php ${{ matrix.php-versions }}
51-
uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2.36.0
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)