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_OLD
Commits
264aa20d
Commit
264aa20d
authored
Jan 26, 2019
by
Eliot Berriot
Browse files
Merge branch 'upload-progress' into 'master'
Display progress during file upload See merge request
!567
parents
a28f4ca5
3de9ae69
Changes
2
Hide whitespace changes
Inline
Side-by-side
changes/changelog.d/progress.enhancement
0 → 100644
View file @
264aa20d
Display progress during file upload
front/src/components/library/FileUpload.vue
View file @
264aa20d
...
...
@@ -102,6 +102,7 @@
</span>
<span
v-else-if=
"file.active"
class=
"ui yellow label"
>
<translate
key=
"2"
>
Uploading…
</translate>
(
{{
parseInt
(
file
.
progress
)
}}
%)
</span>
<template
v-else
>
<span
class=
"ui label"
><translate
key=
"3"
>
Pending
</translate></span>
...
...
@@ -145,7 +146,7 @@ export default {
files
:
[],
needsRefresh
:
false
,
currentTab
:
"
summary
"
,
uploadUrl
:
"
/api/v1/uploads/
"
,
uploadUrl
:
this
.
$store
.
getters
[
'
instance/absoluteUrl
'
](
"
/api/v1/uploads/
"
)
,
importReference
,
supportedExtensions
:
[
"
flac
"
,
"
ogg
"
,
"
mp3
"
,
"
opus
"
],
uploads
:
{
...
...
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