From 8fdfa9edaeaeef899d27dc3f81aa85c8392aac3e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 14 Aug 2024 12:36:05 +0200 Subject: [PATCH 1/2] feat(deps): Add Nextcloud 31 support on master Signed-off-by: Joas Schilling --- .github/dependabot.yml | 6 +++--- .github/workflows/update-nextcloud-ocp.yml | 2 +- appinfo/info.xml | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a5ccbb229..1bcde15c5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -40,7 +40,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable29 + target-branch: stable30 open-pull-requests-limit: 10 labels: - 3. to review @@ -56,7 +56,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable28 + target-branch: stable29 open-pull-requests-limit: 10 labels: - 3. to review @@ -72,7 +72,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable27 + target-branch: stable28 open-pull-requests-limit: 10 labels: - 3. to review diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index ae3f02039..c3f0df17e 100644 --- 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', 'stable27'] + branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 9dc9830b9..999043d0b 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -20,7 +20,7 @@ 📣 Announcement center: An announcement was posted by an admin]]> - 3.0.0 + 4.0.0 agpl Joas Schilling @@ -35,7 +35,7 @@ https://github.com/nextcloud/notifications.git - + diff --git a/package-lock.json b/package-lock.json index 348978d6c..7f3a3b7c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "notifications", - "version": "3.0.0", + "version": "4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "notifications", - "version": "3.0.0", + "version": "4.0.0", "license": "AGPL-3.0-only", "dependencies": { "@nextcloud/auth": "^2.3.0", diff --git a/package.json b/package.json index 3e824de93..4ef139237 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "notifications", "description": "This app provides a backend and frontend for the notification API available in Nextcloud.", - "version": "3.0.0", + "version": "4.0.0", "author": "Joas Schilling ", "license": "AGPL-3.0-only", "private": true, From 3cf1f13e656bfcbba7a0e825ac00d0b4a26bc8cb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 15 Aug 2024 08:26:37 +0200 Subject: [PATCH 2/2] chore(assets): Recompile assets Signed-off-by: Joas Schilling --- js/BrowserStorage-DbD1PIOF.chunk.mjs.license | 2 +- js/BrowserStorage-DbD1PIOF.chunk.mjs.map.license | 2 +- js/NotificationsApp-CsUTkRE1.chunk.mjs.license | 2 +- js/NotificationsApp-CsUTkRE1.chunk.mjs.map.license | 2 +- js/notifications-admin-settings.mjs.license | 2 +- js/notifications-admin-settings.mjs.map.license | 2 +- js/notifications-main.mjs.license | 2 +- js/notifications-main.mjs.map.license | 2 +- js/notifications-settings.mjs.license | 2 +- js/notifications-settings.mjs.map.license | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/js/BrowserStorage-DbD1PIOF.chunk.mjs.license b/js/BrowserStorage-DbD1PIOF.chunk.mjs.license index 3f3e7effe..1e4dbefb3 100644 --- a/js/BrowserStorage-DbD1PIOF.chunk.mjs.license +++ b/js/BrowserStorage-DbD1PIOF.chunk.mjs.license @@ -90,7 +90,7 @@ This file is generated from multiple sources. Included packages: - version: 2.3.0 - license: BSD-3-Clause - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only - striptags - version: 3.2.0 diff --git a/js/BrowserStorage-DbD1PIOF.chunk.mjs.map.license b/js/BrowserStorage-DbD1PIOF.chunk.mjs.map.license index 3f3e7effe..1e4dbefb3 100644 --- a/js/BrowserStorage-DbD1PIOF.chunk.mjs.map.license +++ b/js/BrowserStorage-DbD1PIOF.chunk.mjs.map.license @@ -90,7 +90,7 @@ This file is generated from multiple sources. Included packages: - version: 2.3.0 - license: BSD-3-Clause - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only - striptags - version: 3.2.0 diff --git a/js/NotificationsApp-CsUTkRE1.chunk.mjs.license b/js/NotificationsApp-CsUTkRE1.chunk.mjs.license index 5013f6712..b62e5d2bd 100644 --- a/js/NotificationsApp-CsUTkRE1.chunk.mjs.license +++ b/js/NotificationsApp-CsUTkRE1.chunk.mjs.license @@ -791,7 +791,7 @@ This file is generated from multiple sources. Included packages: - version: 2.30.1 - license: MIT - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only - property-information - version: 6.3.0 diff --git a/js/NotificationsApp-CsUTkRE1.chunk.mjs.map.license b/js/NotificationsApp-CsUTkRE1.chunk.mjs.map.license index 5013f6712..b62e5d2bd 100644 --- a/js/NotificationsApp-CsUTkRE1.chunk.mjs.map.license +++ b/js/NotificationsApp-CsUTkRE1.chunk.mjs.map.license @@ -791,7 +791,7 @@ This file is generated from multiple sources. Included packages: - version: 2.30.1 - license: MIT - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only - property-information - version: 6.3.0 diff --git a/js/notifications-admin-settings.mjs.license b/js/notifications-admin-settings.mjs.license index df5134039..137a6c864 100644 --- a/js/notifications-admin-settings.mjs.license +++ b/js/notifications-admin-settings.mjs.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Joas Schilling This file is generated from multiple sources. Included packages: - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only diff --git a/js/notifications-admin-settings.mjs.map.license b/js/notifications-admin-settings.mjs.map.license index df5134039..137a6c864 100644 --- a/js/notifications-admin-settings.mjs.map.license +++ b/js/notifications-admin-settings.mjs.map.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Joas Schilling This file is generated from multiple sources. Included packages: - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only diff --git a/js/notifications-main.mjs.license b/js/notifications-main.mjs.license index df5134039..137a6c864 100644 --- a/js/notifications-main.mjs.license +++ b/js/notifications-main.mjs.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Joas Schilling This file is generated from multiple sources. Included packages: - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only diff --git a/js/notifications-main.mjs.map.license b/js/notifications-main.mjs.map.license index df5134039..137a6c864 100644 --- a/js/notifications-main.mjs.map.license +++ b/js/notifications-main.mjs.map.license @@ -3,5 +3,5 @@ SPDX-FileCopyrightText: Joas Schilling This file is generated from multiple sources. Included packages: - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only diff --git a/js/notifications-settings.mjs.license b/js/notifications-settings.mjs.license index f91ec6cde..371ea41a0 100644 --- a/js/notifications-settings.mjs.license +++ b/js/notifications-settings.mjs.license @@ -5,7 +5,7 @@ SPDX-FileCopyrightText: Joas Schilling This file is generated from multiple sources. Included packages: - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only - ua-parser-js - version: 1.0.38 diff --git a/js/notifications-settings.mjs.map.license b/js/notifications-settings.mjs.map.license index f91ec6cde..371ea41a0 100644 --- a/js/notifications-settings.mjs.map.license +++ b/js/notifications-settings.mjs.map.license @@ -5,7 +5,7 @@ SPDX-FileCopyrightText: Joas Schilling This file is generated from multiple sources. Included packages: - notifications - - version: 3.0.0 + - version: 4.0.0 - license: AGPL-3.0-only - ua-parser-js - version: 1.0.38