diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index bec3a4c56..06e648e06 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -269,7 +269,7 @@ by default.
'OIDC_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT': True,
- 'OIDC_RSA_PRIVATE_KEY': env('OIDC_RSA_PRIVATE_KEY'),
+ 'OIDC_RSA_PRIVATE_KEY': env.str('OIDC_RSA_PRIVATE_KEY', multiline=True),
'SCOPES': {
'openid': 'OpenID Connect scope',
'read': 'Read scope',
diff --git a/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue b/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
index 83d418ab8..7a470d98a 100644
--- a/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
+++ b/frontend/src/components/admin/dmarc/DmarcAligmentChart.vue
@@ -2,7 +2,7 @@
- $gettext('Alignment')
+ {{ $gettext('Alignment') }}
@@ -153,8 +153,8 @@ const boxes = ref([
])
const now = DateTime.now()
-const currentWeek = ref(now.year)
-const currentYear = ref(now.weekNumber)
+const currentYear = ref(now.year)
+const currentWeek = ref(now.weekNumber)
const dmarcDisabled = ref(false)
const loading = ref(false)
const panel = ref(null)
diff --git a/frontend/src/layouts/dashboard/DashboardLayout.vue b/frontend/src/layouts/dashboard/DashboardLayout.vue
index 00b805f6c..97b80fb29 100644
--- a/frontend/src/layouts/dashboard/DashboardLayout.vue
+++ b/frontend/src/layouts/dashboard/DashboardLayout.vue
@@ -42,3 +42,9 @@ busStore.$onAction(({ name, after }) => {
}
}, true)
+
+
diff --git a/frontend/src/views/admin/ParametersView.vue b/frontend/src/views/admin/ParametersView.vue
index 6998a9cb4..8fce86ec7 100644
--- a/frontend/src/views/admin/ParametersView.vue
+++ b/frontend/src/views/admin/ParametersView.vue
@@ -19,59 +19,61 @@
v-for="element in displayableElements"
:key="element.label"
>
-
-
-
-
-
- {{ param.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ param.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
{{ $gettext('Edit domain') }}
-
-
-
+
+ {{ $gettext('Edit domain') }}
+
+
+
+
diff --git a/frontend/src/views/admin/domains/DomainView.vue b/frontend/src/views/admin/domains/DomainView.vue
index 4f22feb10..4568f254e 100644
--- a/frontend/src/views/admin/domains/DomainView.vue
+++ b/frontend/src/views/admin/domains/DomainView.vue
@@ -27,6 +27,7 @@
{{ $gettext('DMARC') }}
+
@@ -117,3 +118,9 @@ function refreshDomain() {
background-color: #f7f8fa !important;
}
+
+
diff --git a/frontend/src/views/admin/identities/AccountEditView.vue b/frontend/src/views/admin/identities/AccountEditView.vue
index 3b9869e7a..d60489ff2 100644
--- a/frontend/src/views/admin/identities/AccountEditView.vue
+++ b/frontend/src/views/admin/identities/AccountEditView.vue
@@ -1,6 +1,7 @@
- {{ $gettext('Edit account') }}
-
+
+ {{ $gettext('Edit account') }}
+
@@ -10,3 +11,9 @@ import { useGettext } from 'vue3-gettext'
const { $gettext } = useGettext()
+
+
diff --git a/frontend/src/views/admin/identities/AliasEditView.vue b/frontend/src/views/admin/identities/AliasEditView.vue
index 31ba106b6..2eb69ed3c 100644
--- a/frontend/src/views/admin/identities/AliasEditView.vue
+++ b/frontend/src/views/admin/identities/AliasEditView.vue
@@ -1,9 +1,8 @@
-
-
{{ $gettext('Edit alias') }}
-
-
-
+
+ {{ $gettext('Edit alias') }}
+
+
+
+
diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl
index 9513eceb5..bb1d941b5 100644
--- a/modoboa/core/commands/templates/settings.py.tpl
+++ b/modoboa/core/commands/templates/settings.py.tpl
@@ -206,7 +206,7 @@ OAUTH2_PROVIDER = {
'OIDC_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ENABLED': True,
'OIDC_RP_INITIATED_LOGOUT_ALWAYS_PROMPT': True,
- 'OIDC_RSA_PRIVATE_KEY': env('OIDC_RSA_PRIVATE_KEY'),
+ 'OIDC_RSA_PRIVATE_KEY': env.str('OIDC_RSA_PRIVATE_KEY', multiline=True),
'SCOPES': {
'openid': 'OpenID Connect scope',
'read': 'Read scope',
diff --git a/requirements.txt b/requirements.txt
index 28451ce11..e6d86cba9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -53,4 +53,4 @@ rq>=1.13.0
django-rq
# Sieve
-sievelib>=1.4
+sievelib>=1.4.1