From cb1957a961b8d9063b2e5b9d07d9cb2d3b31e363 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Sat, 16 Jun 2018 15:04:49 +0200
Subject: [PATCH] Version bump and changelog for 0.14.2

---
 CHANGELOG                           | 127 ++++++++++++++++++++++++++++
 api/funkwhale_api/__init__.py       |   2 +-
 changes/changelog.d/245.bugfix      |   1 -
 changes/changelog.d/252.enhancement |  15 ----
 changes/changelog.d/262.enhancement |   1 -
 changes/changelog.d/264.enhancement |  37 --------
 changes/changelog.d/280.enhancement |  15 ----
 changes/changelog.d/287.bugfix      |   1 -
 changes/changelog.d/289.enhancement |   1 -
 changes/changelog.d/291.enhancement |  13 ---
 changes/changelog.d/295.bugfix      |   1 -
 changes/changelog.d/297.misc        |   2 -
 changes/changelog.d/298.doc         |   1 -
 changes/changelog.d/299.misc        |   1 -
 changes/changelog.d/311.bugfix      |  11 ---
 15 files changed, 128 insertions(+), 101 deletions(-)
 delete mode 100644 changes/changelog.d/245.bugfix
 delete mode 100644 changes/changelog.d/252.enhancement
 delete mode 100644 changes/changelog.d/262.enhancement
 delete mode 100644 changes/changelog.d/264.enhancement
 delete mode 100644 changes/changelog.d/280.enhancement
 delete mode 100644 changes/changelog.d/287.bugfix
 delete mode 100644 changes/changelog.d/289.enhancement
 delete mode 100644 changes/changelog.d/291.enhancement
 delete mode 100644 changes/changelog.d/295.bugfix
 delete mode 100644 changes/changelog.d/297.misc
 delete mode 100644 changes/changelog.d/298.doc
 delete mode 100644 changes/changelog.d/299.misc
 delete mode 100644 changes/changelog.d/311.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index edff0877..ee59b7f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,133 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+0.14.2 (2018-06-16)
