From 8baba59ea596796972b8d59b354530b9f6c655f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Nov 2025 15:23:55 +0000
Subject: [PATCH 1/4] Bump js-yaml from 4.1.0 to 4.1.1 in /frontend

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 4.1.0 to 4.1.1.
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/4.1.0...4.1.1)

---
updated-dependencies:
- dependency-name: js-yaml
  dependency-version: 4.1.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 frontend/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 30c3f60ad..4a279e58d 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1655,9 +1655,9 @@ js-tokens@^4.0.0:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
+  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
   dependencies:
     argparse "^2.0.1"
 

From 283d037e180960ab03c4ad392679dcf4dba9ecea Mon Sep 17 00:00:00 2001
From: Mathias Schusser <m.schusser@pionsys.com>
Date: Wed, 19 Nov 2025 10:29:45 +0100
Subject: [PATCH 2/4] Fix #3800 by removing duplicated line

---
 frontend/src/components/admin/domains/DKIMKeyViewer.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/admin/domains/DKIMKeyViewer.vue b/frontend/src/components/admin/domains/DKIMKeyViewer.vue
index 74a6ff498..20d0ac838 100644
--- a/frontend/src/components/admin/domains/DKIMKeyViewer.vue
+++ b/frontend/src/components/admin/domains/DKIMKeyViewer.vue
@@ -3,7 +3,6 @@
     <pre id="dkimdns" class="dkim"
       >{{ domain.dkim_key_selector }}._domainkey.{{ domain.name }}. IN TXT ({{
         splitKey
-      }})
       }})</pre
     >
   </button>

From 2180b751bb1ebd520254a4c66e2821494b3f0457 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Thu, 20 Nov 2025 17:53:07 +0100
Subject: [PATCH 3/4] Enable 'Edit alias' action available in Identities
 listing.

fix #3798
---
 frontend/src/components/admin/identities/AliasEditForm.vue | 3 +++
 frontend/src/components/admin/identities/IdentityList.vue  | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/admin/identities/AliasEditForm.vue b/frontend/src/components/admin/identities/AliasEditForm.vue
index 26c45ed55..acc058007 100644
--- a/frontend/src/components/admin/identities/AliasEditForm.vue
+++ b/frontend/src/components/admin/identities/AliasEditForm.vue
@@ -88,9 +88,11 @@ import LoadingData from '@/components/tools/LoadingData.vue'
 import { useGettext } from 'vue3-gettext'
 import { ref, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { useBusStore } from '@/stores'
 import aliasesApi from '@/api/aliases'
 
 const { $gettext } = useGettext()
+const { displayNotification } = useBusStore()
 const route = useRoute()
 const router = useRouter()
 
@@ -127,6 +129,7 @@ async function save() {
 
   try {
     await aliasesApi.patch(route.params.id, editedAlias.value)
+    displayNotification({ msg: $gettext('Alias updated') })
     router.push({
       name: 'AliasDetail',
       params: { id: route.params.id },
diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index b9c89331e..2a59acba4 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -511,7 +511,9 @@ async function downloadCredentials(account) {
   URL.revokeObjectURL(link.href)
 }
 
-function editAlias() {}
+function editAlias(alias) {
+  router.push({ name: 'AliasEdit', params: { id: alias.pk } })
+}
 
 function deleteIdentities() {}
 

From eba50fc3debe7da912fcf885b2c8e0fe0c09e19b Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 21 Nov 2025 16:32:28 +0100
Subject: [PATCH 4/4] Revert "Bump caldav from 2.0.1 to 2.1.2"

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index f1ca582ff..31ebf63d2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -77,7 +77,7 @@ dependencies = [
         # User
         "drf-nested-routers",
         "vobject",
-        "caldav==2.1.2",
+        "caldav==2.0.1",
         # Amavis
         "html2text",
         "idna",