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
be499e57
Commit
be499e57
authored
Jul 19, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: auth strategy dependent username label
parent
89f81bb9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
1 deletion
+11
-1
editor-ckeditor.vue
client/components/editor/editor-ckeditor.vue
+6
-0
login.vue
client/components/login.vue
+2
-1
authentication.graphql
server/graph/schemas/authentication.graphql
+1
-0
definition.yml
server/modules/authentication/ldap/definition.yml
+1
-0
definition.yml
server/modules/authentication/local/definition.yml
+1
-0
No files found.
client/components/editor/editor-ckeditor.vue
View file @
be499e57
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
import
_
from
'lodash'
import
_
from
'lodash'
import
{
get
,
sync
}
from
'vuex-pathify'
import
{
get
,
sync
}
from
'vuex-pathify'
import
DecoupledEditor
from
'@requarks/ckeditor5'
import
DecoupledEditor
from
'@requarks/ckeditor5'
// import DecoupledEditor from '../../../../wiki-ckeditor5/build/ckeditor'
import
EditorConflict
from
'./ckeditor/conflict.vue'
import
EditorConflict
from
'./ckeditor/conflict.vue'
import
{
html
as
beautify
}
from
'js-beautify/js/lib/beautifier.min.js'
import
{
html
as
beautify
}
from
'js-beautify/js/lib/beautifier.min.js'
...
@@ -110,6 +111,11 @@ export default {
...
@@ -110,6 +111,11 @@ export default {
linkIsDownloadable
:
true
linkIsDownloadable
:
true
}
)
}
)
break
break
case
'DIAGRAM'
:
this
.
editor
.
execute
(
'imageInsert'
,
{
source
:
`data:image/svg+xml;base64,${opts.text
}
`
}
)
break
}
}
}
)
}
)
...
...
client/components/login.vue
View file @
be499e57
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
hide-details
hide-details
ref='iptEmail'
ref='iptEmail'
v-model='username'
v-model='username'
:placeholder='$t(
"auth:fields.emailUser"
)'
:placeholder='$t(
selectedStrategy.strategy.usernameLabel
)'
)
)
v-text-field.mt-2(
v-text-field.mt-2(
solo
solo
...
@@ -536,6 +536,7 @@ export default {
...
@@ -536,6 +536,7 @@ export default {
color
color
icon
icon
useForm
useForm
usernameLabel
}
}
displayName
displayName
order
order
...
...
server/graph/schemas/authentication.graphql
View file @
be499e57
...
@@ -85,6 +85,7 @@ type AuthenticationStrategy {
...
@@ -85,6 +85,7 @@ type AuthenticationStrategy {
description
:
String
description
:
String
isAvailable
:
Boolean
isAvailable
:
Boolean
useForm
:
Boolean
!
useForm
:
Boolean
!
usernameLabel
:
String
logo
:
String
logo
:
String
color
:
String
color
:
String
website
:
String
website
:
String
...
...
server/modules/authentication/ldap/definition.yml
View file @
be499e57
...
@@ -7,6 +7,7 @@ color: blue darken-3
...
@@ -7,6 +7,7 @@ color: blue darken-3
website
:
https://www.microsoft.com/windowsserver
website
:
https://www.microsoft.com/windowsserver
isAvailable
:
true
isAvailable
:
true
useForm
:
true
useForm
:
true
usernameLabel
:
'
auth:fields.username'
props
:
props
:
url
:
url
:
title
:
LDAP URL
title
:
LDAP URL
...
...
server/modules/authentication/local/definition.yml
View file @
be499e57
...
@@ -7,4 +7,5 @@ color: primary
...
@@ -7,4 +7,5 @@ color: primary
website
:
https://wiki.js.org
website
:
https://wiki.js.org
isAvailable
:
true
isAvailable
:
true
useForm
:
true
useForm
:
true
usernameLabel
:
'
auth:fields.email'
props
:
{}
props
:
{}
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