Merge branch 'testing' of https://github.com/YunoHost-Apps/funkwhale_ynh into testing

README.md

@@ -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] install/remove/backup/remove/upgrade with x86_64 and ARM
-  * [x] import file with web interface, imports from youtube, interraction with MusicBrainz
+  * [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
 
 * 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/)

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
-	

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_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.0.1/download?job=build_front
-SOURCE_SUM=f062d7485325a78f08afaf2c641d8616e983d82d11dfc1e656cbc09a113c4202
+SOURCE_SUM=0b77367cb4e8d1b57af59282af90ac41e0915de85cf5337b02f16e6aa0bd0129
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.0/funkwhale-1.0.tar.gz
+SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/archive/1.0.1/funkwhale-1.01.tar.gz
-SOURCE_SUM=c305ad352b739f0665c775922ab657991fa3c4c6830bf93210e98659a08f37d5
+SOURCE_SUM=103e45a3c8ae2a1223cb83689ed0a8f35bc7dfa053725a9dfd211e0e0973141b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.bz2
 SOURCE_IN_SUBDIR=true

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": {
@@ -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
             }