Merge pull request #2598 from nextcloud/update-master-version

nextcloud · Aug 14, 2024 · adbe570 · adbe570
2 parents aeea1f5 + 62f88a7
commit adbe570
Show file tree

Hide file tree

Showing 36 changed files with 56 additions and 40 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -23,6 +23,22 @@ updates:
     - "dependencies"
 
 # Main stableXX npm
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: weekly
+    day: saturday
+    time: "03:00"
+    timezone: Europe/Paris
+  target-branch: stable30
+  labels:
+    - "3. to review"
+    - "dependencies"
+  ignore:
+    # ignore all GitHub linguist patch updates
+    - dependency-name: "*"
+      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+
 - package-ecosystem: npm
   directory: "/"
   schedule:

diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable29', 'stable28']
+        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
 
     name: npm-audit-fix-${{ matrix.branches }}
 

diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ['main', 'master', 'stable29', 'stable28']
+        branches: ['main', 'master', 'stable30', 'stable29', 'stable28']
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -9,7 +9,7 @@
     <name>Photos</name>
     <summary>Your memories under your control</summary>
     <description>Your memories under your control</description>
-    <version>3.0.1</version>
+    <version>4.0.0</version>
     <licence>agpl</licence>
     <author mail="[email protected]">John Molakvoæ</author>
     <namespace>Photos</namespace>
@@ -24,7 +24,7 @@
     <repository>https://github.com/nextcloud/photos.git</repository>
     <default_enable />
     <dependencies>
-        <nextcloud min-version="30" max-version="30" />
+        <nextcloud min-version="31" max-version="31" />
     </dependencies>
     <navigations>
         <navigation>

diff --git a/js/photos-dashboard.js b/js/photos-dashboard.js
diff --git a/js/photos-dashboard.js.license b/js/photos-dashboard.js.license
@@ -671,5 +671,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-dashboard.js.map b/js/photos-dashboard.js.map
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.license b/js/photos-main.js.license
@@ -824,5 +824,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...dist_esm_index_js-node_modules_vue-material-design-icons_ArrowLeft_vue--996eaf.js.license b/...dist_esm_index_js-node_modules_vue-material-design-icons_ArrowLeft_vue--996eaf.js.license
@@ -807,5 +807,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...dist_esm_index_js-node_modules_vue-material-design-icons_ArrowLeft_vue--f24de2.js.license b/...dist_esm_index_js-node_modules_vue-material-design-icons_ArrowLeft_vue--f24de2.js.license
@@ -807,5 +807,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...dist_esm_index_js-node_modules_vue-material-design-icons_PackageVariant-6bf9ec.js.license b/...dist_esm_index_js-node_modules_vue-material-design-icons_PackageVariant-6bf9ec.js.license
@@ -823,5 +823,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...dist_esm_index_js-node_modules_vue-material-design-icons_PackageVariant-bff37a.js.license b/...dist_esm_index_js-node_modules_vue-material-design-icons_PackageVariant-bff37a.js.license
@@ -789,5 +789,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-node_modules_moment_locale_sync_recursive_-src_views_PhotosTab_vue.js.license b/js/photos-node_modules_moment_locale_sync_recursive_-src_views_PhotosTab_vue.js.license
@@ -111,5 +111,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.7.1
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...os-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.license b/...os-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.license
@@ -829,5 +829,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...s_vue-material-design-icons_FolderMultipleImage_vue-src_views_AlbumContent_vue.js.license b/...s_vue-material-design-icons_FolderMultipleImage_vue-src_views_AlbumContent_vue.js.license
@@ -845,5 +845,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.license b/js/photos-public.js.license
@@ -817,5 +817,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-sidebar.js.license b/js/photos-sidebar.js.license
@@ -66,5 +66,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 5.82.1
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_components_Albums_AlbumForm_vue.js.license b/js/photos-src_components_Albums_AlbumForm_vue.js.license
@@ -806,5 +806,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...rc_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js.license b/...rc_components_Collection_CollectionContent_vue-src_components_PhotosPicker_vue.js.license
@@ -839,5 +839,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...llerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.license b/...llerMixin_js-src_mixins_FilesSelectionMixin_js-src_components_File_vue--80ca54.js.license
@@ -789,5 +789,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/...-src_mixins_FetchCollectionContentMixin_js-src_components_HeaderNavigation_vue.js.license b/...-src_mixins_FetchCollectionContentMixin_js-src_components_HeaderNavigation_vue.js.license
@@ -799,5 +799,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js.license b/js/photos-src_mixins_FetchFilesMixin_js-src_components_Faces_FaceMergeForm_vue.js.license
@@ -294,5 +294,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.1.9
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_Albums_vue.js.license b/js/photos-src_views_Albums_vue.js.license
@@ -806,5 +806,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_FaceContent_vue.js.license b/js/photos-src_views_FaceContent_vue.js.license
@@ -823,5 +823,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_Faces_vue.js.license b/js/photos-src_views_Faces_vue.js.license
@@ -789,5 +789,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_Folders_vue.js.license b/js/photos-src_views_Folders_vue.js.license
@@ -822,5 +822,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_Places_vue.js.license b/js/photos-src_views_Places_vue.js.license
@@ -791,5 +791,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_SharedAlbumContent_vue.js.license b/js/photos-src_views_SharedAlbumContent_vue.js.license
@@ -842,5 +842,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_SharedAlbums_vue.js.license b/js/photos-src_views_SharedAlbums_vue.js.license
@@ -791,5 +791,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/js/photos-src_views_Tags_vue.js.license b/js/photos-src_views_Tags_vue.js.license
@@ -614,5 +614,5 @@ This file is generated from multiple sources. Included packages:
 	- version: 2.0.4
 	- license: MIT
 - photos
-	- version: 3.0.0
+	- version: 4.0.0
 	- license: AGPL-3.0-or-later
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "photos",
   "description": "Your memories under your control",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "author": "John Molakvoæ <[email protected]>",
   "contributors": [
     "John Molakvoæ <[email protected]>"