From 44d6c52e5f59baf7b49bb7da222f88bc217b4e31 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Wed, 9 Sep 2020 07:48:00 +0200
Subject: [PATCH] Version bump and changelog for 1.0

---
 CHANGELOG                                 | 13 +++++++++++--
 api/funkwhale_api/__init__.py             |  2 +-
 changes/changelog.d/1196.bugfix           |  1 -
 changes/changelog.d/1197.bugfix           |  1 -
 changes/changelog.d/1198.bugfix           |  1 -
 changes/changelog.d/1205.enhancement      |  1 -
 changes/changelog.d/1210.enhancement      |  1 -
 changes/changelog.d/1217.bugfix           |  1 -
 changes/changelog.d/1999.bugfix           |  1 -
 changes/changelog.d/scrobbler.enhancement |  1 -
 10 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 changes/changelog.d/1196.bugfix
 delete mode 100644 changes/changelog.d/1197.bugfix
 delete mode 100644 changes/changelog.d/1198.bugfix
 delete mode 100644 changes/changelog.d/1205.enhancement
 delete mode 100644 changes/changelog.d/1210.enhancement
 delete mode 100644 changes/changelog.d/1217.bugfix
 delete mode 100644 changes/changelog.d/1999.bugfix
 delete mode 100644 changes/changelog.d/scrobbler.enhancement

diff --git a/CHANGELOG b/CHANGELOG
index 9fff56b899..694fd4fa86 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,8 +10,8 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
-1.0-rc1 (2020-23-08)
---------------------
+1.0 (2020-09-09)
+----------------
 
 Upgrade instructions are available at
 https://docs.funkwhale.audio/index.html
@@ -100,6 +100,10 @@ Enhancements:
 - Set proper lang attribute on HTML document (#1130)
 - Use semantic headers for accessibility (#1121)
 - Users can now update their email address (#292)
+- [plugin, scrobbler] Use last.fm API v2 for scrobbling if API key and secret are provided
+- Added a new, large thumbnail size for cover images (#1205
+- Enforce authentication when viewing remote channels, profiles and libraries (#1210)
+
 
 
 Bugfixes:
@@ -111,6 +115,11 @@ Bugfixes:
 - Fixed crash with negative track position in file tags (#1193)
 - Handle access errors scanning directories when importing files
 - Make channel card updated times more humanly readable, add internationalization (#1089)
+- Ensure search page reloads if another search is submitted in the sidebar (#1197)
+- Fixed "scope=subscribed" on albums, artists, uploads and libraries API (#1217)
+- Fixed broken federation with pods using allow-listing (#1999)
+- Fixed broken search when using (, " or & chars (#1196)
+- Fixed domains table hidden controls when no domains are found (#1198)
 
 
 Documentation:
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 72a793c35e..765773ceb0 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.0-rc1"
+__version__ = "1.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1196.bugfix b/changes/changelog.d/1196.bugfix
deleted file mode 100644
index 3cd0e29ed5..0000000000
--- a/changes/changelog.d/1196.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken search when using (, " or & chars (#1196)
\ No newline at end of file
diff --git a/changes/changelog.d/1197.bugfix b/changes/changelog.d/1197.bugfix
deleted file mode 100644
index 14b33bc30b..0000000000
--- a/changes/changelog.d/1197.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure search page reloads if another search is submitted in the sidebar (#1197)
\ No newline at end of file
diff --git a/changes/changelog.d/1198.bugfix b/changes/changelog.d/1198.bugfix
deleted file mode 100644
index d6318effaf..0000000000
--- a/changes/changelog.d/1198.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed domains table hidden controls when no domains are found (#1198)
\ No newline at end of file
diff --git a/changes/changelog.d/1205.enhancement b/changes/changelog.d/1205.enhancement
deleted file mode 100644
index a3ccf4dc37..0000000000
--- a/changes/changelog.d/1205.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added a new, large thumbnail size for cover images (#1205
\ No newline at end of file
diff --git a/changes/changelog.d/1210.enhancement b/changes/changelog.d/1210.enhancement
deleted file mode 100644
index a41d714e51..0000000000
--- a/changes/changelog.d/1210.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Enforce authentication when viewing remote channels, profiles and libraries (#1210)
\ No newline at end of file
diff --git a/changes/changelog.d/1217.bugfix b/changes/changelog.d/1217.bugfix
deleted file mode 100644
index c4306a50eb..0000000000
--- a/changes/changelog.d/1217.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed "scope=subscribed" on albums, artists, uploads and libraries API (#1217)
\ No newline at end of file
diff --git a/changes/changelog.d/1999.bugfix b/changes/changelog.d/1999.bugfix
deleted file mode 100644
index 2f8e73224f..0000000000
--- a/changes/changelog.d/1999.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed broken federation with pods using allow-listing (#1999)
\ No newline at end of file
diff --git a/changes/changelog.d/scrobbler.enhancement b/changes/changelog.d/scrobbler.enhancement
deleted file mode 100644
index 1568ce8a83..0000000000
--- a/changes/changelog.d/scrobbler.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-[plugin, scrobbler] Use last.fm API v2 for scrobbling if API key and secret are provided
\ No newline at end of file
-- 
GitLab