Skip to content

Commit 58b10df

Browse files
Merge pull request #3376 from nextcloud/update-master-version
feat(deps): Add Nextcloud 34 support on master
2 parents 53f0cf9 + ccd4a56 commit 58b10df

File tree

47 files changed

+54
-51
lines changed

Some content is hidden

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

47 files changed

+54
-51
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ updates:
3838

3939
# Main stableXX npm
4040
- package-ecosystem: npm
41-
target-branch: stable32
41+
target-branch: stable33
4242
directory: "/"
4343
schedule:
4444
interval: weekly
@@ -54,7 +54,7 @@ updates:
5454
update-types: ["version-update:semver-major"]
5555

5656
- package-ecosystem: npm
57-
target-branch: stable31
57+
target-branch: stable32
5858
directory: "/"
5959
schedule:
6060
interval: weekly
@@ -67,10 +67,10 @@ updates:
6767
ignore:
6868
# do not do breaking changes on stable branches
6969
- dependency-name: "*"
70-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
70+
update-types: ["version-update:semver-major"]
7171

7272
- package-ecosystem: npm
73-
target-branch: stable30
73+
target-branch: stable31
7474
directory: "/"
7575
schedule:
7676
interval: weekly
@@ -81,6 +81,7 @@ updates:
8181
- "3. to review"
8282
- "dependencies"
8383
ignore:
84-
# only do patch releases on old stable
84+
# do not do breaking changes on stable branches
8585
- dependency-name: "*"
8686
update-types: ["version-update:semver-major", "version-update:semver-minor"]
87+

.github/workflows/npm-audit-fix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
matrix:
2727
branches:
2828
- ${{ github.event.repository.default_branch }}
29+
- 'stable33'
2930
- 'stable32'
3031
- 'stable31'
3132

.github/workflows/update-nextcloud-ocp.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
matrix:
2727
branches:
2828
- ${{ github.event.repository.default_branch }}
29+
- 'stable33'
2930
- 'stable32'
3031
- 'stable31'
3132

appinfo/info.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<name>Photos</name>
1010
<summary>Your memories under your control</summary>
1111
<description>Your memories under your control</description>
12-
<version>6.0.0-dev.0</version>
12+
<version>7.0.0-dev.0</version>
1313
<licence>agpl</licence>
1414
<author mail="[email protected]">John Molakvoæ</author>
1515
<namespace>Photos</namespace>
@@ -23,7 +23,7 @@
2323
<bugs>https://github.com/nextcloud/photos/issues</bugs>
2424
<repository>https://github.com/nextcloud/photos.git</repository>
2525
<dependencies>
26-
<nextcloud min-version="33" max-version="33" />
26+
<nextcloud min-version="34" max-version="34" />
2727
</dependencies>
2828
<navigations>
2929
<navigation>

js/AbortControllerMixin-Bb5X6Yae.chunk.mjs.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <[email protected]>
33

44
This file is generated from multiple sources. Included packages:
55
- photos
6-
- version: 6.0.0-dev.0
6+
- version: 7.0.0-dev.0
77
- license: AGPL-3.0-or-later

js/ActionFavorite-7rTcVpSr.chunk.mjs.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <[email protected]>
33

44
This file is generated from multiple sources. Included packages:
55
- photos
6-
- version: 6.0.0-dev.0
6+
- version: 7.0.0-dev.0
77
- license: AGPL-3.0-or-later

js/AlbumContent-AqatWZjx.chunk.mjs.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <[email protected]>
33

44
This file is generated from multiple sources. Included packages:
55
- photos
6-
- version: 6.0.0-dev.0
6+
- version: 7.0.0-dev.0
77
- license: AGPL-3.0-or-later

js/AlbumForm-RjiiBLP7.chunk.mjs.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ This file is generated from multiple sources. Included packages:
88
- version: 7.4.47
99
- license: Apache-2.0
1010
- photos
11-
- version: 6.0.0-dev.0
11+
- version: 7.0.0-dev.0
1212
- license: AGPL-3.0-or-later

js/AlbumsView-BRJEFUGf.chunk.mjs.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <[email protected]>
33

44
This file is generated from multiple sources. Included packages:
55
- photos
6-
- version: 6.0.0-dev.0
6+
- version: 7.0.0-dev.0
77
- license: AGPL-3.0-or-later

js/CollectionContent-BxIYqcaH.chunk.mjs.license

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <[email protected]>
33

44
This file is generated from multiple sources. Included packages:
55
- photos
6-
- version: 6.0.0-dev.0
6+
- version: 7.0.0-dev.0
77
- license: AGPL-3.0-or-later

0 commit comments

Comments
 (0)