From b780bee874614191e6dd137bb4b02803bda14f77 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Wed, 21 Mar 2018 21:05:03 +0100
Subject: [PATCH] Version bump and changelog

---
 CHANGELOG                                   | 32 ++++++++++++++++++++-
 api/funkwhale_api/__init__.py               |  2 +-
 changes/changelog.d/103.bugfix              |  1 -
 changes/changelog.d/114.feature             |  1 -
 changes/changelog.d/115.bugfix              |  1 -
 changes/changelog.d/116.feature             |  1 -
 changes/changelog.d/117.feature             |  1 -
 changes/changelog.d/118.feature             |  1 -
 changes/changelog.d/119.bugfix              |  1 -
 changes/changelog.d/123.doc                 |  1 -
 changes/changelog.d/3.feature               |  1 -
 changes/changelog.d/96.bugfix               |  1 -
 changes/changelog.d/queue-same-track.bugfix |  1 -
 13 files changed, 32 insertions(+), 13 deletions(-)
 delete mode 100644 changes/changelog.d/103.bugfix
 delete mode 100644 changes/changelog.d/114.feature
 delete mode 100644 changes/changelog.d/115.bugfix
 delete mode 100644 changes/changelog.d/116.feature
 delete mode 100644 changes/changelog.d/117.feature
 delete mode 100644 changes/changelog.d/118.feature
 delete mode 100644 changes/changelog.d/119.bugfix
 delete mode 100644 changes/changelog.d/123.doc
 delete mode 100644 changes/changelog.d/3.feature
 delete mode 100644 changes/changelog.d/96.bugfix
 delete mode 100644 changes/changelog.d/queue-same-track.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index 6881b7bf0..0b9198723 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,37 @@ Changelog
 
 .. towncrier
 
-0.6.1 (unreleased)
+0.7 (2018-03-21)
+----------------
+
+Features:
+
+- Can now filter artists and albums with no listenable tracks (#114)
+- Improve the style of the sidebar to make it easier to understand which tab is
+  selected (#118)
+- On artist page, albums are not sorted by release date, if any (#116)
+- Playlists are here \o/ :tada: (#3, #93, #94)
+- Use django-cacheops to cache common ORM requests (#117)
+
+
+Bugfixes:
+
+- Fixed broken import request admin (#115)
+- Fixed forced redirection to login event with
+  API_AUTHENTICATION_REQUIRED=False (#119)
+- Fixed position not being reseted properly when playing the same track
+  multiple times in a row
+- Fixed synchronized start/stop radio buttons for all custom radios (#103)
+- Fixed typo and missing icon on homepage (#96)
+
+
+Documentation:
+
+- Up-to-date and complete development and contribution instructions in
+  README.rst (#123)
+
+
+0.6.1 (2018-03-06)
 ------------------
 
 Features:
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 841f2a299..0a12b794e 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '0.6.1'
+__version__ = '0.7'
 __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
diff --git a/changes/changelog.d/103.bugfix b/changes/changelog.d/103.bugfix
deleted file mode 100644
index 59b83abde..000000000
--- a/changes/changelog.d/103.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed synchronized start/stop radio buttons for all custom radios (#103)
diff --git a/changes/changelog.d/114.feature b/changes/changelog.d/114.feature
deleted file mode 100644
index 88e3bfc11..000000000
--- a/changes/changelog.d/114.feature
+++ /dev/null
@@ -1 +0,0 @@
-Can now filter artists and albums with no listenable tracks (#114)
diff --git a/changes/changelog.d/115.bugfix b/changes/changelog.d/115.bugfix
deleted file mode 100644
index 96da61f09..000000000
--- a/changes/changelog.d/115.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken import request admin (#115)
diff --git a/changes/changelog.d/116.feature b/changes/changelog.d/116.feature
deleted file mode 100644
index e17343401..000000000
--- a/changes/changelog.d/116.feature
+++ /dev/null
@@ -1 +0,0 @@
-On artist page, albums are not sorted by release date, if any (#116)
diff --git a/changes/changelog.d/117.feature b/changes/changelog.d/117.feature
deleted file mode 100644
index 2df028edc..000000000
--- a/changes/changelog.d/117.feature
+++ /dev/null
@@ -1 +0,0 @@
-Use django-cacheops to cache common ORM requests (#117)
diff --git a/changes/changelog.d/118.feature b/changes/changelog.d/118.feature
deleted file mode 100644
index a716f0146..000000000
--- a/changes/changelog.d/118.feature
+++ /dev/null
@@ -1 +0,0 @@
-Improve the style of the sidebar to make it easier to understand which tab is selected (#118)
\ No newline at end of file
diff --git a/changes/changelog.d/119.bugfix b/changes/changelog.d/119.bugfix
deleted file mode 100644
index b2e7ff71f..000000000
--- a/changes/changelog.d/119.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed forced redirection to login event with API_AUTHENTICATION_REQUIRED=False (#119)
diff --git a/changes/changelog.d/123.doc b/changes/changelog.d/123.doc
deleted file mode 100644
index 679a0b8af..000000000
--- a/changes/changelog.d/123.doc
+++ /dev/null
@@ -1 +0,0 @@
-Up-to-date and complete development and contribution instructions in README.rst (#123)
diff --git a/changes/changelog.d/3.feature b/changes/changelog.d/3.feature
deleted file mode 100644
index e2b962c44..000000000
--- a/changes/changelog.d/3.feature
+++ /dev/null
@@ -1 +0,0 @@
-Playlists are here \o/ :tada: (#3, #93, #94)
diff --git a/changes/changelog.d/96.bugfix b/changes/changelog.d/96.bugfix
deleted file mode 100644
index a37acb1bf..000000000
--- a/changes/changelog.d/96.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed typo and missing icon on homepage (#96)
diff --git a/changes/changelog.d/queue-same-track.bugfix b/changes/changelog.d/queue-same-track.bugfix
deleted file mode 100644
index 11a1a08c7..000000000
--- a/changes/changelog.d/queue-same-track.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed position not being reseted properly when playing the same track multiple times in a row