Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
97a74455
You need to sign in or sign up before continuing.
Unverified
Commit
97a74455
authored
Jun 11, 2022
by
David Wheatley
Committed by
GitHub
Jun 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(mail): allow setting of mailer identifying name (#5363)
parent
b78026e4
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
0 deletions
+19
-0
admin-mail.vue
client/components/admin/admin-mail.vue
+12
-0
mail-mutation-save-config.gql
client/graph/admin/mail/mail-mutation-save-config.gql
+1
-0
mail-query-config.gql
client/graph/admin/mail/mail-query-config.gql
+1
-0
mail.js
server/core/mail.js
+1
-0
mail.js
server/graph/resolvers/mail.js
+1
-0
mail.graphql
server/graph/schemas/mail.graphql
+2
-0
setup.js
server/setup.js
+1
-0
No files found.
client/components/admin/admin-mail.vue
View file @
97a74455
...
...
@@ -57,6 +57,16 @@
:hint='$t(`admin:mail.smtpPortHint`)'
style='max-width: 300px;'
)
v-text-field(
outlined
v-model='config.name'
:label='$t(`admin:mail.smtpName`)'
required
:counter='255'
prepend-icon='mdi-server'
persistent-hint
:hint='$t(`admin:mail.smtpNameHint`)'
)
v-switch(
v-model='config.secure'
:label='$t(`admin:mail.smtpTLS`)'
...
...
@@ -169,6 +179,7 @@ export default {
senderEmail
:
''
,
host
:
''
,
port
:
0
,
name
:
''
,
secure
:
false
,
verifySSL
:
false
,
user
:
''
,
...
...
@@ -192,6 +203,7 @@ export default {
senderEmail
:
this
.
config
.
senderEmail
||
''
,
host
:
this
.
config
.
host
||
''
,
port
:
_
.
toSafeInteger
(
this
.
config
.
port
)
||
0
,
namer
:
this
.
config
.
name
||
''
,
secure
:
this
.
config
.
secure
||
false
,
verifySSL
:
this
.
config
.
verifySSL
||
false
,
user
:
this
.
config
.
user
||
''
,
...
...
client/graph/admin/mail/mail-mutation-save-config.gql
View file @
97a74455
...
...
@@ -18,6 +18,7 @@ mutation (
senderEmail
:
$senderEmail
,
host
:
$host
,
port
:
$port
,
name
:
$name
,
secure
:
$secure
,
verifySSL
:
$verifySSL
,
user
:
$user
,
...
...
client/graph/admin/mail/mail-query-config.gql
View file @
97a74455
...
...
@@ -5,6 +5,7 @@
senderEmail
host
port
name
secure
verifySSL
user
...
...
server/core/mail.js
View file @
97a74455
...
...
@@ -13,6 +13,7 @@ module.exports = {
let
conf
=
{
host
:
WIKI
.
config
.
mail
.
host
,
port
:
WIKI
.
config
.
mail
.
port
,
name
:
WIKI
.
config
.
mail
.
name
,
secure
:
WIKI
.
config
.
mail
.
secure
,
tls
:
{
rejectUnauthorized
:
!
(
WIKI
.
config
.
mail
.
verifySSL
===
false
)
...
...
server/graph/resolvers/mail.js
View file @
97a74455
...
...
@@ -49,6 +49,7 @@ module.exports = {
senderEmail
:
args
.
senderEmail
,
host
:
args
.
host
,
port
:
args
.
port
,
name
:
args
.
name
,
secure
:
args
.
secure
,
verifySSL
:
args
.
verifySSL
,
user
:
args
.
user
,
...
...
server/graph/schemas/mail.graphql
View file @
97a74455
...
...
@@ -32,6 +32,7 @@ type MailMutation {
senderEmail
:
String
!
host
:
String
!
port
:
Int
!
name
:
String
!
secure
:
Boolean
!
verifySSL
:
Boolean
!
user
:
String
!
...
...
@@ -52,6 +53,7 @@ type MailConfig {
senderEmail
:
String
!
host
:
String
!
port
:
Int
!
name
:
String
!
secure
:
Boolean
!
verifySSL
:
Boolean
!
user
:
String
!
...
...
server/setup.js
View file @
97a74455
...
...
@@ -103,6 +103,7 @@ module.exports = () => {
senderEmail
:
''
,
host
:
''
,
port
:
465
,
name
:
''
,
secure
:
true
,
verifySSL
:
true
,
user
:
''
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment