Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ updates:

# Main stableXX npm
- package-ecosystem: npm
target-branch: stable32
target-branch: stable33
directory: "/"
schedule:
interval: weekly
Expand All @@ -54,7 +54,7 @@ updates:
update-types: ["version-update:semver-major"]

- package-ecosystem: npm
target-branch: stable31
target-branch: stable32
directory: "/"
schedule:
interval: weekly
Expand All @@ -67,10 +67,10 @@ updates:
ignore:
# do not do breaking changes on stable branches
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: ["version-update:semver-major"]

- package-ecosystem: npm
target-branch: stable30
target-branch: stable31
directory: "/"
schedule:
interval: weekly
Expand All @@ -81,6 +81,7 @@ updates:
- "3. to review"
- "dependencies"
ignore:
# only do patch releases on old stable
# do not do breaking changes on stable branches
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]

1 change: 1 addition & 0 deletions .github/workflows/npm-audit-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
matrix:
branches:
- ${{ github.event.repository.default_branch }}
- 'stable33'
- 'stable32'
- 'stable31'

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update-nextcloud-ocp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
matrix:
branches:
- ${{ github.event.repository.default_branch }}
- 'stable33'
- 'stable32'
- 'stable31'

Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>Photos</name>
<summary>Your memories under your control</summary>
<description>Your memories under your control</description>
<version>6.0.0-dev.0</version>
<version>7.0.0-dev.0</version>
<licence>agpl</licence>
<author mail="skjnldsv@protonmail.com">John Molakvoæ</author>
<namespace>Photos</namespace>
Expand All @@ -23,7 +23,7 @@
<bugs>https://github.com/nextcloud/photos/issues</bugs>
<repository>https://github.com/nextcloud/photos.git</repository>
<dependencies>
<nextcloud min-version="33" max-version="33" />
<nextcloud min-version="34" max-version="34" />
</dependencies>
<navigations>
<navigation>
Expand Down
2 changes: 1 addition & 1 deletion js/AbortControllerMixin-Bb5X6Yae.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/ActionFavorite-7rTcVpSr.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/AlbumContent-AqatWZjx.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/AlbumForm-RjiiBLP7.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ This file is generated from multiple sources. Included packages:
- version: 7.4.47
- license: Apache-2.0
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/AlbumsView-BRJEFUGf.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/CollectionContent-BxIYqcaH.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/CollectionsList-B7H5GieH.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FaceContent-5XRK_xd6.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FaceCover-y62LmE3b.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ This file is generated from multiple sources. Included packages:
- version: 1.2.0
- license: MIT
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FaceMergeForm-BHfOqGG8.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FacesView-5rYPf97C.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FetchCollectionContentMixin-NK9nekKH.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FetchCollectionsMixin-DcEv3N9Z.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FetchFilesMixin-BGmLOce1.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FileComponent-A6f_Dtn9.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ This file is generated from multiple sources. Included packages:
- version: 2.0.5
- license: MIT
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FilesByMonthMixin-BLjMI05j.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FilesSelectionMixin-1nnlfofj.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/FoldersView-Dcwlkt86.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
- vue-virtual-grid
- version: 2.5.0
Expand Down
2 changes: 1 addition & 1 deletion js/HeaderNavigation-DLWOytuO.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/NcColorPicker-DUXt6lMy.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This file is generated from multiple sources. Included packages:
- version: 4.3.2
- license: MIT
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
- tributejs
- version: 5.1.3
Expand Down
2 changes: 1 addition & 1 deletion js/PhotoSearch-3PnBhHOR.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/PhotosFiltersInput-B33sPvuK.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ This file is generated from multiple sources. Included packages:
- version: 8.34.0
- license: AGPL-3.0-or-later
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/PhotosPicker-BqDrlTqO.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/PhotosTab-D-NwEPMj.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This file is generated from multiple sources. Included packages:
- version: 0.1.2
- license: BSD-2-Clause
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
- vue2-leaflet
- version: 2.7.1
Expand Down
2 changes: 1 addition & 1 deletion js/PlaceContent-BZqiCRWm.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/PlacesView-B9ABlKau.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/SharedAlbumContent-Cott4oI9.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/SharedAlbums-CXfNN7vH.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/TagContent-Dwv-Pa3i.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/TagsView-DUUPrt_d.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/TimelineView-Bzb4Tj8Y.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/UnassignedFaces-DI8NVoO-.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/collectionFetcher-D94WC1TK.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/fileFetcher-CFJaIlCO.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/filters-Ck71oeb9.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This file is generated from multiple sources. Included packages:
- version: 6.6.4
- license: MIT
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
- pinia
- version: 2.3.1
Expand Down
2 changes: 1 addition & 1 deletion js/index-Dgdobvu3.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ This file is generated from multiple sources. Included packages:
- version: 7.6.6
- license: MIT
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
- tabbable
- version: 6.3.0
Expand Down
2 changes: 1 addition & 1 deletion js/photos-dashboard.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/photos-main.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ This file is generated from multiple sources. Included packages:
- version: 8.34.0
- license: AGPL-3.0-or-later
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/photos-public.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: John Molakvoæ <skjnldsv@protonmail.com>

This file is generated from multiple sources. Included packages:
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/photos-sidebar.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ This file is generated from multiple sources. Included packages:
- version: 7.4.47
- license: Apache-2.0
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/video-eu9Y2O-I.chunk.mjs.license
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This file is generated from multiple sources. Included packages:
- version: 3.3.11
- license: MIT
- photos
- version: 6.0.0-dev.0
- version: 7.0.0-dev.0
- license: AGPL-3.0-or-later
- splitpanes
- version: 2.4.1
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "photos",
"version": "6.0.0-dev.0",
"version": "7.0.0-dev.0",
"private": true,
"description": "Your memories under your control",
"keywords": [
Expand Down
Loading