diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1d64b0af4..ff8334009 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -30,6 +30,22 @@ updates: labels: - 3. to review - dependencies +- package-ecosystem: npm + directory: "/" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + target-branch: stable31 + open-pull-requests-limit: 10 + 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 index b3d4c266f..3f3d1c9fd 100644 --- 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', 'stable30', 'stable29', 'stable28'] + branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/update-nextcloud-ocp.yml b/.github/workflows/update-nextcloud-ocp.yml index 90abc74b7..08e5b5e89 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', 'stable30', 'stable29', 'stable28'] + branches: ['main', 'master', 'stable31', 'stable30', 'stable29'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 48197104c..bb81ac4b1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -20,7 +20,7 @@ 📣 Announcement center: An announcement was posted by an admin]]> - 4.0.0 + 5.0.0-dev.0 agpl Joas Schilling @@ -35,7 +35,7 @@ https://github.com/nextcloud/notifications.git - + diff --git a/js/BrowserStorage-D6kcvwSJ.chunk.mjs.license b/js/BrowserStorage-D6kcvwSJ.chunk.mjs.license index d3096dc38..7b7b27a10 100644 --- a/js/BrowserStorage-D6kcvwSJ.chunk.mjs.license +++ b/js/BrowserStorage-D6kcvwSJ.chunk.mjs.license @@ -81,7 +81,7 @@ This file is generated from multiple sources. Included packages: - version: 2.3.0 - license: BSD-3-Clause - notifications - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only - striptags - version: 3.2.0 diff --git a/js/BrowserStorage-D6kcvwSJ.chunk.mjs.map.license b/js/BrowserStorage-D6kcvwSJ.chunk.mjs.map.license index d3096dc38..7b7b27a10 100644 --- a/js/BrowserStorage-D6kcvwSJ.chunk.mjs.map.license +++ b/js/BrowserStorage-D6kcvwSJ.chunk.mjs.map.license @@ -81,7 +81,7 @@ This file is generated from multiple sources. Included packages: - version: 2.3.0 - license: BSD-3-Clause - notifications - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only - striptags - version: 3.2.0 diff --git a/js/NotificationsApp-BblOjCtt.chunk.mjs.license b/js/NotificationsApp-BblOjCtt.chunk.mjs.license index 1496d7320..ea804303e 100644 --- a/js/NotificationsApp-BblOjCtt.chunk.mjs.license +++ b/js/NotificationsApp-BblOjCtt.chunk.mjs.license @@ -788,7 +788,7 @@ This file is generated from multiple sources. Included packages: - version: 2.30.1 - license: MIT - notifications - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only - property-information - version: 6.3.0 diff --git a/js/NotificationsApp-BblOjCtt.chunk.mjs.map.license b/js/NotificationsApp-BblOjCtt.chunk.mjs.map.license index 1496d7320..ea804303e 100644 --- a/js/NotificationsApp-BblOjCtt.chunk.mjs.map.license +++ b/js/NotificationsApp-BblOjCtt.chunk.mjs.map.license @@ -788,7 +788,7 @@ This file is generated from multiple sources. Included packages: - version: 2.30.1 - license: MIT - notifications - - version: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only - property-information - version: 6.3.0 diff --git a/js/notifications-admin-settings.mjs b/js/notifications-admin-settings.mjs index 8a2613e75..bdef2836d 100644 --- a/js/notifications-admin-settings.mjs +++ b/js/notifications-admin-settings.mjs @@ -1,2 +1,2 @@ /*! third party licenses: js/vendor.LICENSE.txt */ -import{V as c}from"./style-N1aAjoYj.chunk.mjs";import{n as f,N as _,l as d,c as l,v as p,s as g,a as h}from"./_plugin-vue2_normalizer-CT8YLgqQ.chunk.mjs";import{N as m}from"./NcSettingsSection-DHX2Y1Ed-SscixbTT.chunk.mjs";const s={EMAIL_SEND_OFF:0,EMAIL_SEND_HOURLY:1,EMAIL_SEND_3HOURLY:2,EMAIL_SEND_DAILY:3,EMAIL_SEND_WEEKLY:4},v={name:"AdminSettings",components:{NcCheckboxRadioSwitch:_,NcSettingsSection:m},data(){return{batchtime_options:[{text:t("notifications","Never"),value:s.EMAIL_SEND_OFF},{text:t("notifications","1 hour"),value:s.EMAIL_SEND_HOURLY},{text:t("notifications","3 hours"),value:s.EMAIL_SEND_3HOURLY},{text:t("notifications","1 day"),value:s.EMAIL_SEND_DAILY},{text:t("notifications","1 week"),value:s.EMAIL_SEND_WEEKLY}],config:d("notifications","config")}},methods:{async updateSettings(){try{const i=new FormData;i.append("batchSetting",this.config.setting_batchtime),i.append("soundNotification",this.config.sound_notification?"yes":"no"),i.append("soundTalk",this.config.sound_talk?"yes":"no"),await l.post(p("apps/notifications/api/v2/settings/admin"),i),g(t("notifications","Your settings have been updated."))}catch(i){h(t("notifications","An error occurred while updating your settings.")),console.error(i)}}}};var E=function(){var i=this,o=i._self._c;return o("NcSettingsSection",{attrs:{name:i.t("notifications","Notifications defaults"),description:i.t("notifications","Configure the default notification settings for new users")}},[o("p",[o("label",{staticClass:"notification-frequency__label",attrs:{for:"notify_setting_batchtime"}},[i._v(" "+i._s(i.t("notifications","Send email reminders about unhandled notifications after:"))+" ")]),o("select",{directives:[{name:"model",rawName:"v-model",value:i.config.setting_batchtime,expression:"config.setting_batchtime"}],staticClass:"notification-frequency__select",attrs:{id:"notify_setting_batchtime"},on:{change:[function(e){var r=Array.prototype.filter.call(e.target.options,function(a){return a.selected}).map(function(a){var u="_value"in a?a._value:a.value;return u});i.$set(i.config,"setting_batchtime",e.target.multiple?r:r[0])},function(e){return i.updateSettings()}]}},i._l(i.batchtime_options,function(e){return o("option",{key:e.value,domProps:{value:e.value}},[i._v(" "+i._s(e.text)+" ")])}),0)]),o("NcCheckboxRadioSwitch",{attrs:{checked:i.config.sound_notification},on:{"update:checked":[function(e){return i.$set(i.config,"sound_notification",e)},i.updateSettings]}},[i._v(" "+i._s(i.t("notifications","Play sound when a new notification arrives"))+" ")]),o("NcCheckboxRadioSwitch",{attrs:{checked:i.config.sound_talk},on:{"update:checked":[function(e){return i.$set(i.config,"sound_talk",e)},i.updateSettings]}},[i._v(" "+i._s(i.t("notifications","Play sound when a call started (requires Nextcloud Talk)"))+" ")])],1)},S=[],N=f(v,E,S,!1,null,null);const L=N.exports;c.prototype.t=t,c.prototype.n=n,new c({el:"#notifications-admin-settings",render:i=>i(L)}); +import{V as c}from"./style-N1aAjoYj.chunk.mjs";import{n as f,N as d,l as _,c as l,v as p,s as g,a as h}from"./_plugin-vue2_normalizer-CT8YLgqQ.chunk.mjs";import{N as m}from"./NcSettingsSection-DHX2Y1Ed-SscixbTT.chunk.mjs";const s={EMAIL_SEND_OFF:0,EMAIL_SEND_HOURLY:1,EMAIL_SEND_3HOURLY:2,EMAIL_SEND_DAILY:3,EMAIL_SEND_WEEKLY:4},v={name:"AdminSettings",components:{NcCheckboxRadioSwitch:d,NcSettingsSection:m},data(){return{batchtime_options:[{text:t("notifications","Never"),value:s.EMAIL_SEND_OFF},{text:t("notifications","1 hour"),value:s.EMAIL_SEND_HOURLY},{text:t("notifications","3 hours"),value:s.EMAIL_SEND_3HOURLY},{text:t("notifications","1 day"),value:s.EMAIL_SEND_DAILY},{text:t("notifications","1 week"),value:s.EMAIL_SEND_WEEKLY}],config:_("notifications","config")}},methods:{async updateSettings(){try{const i=new FormData;i.append("batchSetting",this.config.setting_batchtime),i.append("soundNotification",this.config.sound_notification?"yes":"no"),i.append("soundTalk",this.config.sound_talk?"yes":"no"),await l.post(p("apps/notifications/api/v2/settings/admin"),i),g(t("notifications","Your settings have been updated."))}catch(i){h(t("notifications","An error occurred while updating your settings.")),console.error(i)}}}};var E=function(){var i=this,o=i._self._c;return o("NcSettingsSection",{attrs:{name:i.t("notifications","Notifications defaults"),description:i.t("notifications","Configure the default notification settings for new users")}},[o("p",[o("label",{staticClass:"notification-frequency__label",attrs:{for:"notify_setting_batchtime"}},[i._v(" "+i._s(i.t("notifications","Send email reminders about unhandled notifications after:"))+" ")]),o("select",{directives:[{name:"model",rawName:"v-model",value:i.config.setting_batchtime,expression:"config.setting_batchtime"}],staticClass:"notification-frequency__select",attrs:{id:"notify_setting_batchtime"},on:{change:[function(e){var r=Array.prototype.filter.call(e.target.options,function(a){return a.selected}).map(function(a){var u="_value"in a?a._value:a.value;return u});i.$set(i.config,"setting_batchtime",e.target.multiple?r:r[0])},function(e){return i.updateSettings()}]}},i._l(i.batchtime_options,function(e){return o("option",{key:e.value,domProps:{value:e.value}},[i._v(" "+i._s(e.text)+" ")])}),0)]),o("NcCheckboxRadioSwitch",{attrs:{checked:i.config.sound_notification},on:{"update:checked":[function(e){return i.$set(i.config,"sound_notification",e)},i.updateSettings]}},[i._v(" "+i._s(i.t("notifications","Play sound when a new notification arrives"))+" ")]),o("NcCheckboxRadioSwitch",{attrs:{checked:i.config.sound_talk},on:{"update:checked":[function(e){return i.$set(i.config,"sound_talk",e)},i.updateSettings]}},[i._v(" "+i._s(i.t("notifications","Play sound when a call started (requires Nextcloud Talk)"))+" ")])],1)},S=[],N=f(v,E,S,!1,null,null);const L=N.exports;c.prototype.t=t,c.prototype.n=n,new c({el:"#notifications-admin-settings",render:i=>i(L)}); diff --git a/js/notifications-admin-settings.mjs.license b/js/notifications-admin-settings.mjs.license index 137a6c864..3c792b4f8 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: 4.0.0 + - version: 5.0.0-dev.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 137a6c864..3c792b4f8 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: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only diff --git a/js/notifications-main.mjs.license b/js/notifications-main.mjs.license index 137a6c864..3c792b4f8 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: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only diff --git a/js/notifications-main.mjs.map.license b/js/notifications-main.mjs.map.license index 137a6c864..3c792b4f8 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: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only diff --git a/js/notifications-settings.mjs.license b/js/notifications-settings.mjs.license index 3a4abc17e..36b3028b1 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: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only - ua-parser-js - version: 2.0.0 diff --git a/js/notifications-settings.mjs.map.license b/js/notifications-settings.mjs.map.license index 3a4abc17e..36b3028b1 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: 4.0.0 + - version: 5.0.0-dev.0 - license: AGPL-3.0-only - ua-parser-js - version: 2.0.0 diff --git a/package-lock.json b/package-lock.json index b77fc1c66..3947ed472 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "notifications", - "version": "4.0.0", + "version": "5.0.0-dev.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "notifications", - "version": "4.0.0", + "version": "5.0.0-dev.0", "license": "AGPL-3.0-only", "dependencies": { "@nextcloud/auth": "^2.4.0", diff --git a/package.json b/package.json index 018f48ebe..3e777a5b4 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": "4.0.0", + "version": "5.0.0-dev.0", "author": "Joas Schilling ", "license": "AGPL-3.0-only", "private": true,