From e289550a44493b8e16a167922cf852b1c40f81bd Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 21:40:14 +0100
Subject: [PATCH 01/13] Add French Readme

---
 README_fr.md | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 README_fr.md

diff --git a/README_fr.md b/README_fr.md
new file mode 100644
index 0000000..692226a
--- /dev/null
+++ b/README_fr.md
@@ -0,0 +1,85 @@
+# Funkwhale pour YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)   
+[![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale)
+
+*[Read this readme in english.](./README.md)* 
+
+> *Ce package vous permet d'installer Funkwhale rapidement et simplement sur un serveur YunoHost.  
+Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.*
+
+## Vue d'ensemble
+Un serveur de musique moderne, convivial et gratuit sur YunoHost
+
+L'installation nécessite un domaine ou un sous-domaine dédié. L'installation dans un chemin du domaine n'est pas prise en charge par le projet en amont en raison des exigences de dépendance.
+
+**Version incluse :** 1.0.1
+
+## Captures d'écran
+
+![](https://funkwhale.audio/img/desktop.5e79eb16.jpg)
+
+## Démo
+
+* [Démo officielle](https://demo.funkwhale.audio)
+
+**Nom d’utilisateur :** demo  **Mot de passe :** demo
+
+## Admin
+
+L'administrateur utilise le login que vous avez fourni lors de l'installation. Le mot de passe est le même que celui que vous utilisez pour YunoHost.
+
+L'interface d'administration est accessible à l'adresse : votre.domaine.fr/api/admin
+
+# État de ce paquet
+
+* Les éléments suivants ont été testés avec ce paquet et fonctionnent :
+
+  * [x] installer/supprimer/sauvegarder/supprimer/mettre à jour avec x86_64
+  * [x] importation des fichiers avec l’interface web, importations depuis youtube, interraction avec MusicBrainz
+  * [x] [API Subsonic] (https://docs.funkwhale.audio/users/apps.html)
+  * [x] [Fédération](https://docs.funkwhale.audio/federation.html) tests
+  * [x] [Import CLI](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) N'oubliez pas de `source $final_path/venv/bin/activate`, puis `source $final_path/load_env` avant de taper en utilisant manage.py. 
+  * [x] Support ARM
+
+* configuration de l'utilisateur final requise :
+  * [x] Intégration LDAP
+
+* à ajouter :
+  * [ ] Stocker les fichiers dans HOME, voir https://github.com/YunoHost-Apps/funkwhale_ynh/issues/15
+
+## Documentation
+
+ * Documentation officielle : https://docs.funkwhale.audio
+
+## Caractéristiques spécifiques YunoHost
+
+#### Support multi-utilisateur
+
+* L'authentification LDAP et HTTP est-elle prise en charge ? **OUI**
+* L'application peut-elle être utilisée par plusieurs utilisateurs ? **OUI**
+
+#### Architectures supportées
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/funkwhale%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/funkwhale/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/funkwhale%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/funkwhale/)
+
+## Liens
+
+ * Signaler un bug : https://github.com/YunoHost-Apps/funkwhale_ynh
+ * Site de l’application : https://docs.funkwhale.audio
+ * Dépôt de l'application principale : https://dev.funkwhale.audio/funkwhale/funkwhale
+ * Site web YunoHost : https://yunohost.org/
+
+---
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade funkwhale -u https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing --debug
+```

From feb367b6d20e2a8203b7f53c74e692ccd746b877 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 21:41:20 +0100
Subject: [PATCH 02/13] Readme update

---
 README.md | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ff5983f..ae4a59e 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
 # Funkwhale for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)   
 [![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale)
 
+*[Lire ce readme en français.](./README_fr.md)*
+
 > *This package allows you to install Funkwhale quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.
 
 ## Overview
 A modern, convivial and free music server on YunoHost
@@ -17,21 +19,31 @@ Installation requires a dedicated domain or subdomain. Installing in a subpath i
 
 ![](https://funkwhale.audio/img/desktop.5e79eb16.jpg)
 
+## Demo
+
+* [Official demo](https://demo.funkwhale.audio)
+
+**Username:** demo **Password:** demo
+
 ## Admin
 
 The admin uses the login you provided at installation. The password is the same you use for YunoHost.
 
-The admin interface is accessible at the address: `your.domain.fr/api/admin`
+The admin interface is accessible at the address: your.domain.fr/api/admin
 
 # State of this package
 
 * The following have been tested with this package and work fine:
 
-  * [x] install/remove/backup/remove/upgrade with x86_64 and ARM
-  * [x] import file with web interface, imports from YouTube, interraction with MusicBrainz
+  * [x] install/remove/backup/remove/upgrade with x86_64
+  * [x] import file with web interface, imports from youtube, interraction with MusicBrainz
   * [x] [Subsonic API](https://docs.funkwhale.audio/users/apps.html)
   * [x] [Federation](https://docs.funkwhale.audio/federation.html) tests
-  * [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py.
+  * [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py. 
+  * [x] ARM support
+
+* end-user configuration required:
+  * [x] LDAP integration
 
 * to be added:
   * [ ] Store files in HOME, see https://github.com/YunoHost-Apps/funkwhale_ynh/issues/15
@@ -42,8 +54,10 @@ The admin interface is accessible at the address: `your.domain.fr/api/admin`
 
 ## YunoHost specific features
 
- * Are LDAP and HTTP auth supported? **Yes**
- * Can the app be used by multiple users? **Yes**
+#### Multi-user support
+
+* Are LDAP and HTTP auth supported? **YES**
+* Can the app be used by multiple users? **YES**
 
 #### Supported architectures
 
@@ -53,14 +67,14 @@ The admin interface is accessible at the address: `your.domain.fr/api/admin`
 ## Links
 
  * Report a bug about this package: https://github.com/YunoHost-Apps/funkwhale_ynh
- * Report a bug about Funkwhale itself: https://code.eliotberriot.com/funkwhale/funkwhale/
  * App website: https://docs.funkwhale.audio
  * Upstream app repository: https://dev.funkwhale.audio/funkwhale/funkwhale
  * YunoHost website: https://yunohost.org/
 
 ---
 
-## Developers info
+Developers info
+----------------
 
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing).
 

From 21f7dc030679b2d528c25b6609d5e7a26505577e Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 21:50:23 +0100
Subject: [PATCH 03/13] Update README.md

---
 README.md | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index ae4a59e..39984ba 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Funkwhale for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)   
+[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)  
 [![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -29,21 +29,17 @@ Installation requires a dedicated domain or subdomain. Installing in a subpath i
 
 The admin uses the login you provided at installation. The password is the same you use for YunoHost.
 
-The admin interface is accessible at the address: your.domain.fr/api/admin
+The admin interface is accessible at the address: `your.domain.fr/api/admin`
 
 # State of this package
 
 * The following have been tested with this package and work fine:
 
-  * [x] install/remove/backup/remove/upgrade with x86_64
-  * [x] import file with web interface, imports from youtube, interraction with MusicBrainz
+  * [x] install/remove/backup/remove/upgrade with x86_64 and ARM
+  * [x] import file with web interface, imports from YouTube, interraction with MusicBrainz
   * [x] [Subsonic API](https://docs.funkwhale.audio/users/apps.html)
   * [x] [Federation](https://docs.funkwhale.audio/federation.html) tests
-  * [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py. 
-  * [x] ARM support
-
-* end-user configuration required:
-  * [x] LDAP integration
+  * [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py.
 
 * to be added:
   * [ ] Store files in HOME, see https://github.com/YunoHost-Apps/funkwhale_ynh/issues/15
@@ -54,10 +50,8 @@ The admin interface is accessible at the address: your.domain.fr/api/admin
 
 ## YunoHost specific features
 
-#### Multi-user support
-
-* Are LDAP and HTTP auth supported? **YES**
-* Can the app be used by multiple users? **YES**
+ * Are LDAP and HTTP auth supported? **Yes**
+ * Can the app be used by multiple users? **Yes**
 
 #### Supported architectures
 

From 0d1a2d805966e9e75449b3db0138351a95a3fcdc Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 21:53:22 +0100
Subject: [PATCH 04/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39984ba..c9d9d3d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 *[Lire ce readme en français.](./README_fr.md)*
 
 > *This package allows you to install Funkwhale quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.
+If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
 
 ## Overview
 A modern, convivial and free music server on YunoHost

From 1c30dc1a7154773250e79da1020242c8e13ad160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:04:23 +0100
Subject: [PATCH 05/13] Testing (#121)

* Update to 1.0.1
---
 README.md             | 19 +++++++++----------
 check_process         |  1 -
 conf/app-frontend.src |  4 ++--
 conf/app.src          |  4 ++--
 manifest.json         | 19 ++++++++++++-------
 scripts/install       |  9 +++++----
 scripts/upgrade       | 12 ------------
 7 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 693a6f5..ff5983f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Funkwhale for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)   
+[![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)  
 [![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale)
 
 > *This package allows you to install Funkwhale quickly and simply on a YunoHost server.  
@@ -11,7 +11,7 @@ A modern, convivial and free music server on YunoHost
 
 Installation requires a dedicated domain or subdomain. Installing in a subpath is not supported by the upstream project due to dependency requirements.
 
-**Shipped version:** 1.0
+**Shipped version:** 1.0.1
 
 ## Screenshots
 
@@ -21,21 +21,17 @@ Installation requires a dedicated domain or subdomain. Installing in a subpath i
 
 The admin uses the login you provided at installation. The password is the same you use for YunoHost.
 
-The admin interface is accessible at the address: your.domain.fr/api/admin
+The admin interface is accessible at the address: `your.domain.fr/api/admin`
 
 # State of this package
 
 * The following have been tested with this package and work fine:
 
-  * [x] install/remove/backup/remove/upgrade with x86_64
-  * [x] import file with web interface, imports from youtube, interraction with MusicBrainz
+  * [x] install/remove/backup/remove/upgrade with x86_64 and ARM
+  * [x] import file with web interface, imports from YouTube, interraction with MusicBrainz
   * [x] [Subsonic API](https://docs.funkwhale.audio/users/apps.html)
   * [x] [Federation](https://docs.funkwhale.audio/federation.html) tests
-  * [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py. 
-  * [x] ARM support
-
-* end-user configuration required:
-  * [x] LDAP integration
+  * [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py.
 
 * to be added:
   * [ ] Store files in HOME, see https://github.com/YunoHost-Apps/funkwhale_ynh/issues/15
@@ -46,6 +42,9 @@ The admin interface is accessible at the address: your.domain.fr/api/admin
 
 ## YunoHost specific features
 
+ * Are LDAP and HTTP auth supported? **Yes**
+ * Can the app be used by multiple users? **Yes**
+
 #### Supported architectures
 
 * x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/funkwhale%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/funkwhale/)
diff --git a/check_process b/check_process
index a451a0f..b0e4657 100644
--- a/check_process
+++ b/check_process
@@ -29,4 +29,3 @@ Notification=all
 	; commit=4d4bf0981e2d3a00eaae6b19bd54344fe55d6530
 		name=Upgrade to 0.19.1 and fix channels-redis bug
 		manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1
-	
\ No newline at end of file
diff --git a/conf/app-frontend.src b/conf/app-frontend.src
index 857fe10..9448940 100644
--- a/conf/app-frontend.src
+++ b/conf/app-frontend.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.0/download?job=build_front
-SOURCE_SUM=f062d7485325a78f08afaf2c641d8616e983d82d11dfc1e656cbc09a113c4202
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.0.1/download?job=build_front
+SOURCE_SUM=0b77367cb4e8d1b57af59282af90ac41e0915de85cf5337b02f16e6aa0bd0129
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/conf/app.src b/conf/app.src
index 86fb56a..e1e4b3a 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.0/funkwhale-1.0.tar.gz
-SOURCE_SUM=c305ad352b739f0665c775922ab657991fa3c4c6830bf93210e98659a08f37d5
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.0.1/funkwhale-1.01.tar.gz
+SOURCE_SUM=103e45a3c8ae2a1223cb83689ed0a8f35bc7dfa053725a9dfd211e0e0973141b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 69cbe6f..d3c644d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,9 +3,10 @@
     "id": "funkwhale",
     "packaging_format": 1,
     "description": {
-        "en": "A modern, convivial and free music server"
+        "en": "Modern, convivial and free music server",
+        "fr": "Serveur de musique moderne, convivial et gratuit"
     },
-    "version": "0.1.0.1~ynh1",
+    "version": "1.0.1~ynh1",
     "url": "https://funkwhale.audio",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
@@ -17,7 +18,7 @@
         "email": "jean-baptiste@holcroft.fr"
     }],
     "requirements": {
-        "yunohost": ">= 4.0"
+        "yunohost": ">= 4.0.0"
     },
     "multi_instance": true,
     "services": [
@@ -28,7 +29,8 @@
                 "name": "domain",
                 "type": "domain",
                 "ask": {
-                    "en": "Choose a domain for funkwhale"
+                    "en": "Choose a domain for Funkwhale",
+                    "fr": "Choisissez un nom de domaine pour Funkwhale"
                 },
                 "example": "example.com"
             },
@@ -36,7 +38,8 @@
                 "name": "admin",
                 "type": "user",
                 "ask": {
-                    "en": "Choose an admin user"
+                    "en": "Choose an admin user",
+                    "fr": "Choisissez l'administrateur"
                 },
                 "example": "sporiff"
             },
@@ -44,10 +47,12 @@
                 "name": "is_public",
                 "type": "boolean",
                 "ask": {
-                    "en": "Is it a public application?"
+                    "en": "Is it a public application?",
+                    "fr": "Est-ce une application publique ?"
                 },
                 "help": {
-                    "en": "Allows unauthenticated users to access the user interface (mandatory for federation)"
+                    "en": "Allows unauthenticated users to access the user interface (mandatory for federation).",
+                    "fr": "Permet aux utilisateurs non authentifiés d'accéder à l'interface utilisateur (obligatoire pour la fédération)."
                 },
                 "default": true
             }
diff --git a/scripts/install b/scripts/install
index 66a3806..38d8193 100644
--- a/scripts/install
+++ b/scripts/install
@@ -238,11 +238,12 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
 #=================================================
 ynh_script_progression --message="Configuring SSOwat..."
 
-# Make app public if necessary
-if [ "$is_public" -eq 1 ]
+# Make app public if necessary or protect it
+if [ $is_public -eq 1 ]
 then
-	# makes sure no SSO credentials to be passed
-	ynh_app_setting_set --app="$app" --key=skipped_uris --value="/"
+	# Everyone can access the app.
+	# The "main" permission is automatically created before the install script.
+	ynh_permission_update --permission "main" --add "visitors"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 890fe04..ba53da0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -254,18 +254,6 @@ yunohost service add "$app-server" --log="/var/log/$app/server.log"
 yunohost service add "$app-worker" --log="/var/log/$app/worker.log"
 yunohost service add "$app-beat"   --log="/var/log/$app/beat.log"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
-
-# Make app public if necessary
-if [ "$is_public" -eq 1 ]
-then
-	# makes sure no SSO credentials to be passed
-	ynh_app_setting_set --app="$app" --key=skipped_uris --value="/"
-fi
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================

From 73883e6cc5cb4b70f80faf8f182e560e87edc559 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:05:07 +0100
Subject: [PATCH 06/13] Update README_fr.md

---
 README_fr.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/README_fr.md b/README_fr.md
index 692226a..9db7d94 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -37,13 +37,9 @@ L'interface d'administration est accessible à l'adresse : votre.domaine.fr/api/
 
   * [x] installer/supprimer/sauvegarder/supprimer/mettre à jour avec x86_64
   * [x] importation des fichiers avec l’interface web, importations depuis youtube, interraction avec MusicBrainz
-  * [x] [API Subsonic] (https://docs.funkwhale.audio/users/apps.html)
-  * [x] [Fédération](https://docs.funkwhale.audio/federation.html) tests
+  * [x] [API Subsonic](https://docs.funkwhale.audio/users/apps.html)
+  * [x]  Tests de [Fédération](https://docs.funkwhale.audio/federation.html)
   * [x] [Import CLI](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) N'oubliez pas de `source $final_path/venv/bin/activate`, puis `source $final_path/load_env` avant de taper en utilisant manage.py. 
-  * [x] Support ARM
-
-* configuration de l'utilisateur final requise :
-  * [x] Intégration LDAP
 
 * à ajouter :
   * [ ] Stocker les fichiers dans HOME, voir https://github.com/YunoHost-Apps/funkwhale_ynh/issues/15

From 4fec2a1813e3dea58ae8096d5a5ebfe5c35f1a8f Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:12:11 +0100
Subject: [PATCH 07/13] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c9d9d3d..643502f 100644
--- a/README.md
+++ b/README.md
@@ -67,8 +67,7 @@ The admin interface is accessible at the address: `your.domain.fr/api/admin`
 
 ---
 
-Developers info
-----------------
+## Developers info
 
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing).
 

From 5120dc8ca6fe790c36735a71f9cbe49249719bfe Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:12:26 +0100
Subject: [PATCH 08/13] Update README_fr.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index 9db7d94..9fb6bb4 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -71,7 +71,7 @@ L'interface d'administration est accessible à l'adresse : votre.domaine.fr/api/
 
 ## Informations pour les développeurs
 
-Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/funkwhale_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
 ```

From 4a7d55f1e19b5dced8469d7b18a133358597503c Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Sat, 19 Dec 2020 19:53:20 +0100
Subject: [PATCH 09/13] Update README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 643502f..0796aea 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Funkwhale for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)  
-[![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale)
+[![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=funkwhale)
 
 *[Lire ce readme en français.](./README_fr.md)*
 

From fa41dd52769b23d8497f321fb08c642bebc17165 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Sat, 19 Dec 2020 19:53:34 +0100
Subject: [PATCH 10/13] Update README_fr.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com>
---
 README_fr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README_fr.md b/README_fr.md
index 9fb6bb4..8d71111 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,7 +1,7 @@
 # Funkwhale pour YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/funkwhale.svg)](https://dash.yunohost.org/appci/app/funkwhale) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/funkwhale.maintain.svg)   
-[![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=funkwhale)
+[![Install Funkwhale with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=funkwhale)
 
 *[Read this readme in english.](./README.md)* 
 

From 05c47d876eb63328cb35e5736f2c891422e9e015 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 9 Jan 2021 22:43:04 +0100
Subject: [PATCH 11/13] Finding an available port

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 38d8193..f50e92f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -56,7 +56,7 @@ ynh_app_setting_set --app="$app" --key=admin --value="$admin"
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
-ynh_script_progression --message="Configuring firewall..."
+ynh_script_progression --message="Finding an available port..."
 
 # Find a free port
 port=$(ynh_find_port --port=5000)

From 7c44eaab7626136ecb589d6972c9ccd3692e3075 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 11 Mar 2021 20:03:28 +0100
Subject: [PATCH 12/13] Uprade to 1.1 and fixes Twisted by retrograding it
 (#129)

---
 README.md                                     |  2 +-
 README_fr.md                                  |  2 +-
 conf/app-frontend.src                         |  4 +-
 conf/app.src                                  |  4 +-
 manifest.json                                 |  4 +-
 .../extra_files/app/api/requirements/base.txt | 93 ++++++++++---------
 6 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index 0796aea..410335c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ A modern, convivial and free music server on YunoHost
 
 Installation requires a dedicated domain or subdomain. Installing in a subpath is not supported by the upstream project due to dependency requirements.
 
-**Shipped version:** 1.0.1
+**Shipped version:** 1.1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 8d71111..0c14ba1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ Un serveur de musique moderne, convivial et gratuit sur YunoHost
 
 L'installation nécessite un domaine ou un sous-domaine dédié. L'installation dans un chemin du domaine n'est pas prise en charge par le projet en amont en raison des exigences de dépendance.
 
-**Version incluse :** 1.0.1
+**Version incluse :** 1.1
 
 ## Captures d'écran
 
diff --git a/conf/app-frontend.src b/conf/app-frontend.src
index 9448940..52d9f61 100644
--- a/conf/app-frontend.src
+++ b/conf/app-frontend.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.0.1/download?job=build_front
-SOURCE_SUM=0b77367cb4e8d1b57af59282af90ac41e0915de85cf5337b02f16e6aa0bd0129
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.1/download?job=build_front
+SOURCE_SUM=cf985340ba0fe477fa5f9b8940102e016c0c75a9941dd8acabb8dc5f77cda000
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
diff --git a/conf/app.src b/conf/app.src
index e1e4b3a..67a52e9 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.0.1/funkwhale-1.01.tar.gz
-SOURCE_SUM=103e45a3c8ae2a1223cb83689ed0a8f35bc7dfa053725a9dfd211e0e0973141b
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.1/funkwhale-1.1.tar.gz
+SOURCE_SUM=924a31ba385c9c52204d78aa89a00b5f53240bf91a13b2c08945fde8f770d345
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index d3c644d..d5f1259 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Modern, convivial and free music server",
         "fr": "Serveur de musique moderne, convivial et gratuit"
     },
-    "version": "1.0.1~ynh1",
+    "version": "1.1~ynh1",
     "url": "https://funkwhale.audio",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
@@ -58,4 +58,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}
diff --git a/sources/extra_files/app/api/requirements/base.txt b/sources/extra_files/app/api/requirements/base.txt
index 88f7099..35d71c2 100644
--- a/sources/extra_files/app/api/requirements/base.txt
+++ b/sources/extra_files/app/api/requirements/base.txt
@@ -1,74 +1,77 @@
 django~=3.0.8
 setuptools>=49
 # Configuration
-django-environ~=0.4
+django-environ~=0.4.0
 
 # Images
-Pillow~=7.0
+Pillow~=7.0.0
 
-django-allauth~=0.42
+django-allauth~=0.42.0
 
-psycopg2-binary~=2.8
+psycopg2-binary~=2.8.0
 
 # Time zones support
 pytz==2020.1
 
 # Redis support
-django-redis~=4.12
-redis~=3.5
-kombu~=4.6
+django-redis~=4.12.0
+redis~=3.5.0
+kombu~=4.6.0
 
-celery~=4.4
+celery~=4.4.0
 
 
 # Your custom requirements go here
-django-cors-headers~=3.4
+django-cors-headers~=3.4.0
 musicbrainzngs~=0.7.1
-djangorestframework~=3.11
-djangorestframework-jwt~=1.11
+djangorestframework~=3.11.0
+djangorestframework-jwt~=1.11.0
 arrow~=0.15.5
-persisting-theory~=0.2
-django-versatileimagefield~=2.0
-django-filter~=2.3
-django-rest-auth~=0.9
-ipython~=7.10
-mutagen~=1.45
+persisting-theory~=0.2.0
+django-versatileimagefield~=2.0.0
+django-filter~=2.3.0
+django-rest-auth~=0.9.0
+ipython~=7.10.0
+mutagen~=1.45.0
 
-pymemoize~=1.0
+pymemoize~=1.0.0
 
 django-dynamic-preferences~=1.10
-raven~=6.10
-python-magic~=0.4
-channels~=2.4
-channels_redis~=3.0
-uvicorn[standard]~=0.12
-gunicorn~=20.0
+raven~=6.10.0
+python-magic~=0.4.0
+channels~=2.4.0
+channels_redis~=3.0.0
+uvicorn[standard]~=0.12.0
+gunicorn~=20.0.0
 
-cryptography~=2.9
+cryptography~=2.9.0
 # requests-http-signature==0.0.3
 # clone until the branch is merged and released upstream
-git+https://github.com/EliotBerriot/requests-http-signature.git@signature-header-support
-django-cleanup~=5.0
-requests~=2.24
-pyOpenSSL~=19.1
+git+https://github.com/agateblue/requests-http-signature.git@signature-header-support
+django-cleanup~=5.0.0
+requests~=2.24.0
+pyOpenSSL~=19.1.0
 
 # for LDAP authentication
-python-ldap~=3.3
-django-auth-ldap~=2.2
+python-ldap~=3.3.0
+django-auth-ldap~=2.2.0
 
-pydub~=0.24
-pyld~=1.0
-aiohttp~=3.6
+pydub~=0.24.0
+pyld~=1.0.0
+aiohttp~=3.6.0
 
-django-oauth-toolkit~=1.3
-django-storages~=1.9
-boto3~=1.14
-unicode-slugify~=0.1
-django-cacheops~=5.0
+django-oauth-toolkit~=1.3.0
+django-storages~=1.9.0
+boto3~=1.14.0
+unicode-slugify~=0.1.0
+django-cacheops~=5.0.0
 
-click~=7.1
-service_identity~=18.1
-markdown~=3.2
-bleach~=3.1
-feedparser==6.0.0b3
-watchdog~=0.10
\ No newline at end of file
+click~=7.1.0
+service_identity~=18.1.0
+markdown~=3.2.0
+bleach~=3.1.0
+feedparser~=6.0.0
+watchdog~=1.0.2
+
+## Pin third party dependency to avoid issue with latest version
+twisted==20.3.0

From fc22726fa67f77c7f7fc2d036a9f8f3219047ab6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 12 Mar 2021 08:50:52 +0100
Subject: [PATCH 13/13] Fix linter warning : no need to use $is_public

---
 scripts/install | 7 +++----
 scripts/upgrade | 8 +++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index f50e92f..beb1454 100644
--- a/scripts/install
+++ b/scripts/install
@@ -48,7 +48,6 @@ ynh_script_progression --message="Storing installation settings..."
 
 ynh_app_setting_set --app="$app" --key=domain --value="$domain"
 ynh_app_setting_set --app="$app" --key=path --value="$path_url"
-ynh_app_setting_set --app="$app" --key=is_public --value="$is_public"
 ynh_app_setting_set --app="$app" --key=admin --value="$admin"
 
 #=================================================
@@ -68,7 +67,7 @@ ynh_app_setting_set --app="$app" --key=port --value="$port"
 #=================================================
 ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_app_dependencies $pkg_dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A POSTGRESQL DATABASE
@@ -236,14 +235,14 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..."
+ynh_script_progression --message="Configuring permissions..."
 
 # Make app public if necessary or protect it
 if [ $is_public -eq 1 ]
 then
 	# Everyone can access the app.
 	# The "main" permission is automatically created before the install script.
-	ynh_permission_update --permission "main" --add "visitors"
+	ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index ba53da0..a01b565 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app="$app" --key=domain)
 path_url=$(ynh_app_setting_get --app="$app" --key=path)
-is_public=$(ynh_app_setting_get --app="$app" --key=is_public)
 final_path=$(ynh_app_setting_get --app="$app" --key=final_path)
 db_name=$(ynh_app_setting_get --app="$app" --key=db_name)
 db_user="$db_name"
@@ -52,6 +51,13 @@ if [ ! -d "$final_path/code/" ]; then
 	ynh_app_setting_set --app="$app" --key=code_migration --value=1
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================