+-------------------
+
+.. warning::
+
+    This release contains a fix for a permission issue. You should upgrade
+    as soon as possible. Read the changelog below for more details.
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/upgrading.html
+
+Enhancements:
+
+- Added feedback on shuffle button (#262)
+- Added multiple warnings in the documentation that you should never run
+  makemigrations yourself (#291)
+- Album cover served in http (#264)
+- Apache2 reverse proxy now supports websockets (tested with Apache 2.4.25)
+  (!252)
+- Display file size in human format during file upload (#289)
+- Switch from BSD-3 licence to AGPL-3 licence (#280)
+
+Bugfixes:
+
+- Ensure radios can only be edited and deleted by their owners (#311)
+- Fixed admin menu not showing after login (#245)
+- Fixed broken pagination in Subsonic API (#295)
+- Fixed duplicated websocket connexion on timeline (#287)
+
+
+Documentation:
+
+- Improved documentation about in-place imports setup (#298)
+
+
+Other:
+
+- Added Black and flake8 checks in CI to ensure consistent code styling and
+  formatting (#297)
+- Added bug and feature issue templates (#299)
+
+
+Permission issues on radios
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Because of an error in the way we checked user permissions on radios,
+public radios could be deleted by any logged-in user, even if they were not
+the owner of the radio.
+
+We recommend instances owners to upgrade as fast as possible to avoid any abuse
+and data loss.
+
+
+Funkwhale is now licenced under AGPL-3
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Following the recent switch made by PixelFed
+(https://github.com/dansup/pixelfed/issues/143), we decided along with
+the community to relicence Funkwhale under the AGPL-3 licence. We did this
+switch for various reasons:
+
+- This is better aligned with other fediverse software
+- It prohibits anyone to distribute closed-source and proprietary forks of Funkwhale
+
+As end users and instance owners, this does not change anything. You can
+continue to use Funkwhale exactly as you did before :)
+
+
+Apache support for websocket
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Up until now, our Apache2 configuration was not working with websockets. This is now
+solved by adding this at the beginning of your Apache2 configuration file::
+
+    Define funkwhale-api-ws ws://localhost:5000
+
+And this, before the "/api" block::
+
+    # Activating WebSockets
+    ProxyPass "/api/v1/instance/activity" ${funkwhale-api-ws}/api/v1/instance/activity
+
+Websockets may not be supported in older versions of Apache2. Be sure to upgrade to the latest version available.
+
+
+Serving album covers in https (Apache2 proxy)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Two issues are addressed here. The first one was about Django replying with
+mixed content (http) when queried for covers. Setting up the `X-Forwarded-Proto`
+allows Django to know that the client is using https, and that the reply must
+be https as well.
+
+Second issue was a problem of permission causing Apache a denied access to
+album cover folder. It is solved by adding another block for this path in
+the Apache configuration file for funkwhale.
+
+Here is how to modify your `funkwhale.conf` apache2 configuration::
+
+  <VirtualHost *:443>
+
+    ...
+    #Add this new line
+    RequestHeader set X-Forwarded-Proto "https"
+    ...
+    # Add this new block below the other <Directory/> blocks
+    # replace /srv/funkwhale/data/media with the path to your media directory
+    # if you're not using the standard layout.
+    <Directory /srv/funkwhale/data/media/albums>
+      Options FollowSymLinks
+      AllowOverride None
+      Require all granted
+    </Directory>
+    ...
+  </VirtualHost>
+
+
+About the makemigrations warning
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You may sometimes get the following warning while applying migrations::
+
+    "Your models have changes that are not yet reflected in a migration, and so won't be applied."
+
+This is a warning, not an error, and it can be safely ignored.
+Never run the ``makemigrations`` command yourself.
+
+
 0.14.1 (2018-06-06)
 -------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 0162c231..44b80d2d 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "0.14.1"
+__version__ = "0.14.2"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/245.bugfix b/changes/changelog.d/245.bugfix
deleted file mode 100644
index 95527973..00000000
--- a/changes/changelog.d/245.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed admin menu not showing after login (#245)
diff --git a/changes/changelog.d/252.enhancement b/changes/changelog.d/252.enhancement
deleted file mode 100644
index eb4fd9db..00000000
--- a/changes/changelog.d/252.enhancement
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache2 reverse proxy now supports websockets (tested with Apache 2.4.25) (!252)
-
-Apache support for websocket
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Add this at the beginning of your Apache configuration file::
-
-    Define funkwhale-api-ws ws://localhost:5000
-
-Add this to your Apache configuration file, before the "/api" block::
-
-    # Activating WebSockets
-    ProxyPass "/api/v1/instance/activity" ${funkwhale-api-ws}/api/v1/instance/activity
-
-Websockets may not be supported in older versions of Apache2. Be sure to upgrade to the latest version available.
diff --git a/changes/changelog.d/262.enhancement b/changes/changelog.d/262.enhancement
deleted file mode 100644
index cad67e93..00000000
--- a/changes/changelog.d/262.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added feedback on shuffle button (#262)
diff --git a/changes/changelog.d/264.enhancement b/changes/changelog.d/264.enhancement
deleted file mode 100644
index f527e433..00000000
--- a/changes/changelog.d/264.enhancement
+++ /dev/null
@@ -1,37 +0,0 @@
-Album cover served in http (#264)
-
-Apache is now serving album covers in https
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Two issues are addressed here. The first one was about Django replying with
-mixed content (http) when queried for covers. Setting up the `X-Forwarded-Proto`
-allows Django to know that the client is using https, and that the reply must
-be https as well.
-
-Second issue was a problem of permission causing Apache a denied access to
-album cover folder. It was solved by adding another block for this path in
-the Apache configuration file for funkwhale.
-
-Here is how to modify your `funkwhale.conf` :
-
-<VirtualHost *:443>
-
-    ...
-    Include /etc/letsencrypt/options-ssl-apache.conf
-
-    #Add this new line
-    RequestHeader set X-Forwarded-Proto "https"
-
-    ...
-
-    #Add this new block below the other <Directory/> blocks
-    <Directory /srv/funkwhale/data/media/albums>
-      Options FollowSymLinks
-      AllowOverride None
-      Require all granted
-    </Directory>
-
-    ...
-</VirtualHost>
-
-
diff --git a/changes/changelog.d/280.enhancement b/changes/changelog.d/280.enhancement
deleted file mode 100644
index 3a0d6149..00000000
--- a/changes/changelog.d/280.enhancement
+++ /dev/null
@@ -1,15 +0,0 @@
-Switch from BSD-3 licence to AGPL-3 licence (#280)
-
-Funkwhale is now licenced under AGPL-3
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Following the recent switch made by PixelFed
-(https://github.com/dansup/pixelfed/issues/143), we decided along with
-the community to relicence Funkwhale under the AGPL-3 licence. We did this
-switch for various reasons:
-
-- This is better aligned with other fediverse software
-- It prohibits anyone to distribute closed-source and proprietary forks of Funkwhale
-
-As end users and instance owners, this does not change anything. You can
-continue to use Funkwhale exactly as you did before :)
diff --git a/changes/changelog.d/287.bugfix b/changes/changelog.d/287.bugfix
deleted file mode 100644
index ce14736a..00000000
--- a/changes/changelog.d/287.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed duplicated websocket connexion on timeline (#287)
diff --git a/changes/changelog.d/289.enhancement b/changes/changelog.d/289.enhancement
deleted file mode 100644
index 713781f1..00000000
--- a/changes/changelog.d/289.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Display file size in human format during file upload (#289)
diff --git a/changes/changelog.d/291.enhancement b/changes/changelog.d/291.enhancement
deleted file mode 100644
index 1107bb44..00000000
--- a/changes/changelog.d/291.enhancement
+++ /dev/null
@@ -1,13 +0,0 @@
-Added multiple warnings in the documentation that you should never
-run makemigrations yourself (#291)
-
-
-About the makemigrations warning
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You may sometimes get the following warning while applying migrations::
-
-    "Your models have changes that are not yet reflected in a migration, and so won't be applied."
-
-This is a warning, not an error, and it can be safely ignored.
-Never run the ``makemigrations`` command yourself.
diff --git a/changes/changelog.d/295.bugfix b/changes/changelog.d/295.bugfix
deleted file mode 100644
index 02ad8f8f..00000000
--- a/changes/changelog.d/295.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken pagination in Subsonic API (#295)
diff --git a/changes/changelog.d/297.misc b/changes/changelog.d/297.misc
deleted file mode 100644
index ac47458f..00000000
--- a/changes/changelog.d/297.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Added Black and flake8 checks in CI to ensure consistent code styling and
-formatting (#297)
diff --git a/changes/changelog.d/298.doc b/changes/changelog.d/298.doc
deleted file mode 100644
index d8db45d6..00000000
--- a/changes/changelog.d/298.doc
+++ /dev/null
@@ -1 +0,0 @@
-Improved documentation about in-place imports setup (#298)
diff --git a/changes/changelog.d/299.misc b/changes/changelog.d/299.misc
deleted file mode 100644
index 4a9d2065..00000000
--- a/changes/changelog.d/299.misc
+++ /dev/null
@@ -1 +0,0 @@
-Added bug and feature issue templates (#299)
diff --git a/changes/changelog.d/311.bugfix b/changes/changelog.d/311.bugfix
deleted file mode 100644
index f981767c..00000000
--- a/changes/changelog.d/311.bugfix
+++ /dev/null
@@ -1,11 +0,0 @@
-Ensure radios can only be edited and deleted by their owners (#311)
-
-Permission issues on radios
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Because of an error in the way we checked user permissions on radios,
-public radios could be deleted by any logged-in user, even if they were not
-the owner of the radio.
-
-We recommend instances owners to upgrade as fast as possible to avoid any abuse
-and data loss.
-- 
GitLab