From 0695647713c901eed6e64a4e17fc3e55cd6d8273 Mon Sep 17 00:00:00 2001
From: gisforgabriel <mr.gabriel.morrison+github@gmail.com>
Date: Thu, 11 Jun 2020 05:45:10 +0200
Subject: [PATCH 1/3] Docs - Reverse proxy - Caddy v2 installation notes

---
 changes/changelog.d/1137.docs |  1 +
 docs/installation/index.rst   | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 changes/changelog.d/1137.docs

diff --git a/changes/changelog.d/1137.docs b/changes/changelog.d/1137.docs
new file mode 100644
index 000000000..9a4ae4d19
--- /dev/null
+++ b/changes/changelog.d/1137.docs
@@ -0,0 +1 @@
+Updated documentation to reflect changes in Caddy v2.
diff --git a/docs/installation/index.rst b/docs/installation/index.rst
index 1fd338976..08f521781 100644
--- a/docs/installation/index.rst
+++ b/docs/installation/index.rst
@@ -324,7 +324,15 @@ Caddy
 ^^^^^
 
 If you're using Caddy as a reverse proxy in front of your docker containers (either mono or multi-container setup),
-you can use the following configuration::
+you can use the following Caddyfile configuration:
+
+Caddy v2::
+
+    yourdomain.funkwhale
+
+    reverse_proxy 127.0.0.1:5000
+
+Caddy v1::
 
     yourdomain.funkwhale {
         proxy / 127.0.0.1:5000 {
@@ -335,7 +343,6 @@ you can use the following configuration::
     }
 
 
-
 About internal locations
 ^^^^^^^^^^^^^^^^^^^^^^^^
 

From 3a0c930dd594ee02fb8e3700e899ea2e6c71ae07 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Thu, 11 Jun 2020 05:43:18 +0200
Subject: [PATCH 2/3] Fix #1154: Support for specifying itunes:email and
 itunes:name in channels for compatibiliy with third-party platforms

---
 changes/changelog.d/1154.enhancement       |  1 +
 front/src/components/audio/ChannelForm.vue | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 changes/changelog.d/1154.enhancement

diff --git a/changes/changelog.d/1154.enhancement b/changes/changelog.d/1154.enhancement
new file mode 100644
index 000000000..e5caf8976
--- /dev/null
+++ b/changes/changelog.d/1154.enhancement
@@ -0,0 +1 @@
+Support for specifying itunes:email and itunes:name in channels for compatibiliy with third-party platforms (#1154)
diff --git a/front/src/components/audio/ChannelForm.vue b/front/src/components/audio/ChannelForm.vue
index cc157a270..7b6f323ae 100644
--- a/front/src/components/audio/ChannelForm.vue
+++ b/front/src/components/audio/ChannelForm.vue
@@ -120,6 +120,31 @@
             </select>
           </div>
         </div>
+        <div class="ui two fields" v-if="newValues.content_category === 'podcast'">
+          <div class="ui field">
+            <label for="channel-itunes-email">
+              <translate translate-context="*/*/*">Owner email</translate>
+            </label>
+            <input
+              name="channel-itunes-email"
+              id="channel-itunes-email"
+              type="email"
+              v-model="newValues.metadata.owner_email">
+          </div>
+          <div class="ui field">
+            <label for="channel-itunes-name">
+              <translate translate-context="*/*/*">Owner name</translate>
+            </label>
+            <input
+              name="channel-itunes-name"
+              id="channel-itunes-name"
+              maxlength="255"
+              v-model="newValues.metadata.owner_name">
+          </div>
+        </div>
+        <p>
+          <translate translate-context="*/*/*">Used for the itunes:email and itunes:name field required by certain platforms such as Spotify or iTunes.</translate>
+        </p>
       </template>
     </template>
     <div v-else class="ui active inverted dimmer">

From 85c6baca9a86759a747ec7fbbba579022f304dc6 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Thu, 11 Jun 2020 05:57:53 +0200
Subject: [PATCH 3/3] Fix #1155: Fixed crash on python 3.5 with cli importer

---
 api/funkwhale_api/music/management/commands/import_files.py | 2 +-
 changes/changelog.d/1155.bugfix                             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/1155.bugfix

diff --git a/api/funkwhale_api/music/management/commands/import_files.py b/api/funkwhale_api/music/management/commands/import_files.py
index ddc598d06..e03c9a720 100644
--- a/api/funkwhale_api/music/management/commands/import_files.py
+++ b/api/funkwhale_api/music/management/commands/import_files.py
@@ -37,7 +37,7 @@ def crawl_dir(dir, extensions, recursive=True, ignored=[]):
                             yield entry.path
             elif recursive and entry.is_dir():
                 yield from crawl_dir(
-                    entry, extensions, recursive=recursive, ignored=ignored
+                    entry.path, extensions, recursive=recursive, ignored=ignored
                 )
     finally:
         if hasattr(scanner, "close"):
diff --git a/changes/changelog.d/1155.bugfix b/changes/changelog.d/1155.bugfix
new file mode 100644
index 000000000..e67ec0d74
--- /dev/null
+++ b/changes/changelog.d/1155.bugfix
@@ -0,0 +1 @@
+Fixed crash on python 3.5 with cli importer (#1155)