Merge branch 'master' into frontend/deps-upgrade

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>

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 },

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() {}
 

pyproject.toml

@@ -77,7 +77,7 @@ dependencies = [
         # User
         "drf-nested-routers",
         "vobject",
-        "caldav==2.1.2",
+        "caldav==2.0.1",
         # Amavis
         "html2text",
         "idna",