Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jovuit
funkwhale
Commits
10cd60ef
Verified
Commit
10cd60ef
authored
Oct 18, 2019
by
Eliot Berriot
Browse files
Merge branch 'master' into develop
parents
c58c74d6
afbf7151
Changes
8
Hide whitespace changes
Inline
Side-by-side
changes/changelog.d/933.bugfix
0 → 100644
View file @
10cd60ef
Ensure password input doesn't overflow outside of container (#933)
changes/changelog.d/945.bugfix
0 → 100644
View file @
10cd60ef
Fixed escaped pod name displayed on home/about page (#945)
changes/changelog.d/search-remote.enhancement
0 → 100644
View file @
10cd60ef
Added feedback via loading spinner when searching a remote library
front/src/components/About.vue
View file @
10cd60ef
...
...
@@ -3,10 +3,12 @@
<section
:class=
"['ui', 'head',
{'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle">
<div
class=
"segment-content"
>
<h1
class=
"ui center aligned large header"
>
<translate
translate-context=
"Content/Home/Header"
<span
v-translate=
"
{podName: podName}"
translate-context="Content/Home/Header"
:translate-params="{podName: podName}">
About %{ podName }
</
translate
>
About %{ podName }
!
</
span
>
<div
v-if=
"shortDescription"
class=
"sub header"
>
{{
shortDescription
}}
</div>
...
...
front/src/components/Home.vue
View file @
10cd60ef
...
...
@@ -3,10 +3,12 @@
<section
:class=
"['ui', 'head',
{'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle">
<div
class=
"segment-content"
>
<h1
class=
"ui center aligned large header"
>
<translate
translate-context=
"Content/Home/Header"
<span
v-translate=
"
{podName: podName}"
translate-context="Content/Home/Header"
:translate-params="{podName: podName}">
Welcome to %{ podName }!
</
translate
>
</
span
>
<div
v-if=
"shortDescription"
class=
"sub header"
>
{{
shortDescription
}}
</div>
...
...
front/src/components/forms/PasswordInput.vue
View file @
10cd60ef
<
template
>
<div
class=
"ui action input"
>
<div
class=
"ui
fluid
action input"
>
<input
required
name=
"password"
...
...
front/src/views/content/remote/Card.vue
View file @
10cd60ef
...
...
@@ -142,7 +142,7 @@ export default {
library
:
{
type
:
Object
,
required
:
true
},
displayFollow
:
{
type
:
Boolean
,
default
:
true
},
displayScan
:
{
type
:
Boolean
,
default
:
true
},
displayCopyFid
:
{
type
:
Boolean
,
default
:
fals
e
},
displayCopyFid
:
{
type
:
Boolean
,
default
:
tru
e
},
},
data
()
{
return
{
...
...
front/src/views/content/remote/ScanForm.vue
View file @
10cd60ef
...
...
@@ -10,7 +10,7 @@
<label><translate
translate-context=
"Content/Library/Input.Label/Verb"
>
Search a remote library
</translate></label>
<div
:class=
"['ui', 'action',
{loading: isLoading}, 'input']">
<input
name=
"url"
v-model=
"query"
:placeholder=
"labels.placeholder"
type=
"url"
>
<button
type=
"submit"
class=
"
ui icon
button"
>
<button
type=
"submit"
:
class=
"
['ui', 'icon',
{loading: isLoading}, '
button
']
">
<i
class=
"search icon"
></i>
</button>
</div>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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