Merge branch 'next' into main

2024-12-06 06:29:35 +01:00
parent 02a20729c7 bf530fd944
commit f7eccefda3
82 changed files with 1067 additions and 223 deletions
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@ -37,7 +37,7 @@ class Email extends Component
    #[Validate(['nullable', 'numeric'])]
    public ?int $smtpPort = null;

-    #[Validate(['nullable', 'string'])]
+    #[Validate(['nullable', 'string', 'in:tls,ssl,none'])]
    public ?string $smtpEncryption = null;

    #[Validate(['nullable', 'string'])]
@@ -73,8 +73,8 @@ class Email extends Component
    #[Validate(['nullable', 'string'])]
    public ?string $resendApiKey = null;

-    #[Validate(['required', 'email'])]
-    public string $testEmailAddress = '';
+    #[Validate(['nullable', 'email'])]
+    public ?string $testEmailAddress = null;

    public function mount()
    {