From 7dcf44f2fe0d8884c440d7f1f17ff24344292bdb Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Wed, 9 Sep 2020 07:50:29 +0200
Subject: [PATCH 1/4] Added missing contributors

---
 CHANGELOG | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 694fd4fa8..9600e8809 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 

From b8befde215ab3913b42e2c847a48d0890fb7b99f Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Wed, 9 Sep 2020 18:05:03 +0200
Subject: [PATCH 2/4] Fixed link to upgrade instructions

---
 CHANGELOG            | 12 ++++++------
 changes/template.rst |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9600e8809..06b146d8c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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]
@@ -158,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:
 
@@ -190,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:
@@ -566,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
@@ -631,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
@@ -956,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:
 
diff --git a/changes/template.rst b/changes/template.rst
index c4a9b40e5..040fd7ea0 100644
--- a/changes/template.rst
+++ b/changes/template.rst
@@ -1,6 +1,6 @@
 
 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] %}

From 10480a3ab6f712fa84e05aa887b66b6dfe15c5a8 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Sat, 12 Sep 2020 10:54:02 +0200
Subject: [PATCH 3/4] Fix: #1226: Added controls to play volume of an album

---
 changes/changelog.d/1226.enhancement         | 1 +
 front/src/components/library/AlbumDetail.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/1226.enhancement

diff --git a/changes/changelog.d/1226.enhancement b/changes/changelog.d/1226.enhancement
new file mode 100644
index 000000000..2f3bace25
--- /dev/null
+++ b/changes/changelog.d/1226.enhancement
@@ -0,0 +1 @@
+Added controls to play volume of an album (#1226)
\ No newline at end of file
diff --git a/front/src/components/library/AlbumDetail.vue b/front/src/components/library/AlbumDetail.vue
index 559a4a330..bc670ce6b 100644
--- a/front/src/components/library/AlbumDetail.vue
+++ b/front/src/components/library/AlbumDetail.vue
@@ -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 {

From 0c5df9e6b25d691c0a1e3e3a88e3ff4c2687bf7b Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Wed, 30 Sep 2020 16:30:27 +0200
Subject: [PATCH 4/4] Fixed broken uvicorn

---
 api/requirements/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/requirements/base.txt b/api/requirements/base.txt
index 29f4ea0cf..602ec8f46 100644
--- a/api/requirements/base.txt
+++ b/api/requirements/base.txt
@@ -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