mirror of
https://github.com/knadh/listmonk.git
synced 2025-03-01 16:55:26 +08:00
Make the name part in from
e-mails optional. Closes #1602.
This commit is contained in:
parent
b2a5e37ccb
commit
2feb1b0fb8
2 changed files with 2 additions and 2 deletions
|
@ -47,7 +47,7 @@ type campaignContentReq struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
regexFromAddress = regexp.MustCompile(`(.+?)\s<(.+?)@(.+?)>`)
|
regexFromAddress = regexp.MustCompile(`((.+?)\s)?<(.+?)@(.+?)>`)
|
||||||
)
|
)
|
||||||
|
|
||||||
// handleGetCampaigns handles retrieval of campaigns.
|
// handleGetCampaigns handles retrieval of campaigns.
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
<b-field :label="$t('settings.general.fromEmail')" label-position="on-border"
|
<b-field :label="$t('settings.general.fromEmail')" label-position="on-border"
|
||||||
:message="$t('settings.general.fromEmailHelp')">
|
:message="$t('settings.general.fromEmailHelp')">
|
||||||
<b-input v-model="data['app.from_email']" name="app.from_email"
|
<b-input v-model="data['app.from_email']" name="app.from_email"
|
||||||
placeholder="Listmonk <noreply@listmonk.yoursite.com>" pattern="(.+?)\s<(.+?)@(.+?)>" :maxlength="300" />
|
placeholder="Listmonk <noreply@listmonk.yoursite.com>" pattern="((.+?)\s)?<(.+?)@(.+?)>" :maxlength="300" />
|
||||||
</b-field>
|
</b-field>
|
||||||
<b-field :label="$t('settings.general.adminNotifEmails')" label-position="on-border"
|
<b-field :label="$t('settings.general.adminNotifEmails')" label-position="on-border"
|
||||||
:message="$t('settings.general.adminNotifEmailsHelp')">
|
:message="$t('settings.general.adminNotifEmailsHelp')">
|
||||||
|
|
Loading…
Reference in a new issue