From 381215af98f3cbe8da3e60610e9b4dc176577134 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Tue, 13 Apr 2021 10:27:07 +0200
Subject: [PATCH] Version bump and changelog for 1.1.1

---
 CHANGELOG                                     | 20 +++++++++++++++++++
 api/funkwhale_api/__init__.py                 |  2 +-
 changes/changelog.d/1285.bugfix               |  1 -
 changes/changelog.d/1286.enhancement          |  1 -
 changes/changelog.d/1291.bugfix               |  1 -
 changes/changelog.d/1324.bugfix               |  1 -
 changes/changelog.d/1366.enhancement          |  1 -
 changes/changelog.d/1380.bugfix               |  1 -
 .../changelog.d/fix_getuser_serializer.bugfix |  3 ---
 9 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 changes/changelog.d/1285.bugfix
 delete mode 100644 changes/changelog.d/1286.enhancement
 delete mode 100644 changes/changelog.d/1291.bugfix
 delete mode 100644 changes/changelog.d/1324.bugfix
 delete mode 100644 changes/changelog.d/1366.enhancement
 delete mode 100644 changes/changelog.d/1380.bugfix
 delete mode 100644 changes/changelog.d/fix_getuser_serializer.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index 3c2cc62eb..fac975a89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,26 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.1.1 (2021-04-13)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Enhancements:
+
+- Improve UI consistency in artist tracks (#1286)
+- Adds year to album's card and album's base UI
+
+Bugfixes:
+
+- Fix playback issues when pausing close the the end of a track (#1324)
+- Fix tracks playing in the background without the ability to control them (#1213) (#1387)
+- Fixed track playback indicator to reset on queue end (#1380)
+- Frontend build tooling is less dependent on `npm` or `yarn` being used (!1285)
+- Fixed a small discrepancy to the subsonic api 1374
+
+
 1.1 (2021-03-10)
 ----------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 8c833768e..8afc6a1d2 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.1"
+__version__ = "1.1.1"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1285.bugfix b/changes/changelog.d/1285.bugfix
deleted file mode 100644
index 68fe52174..000000000
--- a/changes/changelog.d/1285.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Frontend build tooling is less dependent on `npm` or `yarn` being used (!1285)
diff --git a/changes/changelog.d/1286.enhancement b/changes/changelog.d/1286.enhancement
deleted file mode 100644
index e2d4566c0..000000000
--- a/changes/changelog.d/1286.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-"Improve UI consistency in artist tracks (#1286)"
diff --git a/changes/changelog.d/1291.bugfix b/changes/changelog.d/1291.bugfix
deleted file mode 100644
index 06cd0a7db..000000000
--- a/changes/changelog.d/1291.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix tracks playing in the background without the ability to control them (#1213) (#1387)
diff --git a/changes/changelog.d/1324.bugfix b/changes/changelog.d/1324.bugfix
deleted file mode 100644
index 75564c307..000000000
--- a/changes/changelog.d/1324.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix playback issues when pausing close the the end of a track (#1324)
diff --git a/changes/changelog.d/1366.enhancement b/changes/changelog.d/1366.enhancement
deleted file mode 100644
index e58f8ebe4..000000000
--- a/changes/changelog.d/1366.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Adds year to album's card and album's base UI
diff --git a/changes/changelog.d/1380.bugfix b/changes/changelog.d/1380.bugfix
deleted file mode 100644
index 07cf12281..000000000
--- a/changes/changelog.d/1380.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed track playback indicator to reset on queue end (#1380)
diff --git a/changes/changelog.d/fix_getuser_serializer.bugfix b/changes/changelog.d/fix_getuser_serializer.bugfix
deleted file mode 100644
index 562271a75..000000000
--- a/changes/changelog.d/fix_getuser_serializer.bugfix
+++ /dev/null
@@ -1,3 +0,0 @@
-issue="1374"
-content="Fixed a small discrepancy to the subsonic api"
-category="bugfix"
\ No newline at end of file