Commit 264aa20d authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'upload-progress' into 'master'

Display progress during file upload

See merge request funkwhale/funkwhale!567
parents a28f4ca5 3de9ae69
Display progress during file upload
......@@ -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: {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment