MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Eliot Berriot 2019-10-18 13:43:57 +02:00
parent c58c74d653 afbf7151c8
commit 10cd60ef1d
No known key found for this signature in database
GPG Key ID: 6B501DFD73514E14
8 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/933.bugfix Normal file
View File

@ -0,0 +1 @@
Ensure password input doesn't overflow outside of container (#933)

1
changes/changelog.d/945.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed escaped pod name displayed on home/about page (#945)

1
changes/changelog.d/search-remote.enhancement Normal file
View File

@ -0,0 +1 @@
Added feedback via loading spinner when searching a remote library

8
front/src/components/About.vue
View File

@ -3,10 +3,12 @@
<section :class="['ui', 'head', {'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle"> <section :class="['ui', 'head', {'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle">
<div class="segment-content"> <div class="segment-content">
<h1 class="ui center aligned large header"> <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}"> :translate-params="{podName: podName}">
About %{ podName } About %{ podName }!
</translate> </span>
<div v-if="shortDescription" class="sub header"> <div v-if="shortDescription" class="sub header">
{{ shortDescription }} {{ shortDescription }}
</div> </div>

6
front/src/components/Home.vue
View File

@ -3,10 +3,12 @@
<section :class="['ui', 'head', {'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle"> <section :class="['ui', 'head', {'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle">
<div class="segment-content"> <div class="segment-content">
<h1 class="ui center aligned large header"> <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}"> :translate-params="{podName: podName}">
Welcome to %{ podName }! Welcome to %{ podName }!
</translate> </span>
<div v-if="shortDescription" class="sub header"> <div v-if="shortDescription" class="sub header">
{{ shortDescription }} {{ shortDescription }}
</div> </div>

2
front/src/components/forms/PasswordInput.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="ui action input"> <div class="ui fluid action input">
<input <input
required required
name="password" name="password"

2
front/src/views/content/remote/Card.vue
View File

@ -142,7 +142,7 @@ export default {
library: {type: Object, required: true}, library: {type: Object, required: true},
displayFollow: {type: Boolean, default: true}, displayFollow: {type: Boolean, default: true},
displayScan: {type: Boolean, default: true}, displayScan: {type: Boolean, default: true},
displayCopyFid: {type: Boolean, default: false}, displayCopyFid: {type: Boolean, default: true},
}, },
data () { data () {
return { return {

2
front/src/views/content/remote/ScanForm.vue
View File

@ -10,7 +10,7 @@
<label><translate translate-context="Content/Library/Input.Label/Verb">Search a remote library</translate></label> <label><translate translate-context="Content/Library/Input.Label/Verb">Search a remote library</translate></label>
<div :class="['ui', 'action', {loading: isLoading}, 'input']"> <div :class="['ui', 'action', {loading: isLoading}, 'input']">
<input name="url" v-model="query" :placeholder="labels.placeholder" type="url"> <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> <i class="search icon"></i>
</button> </button>
</div> </div>