From ddb7023f1bac6e948103f1f0887b29105c66f456 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Fri, 4 Feb 2022 12:49:11 +0100
Subject: [PATCH] Version bump and changelog for 1.2.2
---
CHANGELOG | 59 ++++++++++++++++++++++++++++++++-
api/funkwhale_api/__init__.py | 2 +-
changes/changelog.d/1673.bugfix | 1 -
changes/changelog.d/1675.bugfix | 1 -
changes/changelog.d/1683.bugfix | 1 -
5 files changed, 59 insertions(+), 5 deletions(-)
delete mode 100644 changes/changelog.d/1673.bugfix
delete mode 100644 changes/changelog.d/1675.bugfix
delete mode 100644 changes/changelog.d/1683.bugfix
diff --git a/CHANGELOG b/CHANGELOG
index cd051c6a9d..3cf47aa07e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,63 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier
+1.2.2 (2020-02-04)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Bugfixes:
+
+- Fix an issue where the tracks tab in a library doesn't show any tracks (#1683)
+- Fix an issue with the embedded player not showing any content (#1675)
+- Fix broken instance description if it contains a line break #1673
+
+Dependency Updates:
+
+Update dependency vue-template-compiler to 2.6.14
+Update dependency vue to ^2.6.14
+Update dependency vuex-persistedstate to ^2.7.1
+Update dependency vuedraggable to ^2.24.3
+Update dependency vue-lazyload to ^1.3.3
+Update dependency vue-plyr to ^5.1.3
+Update dependency vue-upload-component to ^2.8.22
+Update dependency vue-gettext to ^2.1.12
+Update dependency showdown to ^1.9.1
+Update dependency js-logger to ^1.6.1
+Update dependency register-service-worker to ^1.7.2
+Update dependency howler to ^2.2.3
+Update dependency fomantic-ui-css to ^2.8.8
+Update dependency diff to ^4.0.2
+Update dependency axios-auth-refresh to ^2.2.8
+
+Contributors to our Issues:
+
+- Ciarán Ainsworth
+- Georg Krause
+- JuniorJPDJ
+- Marcos Peña
+- Mathieu Jourdan
+- Micha Gläß-Stöcker
+- Ricardo
+- petitminion
+
+Contributors to our Merge Requests:
+
+- Ciarán Ainsworth
+- Georg Krause
+- JuniorJPDJ
+- Marcos Peña
+
+Committers
+
+- Ciarán Ainsworth
+- Georg Krause
+- JuniorJPDJ
+- Keunes
+- Marcos Peña
+
+
1.2.1 (2022-01-06)
------------------
@@ -47,7 +104,7 @@ nztvar
Upgrade instructions are available at
https://docs.funkwhale.audio/admin/upgrading.html
-Due to a bug in our CI Pipeline frontend artifacts are not available at
+Due to a bug in our CI Pipeline frontend artifacts are not available at
https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.0/download?job=build_front as they would usually.
Please use this URL to get your frontend build: https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/81069/artifacts/download
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 42addee501..4b97ecbfc8 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = "1.2.1"
+__version__ = "1.2.2"
__version_info__ = tuple(
[
int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1673.bugfix b/changes/changelog.d/1673.bugfix
deleted file mode 100644
index 66e0d4b9ff..0000000000
--- a/changes/changelog.d/1673.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken instance description if it contains a line break #1673
diff --git a/changes/changelog.d/1675.bugfix b/changes/changelog.d/1675.bugfix
deleted file mode 100644
index b2ee57b72c..0000000000
--- a/changes/changelog.d/1675.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue with the embedded player not showing any content (#1675)
\ No newline at end of file
diff --git a/changes/changelog.d/1683.bugfix b/changes/changelog.d/1683.bugfix
deleted file mode 100644
index 3475fee3db..0000000000
--- a/changes/changelog.d/1683.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an issue where the tracks tab in a library doesn't show any tracks (#1683)
--
GitLab