Commit 007c1518 authored by Agate's avatar Agate 💬
Browse files

Merge branch 'master' into develop

parents f7af7fce 0c5df9e6
......@@ -14,7 +14,7 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
----------------
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
Dropped python 3.5 support [manual action required, non-docker only]
......@@ -134,21 +134,22 @@ Contributors to this release (translation, development, documentation, reviews,
- anonymous
- appzer0
- Arne
- Bheesham Persaud
- Ciarán Ainsworth
- Creak
- Daniele Lira Mereb
- dulz
- Francesc Galí
- ghose
- Kalle Anka
- mekind
- Meliurwen
- Puri
- Quentin PAGÈS
- Raphaël Ventura
- Simon Arlott
- Slimane Selyan Amiri
- SpcCw
- Stefano Pigozzi
- Sébastien de Melo
- Ventura Pérez García
- vicdorke
- Xosé M
......@@ -157,7 +158,7 @@ Contributors to this release (translation, development, documentation, reviews,
-------------------
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
Enhancements:
......@@ -189,7 +190,7 @@ Contributors to this release (development, documentation, reviews):
-------------------
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
Features:
......@@ -565,7 +566,7 @@ Contributors to this release (translation, development, documentation, reviews,
-------------------
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
Denormalized audio permission logic in a separate table to enhance performance
......@@ -630,7 +631,7 @@ Contributors to this release (translation, development, documentation, reviews,
-----------------
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
Support for genres via tags
......@@ -955,7 +956,7 @@ Contributors to this release (translation, development, documentation, reviews,
-------------------
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
Enhancements:
......
......@@ -41,7 +41,7 @@ raven~=6.10
python-magic~=0.4
channels~=2.4
channels_redis~=3.0
uvicorn~=0.11
uvicorn[standard]~=0.12
gunicorn~=20.0
cryptography~=2.9
......
Added controls to play volume of an album (#1226)
\ No newline at end of file
Upgrade instructions are available at
https://docs.funkwhale.audio/index.html
https://docs.funkwhale.audio/admin/upgrading.html
{% for section, _ in sections.items() %}
{% if sections[section] %}
......
......@@ -9,6 +9,7 @@
<template v-else-if="discs && discs.length > 1">
<div v-for="(tracks, discNumber) in discs" :key="discNumber">
<div class="ui hidden divider"></div>
<play-button class="right floated mini inverted vibrant" :tracks="tracks"></play-button>
<translate
tag="h3"
:translate-params="{number: discNumber + 1}"
......@@ -52,6 +53,7 @@ import ChannelEntries from '@/components/audio/ChannelEntries'
import AlbumEntries from '@/components/audio/AlbumEntries'
import Pagination from "@/components/Pagination"
import PaginationMixin from "@/components/mixins/Pagination"
import PlayButton from "@/components/audio/PlayButton"
export default {
props: ["object", "libraries", "discs", "isSerie", "artist", "page", "paginateBy", "totalTracks"],
......@@ -60,7 +62,8 @@ export default {
AlbumEntries,
ChannelEntries,
TrackTable,
Pagination
Pagination,
PlayButton
},
data() {
return {
......
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