From 0c4c1f37039a576ada8e84d04b92863628be2261 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Mon, 24 Jun 2024 20:41:02 +0200
Subject: [PATCH 1/5] update some documentation

---
 doc/ADMIN.md    | 8 +++-----
 doc/ADMIN_fr.md | 8 +++-----
 manifest.toml   | 4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/doc/ADMIN.md b/doc/ADMIN.md
index 43c563e..3a04068 100644
--- a/doc/ADMIN.md
+++ b/doc/ADMIN.md
@@ -1,11 +1,9 @@
-After the installation, you can login with the user and password you choose before the installation.
+After the installation, you can login with the mail of the chosen user and the password you choose before the installation.
 
 If you have to use the [command line interface (cli)](https://samr1.github.io/FitTrackee/cli.html), you can go like this:
 
 ```
- pushd __INSTALL_DIR__/
-    source __INSTALL_DIR__/venv/bin/activate
-    ftcli [OPTIONS] COMMAND [ARGS]...
- popd
+yunohost app shell __APP__
+ftcli [OPTIONS] COMMAND [ARGS]...
 ```
 
diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md
index 353cc82..6eb6851 100644
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@@ -1,11 +1,9 @@
-Après l’installation, vous pouvez vous connecter avec les nom d’utilisateur et mot de passe que vous avez choisis avant l’installation.
+Après l’installation, vous pouvez vous connecter avec l’adresse électronique de l’utilisateur créé et le mot de passe que vous avez choisi avant l’installation.
 
 Si vous avez besoin d’utiliser la [ligne de commande](https://samr1.github.io/FitTrackee/cli.html) vous pouvez suivre ces étapes :
 
 ```
- pushd __INSTALL_DIR__/
-    source __INSTALL_DIR__/venv/bin/activate
-    ftcli [OPTIONS] COMMAND [ARGS]...
- popd
+yunohost app shell __APP__
+ftcli [OPTIONS] COMMAND [ARGS]...
 ```
 
diff --git a/manifest.toml b/manifest.toml
index 1ea9eb4..d5d47b3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -33,7 +33,6 @@ ram.runtime = "50M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
     [install.init_main_permission]
@@ -41,8 +40,9 @@ ram.runtime = "50M"
     default = "visitors"
 
     [install.admin]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "user"
+    help.en = "You will have to login with the email of this user and the password you’ll set below."
+    help.fr = "Vous devrez vous connecter avec l’adresse courriel de cet utilisateur et le mot de passe configuré ci-dessous."
 
     [install.password]
     help.en = "Choose a password for your admin user here."

From fb74b1401652d5b6ffd33f023f6621501bca3be2 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Wed, 26 Jun 2024 20:58:48 +0000
Subject: [PATCH 2/5] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_zh_Hans.md | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8b34715..c0cede3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # FitTrackee for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/fittrackee.svg)](https://dash.yunohost.org/appci/app/fittrackee) ![Working status](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/fittrackee.svg)](https://ci-apps.yunohost.org/ci/apps/fittrackee/) ![Working status](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
 
 [![Install FitTrackee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fittrackee)
 
diff --git a/README_es.md b/README_es.md
index 9a3f638..723beb9 100644
--- a/README_es.md
+++ b/README_es.md
@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # FitTrackee para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/fittrackee.svg)](https://dash.yunohost.org/appci/app/fittrackee) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/fittrackee.svg)](https://ci-apps.yunohost.org/ci/apps/fittrackee/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
 
 [![Instalar FitTrackee con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fittrackee)
 
diff --git a/README_eu.md b/README_eu.md
index b4aada9..112cf97 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # FitTrackee YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/fittrackee.svg)](https://dash.yunohost.org/appci/app/fittrackee) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/fittrackee.svg)](https://ci-apps.yunohost.org/ci/apps/fittrackee/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
 
 [![Instalatu FitTrackee YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fittrackee)
 
diff --git a/README_fr.md b/README_fr.md
index c2492b4..d7148b0 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # FitTrackee pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/fittrackee.svg)](https://dash.yunohost.org/appci/app/fittrackee) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/fittrackee.svg)](https://ci-apps.yunohost.org/ci/apps/fittrackee/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
 
 [![Installer FitTrackee avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fittrackee)
 
diff --git a/README_gl.md b/README_gl.md
index 177d079..a6a787d 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # FitTrackee para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/fittrackee.svg)](https://dash.yunohost.org/appci/app/fittrackee) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/fittrackee.svg)](https://ci-apps.yunohost.org/ci/apps/fittrackee/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
 
 [![Instalar FitTrackee con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fittrackee)
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 6af2c4c..9a5afcb 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -5,7 +5,7 @@
 
 # YunoHost 上的 FitTrackee
 
-[![集成程度](https://dash.yunohost.org/integration/fittrackee.svg)](https://dash.yunohost.org/appci/app/fittrackee) ![工作状态](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/fittrackee.svg)](https://ci-apps.yunohost.org/ci/apps/fittrackee/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/fittrackee.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/fittrackee.maintain.svg)
 
 [![使用 YunoHost 安装 FitTrackee](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fittrackee)
 

From df72dbf196bd9c304ac18d74a6a599e001fccf74 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Sun, 30 Jun 2024 08:09:24 +0200
Subject: [PATCH 3/5] upgrade to 0.8.5

---
 manifest.toml | 2 +-
 tests.toml    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index d5d47b3..430521a 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ description.gl = "Rexistra as túas actividades ao aire libre 🚴"
 description.ca = "Seguiment d'activitats a l'aire lliure autoallotjat 🚴"
 description.fr = "Traqueur d’activités extérieures auto-hébergé 🚴"
 
-version = "0.8.4~ynh1"
+version = "0.8.5~ynh1"
 
 maintainers = ["Thovi98"]
 
diff --git a/tests.toml b/tests.toml
index 873d412..f1e2b99 100644
--- a/tests.toml
+++ b/tests.toml
@@ -19,4 +19,5 @@ test_format = 1.0
     test_upgrade_from.5b6ccd1.name = "0.8.0"
     test_upgrade_from.6c23ccf.name = "0.8.1"
     test_upgrade_from.2c6b69d.name = "0.8.3"
+    test_upgrade_from.fb74b14.name = "0.8.4"
     

From 73bd16d3dd19e7ac07c3ce66591b01b5bf123085 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Sun, 30 Jun 2024 06:09:28 +0000
Subject: [PATCH 4/5] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_zh_Hans.md | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c0cede3..9362c2b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
 No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
 
 
-**Shipped version:** 0.8.4~ynh1
+**Shipped version:** 0.8.5~ynh1
 
 ## Screenshots
 
diff --git a/README_es.md b/README_es.md
index 723beb9..afb27ff 100644
--- a/README_es.md
+++ b/README_es.md
@@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
 No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
 
 
-**Versión actual:** 0.8.4~ynh1
+**Versión actual:** 0.8.5~ynh1
 
 ## Capturas
 
diff --git a/README_eu.md b/README_eu.md
index 112cf97..b0cbcb6 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
 No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
 
 
-**Paketatutako bertsioa:** 0.8.4~ynh1
+**Paketatutako bertsioa:** 0.8.5~ynh1
 
 ## Pantaila-argazkiak
 
diff --git a/README_fr.md b/README_fr.md
index d7148b0..80f05f8 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 FitTrackee vous permet de suivre vos activités de plein air (séances d'entraînement) à partir de fichiers gpx et de conserver vos données sur votre propre serveur.
 Aucune application mobile n'a encore été développée, mais plusieurs applications mobiles existantes peuvent stocker localement les données des séances d'entraînement et les exporter dans un fichier gpx.
 
-**Version incluse :** 0.8.4~ynh1
+**Version incluse :** 0.8.5~ynh1
 
 ## Captures d’écran
 
diff --git a/README_gl.md b/README_gl.md
index a6a787d..fa4ca4c 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
 No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
 
 
-**Versión proporcionada:** 0.8.4~ynh1
+**Versión proporcionada:** 0.8.5~ynh1
 
 ## Capturas de pantalla
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 9a5afcb..6b29c61 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
 No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
 
 
-**分发版本：** 0.8.4~ynh1
+**分发版本：** 0.8.5~ynh1
 
 ## 截图
 

From 6c8a2858ad5cabfb7b54a35ee81ba63a1c1e7012 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:49:00 +0200
Subject: [PATCH 5/5] Update manifest.toml: explicit dependency to redis-server

---
 manifest.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.toml b/manifest.toml
index 430521a..31b8808 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -97,7 +97,7 @@ ram.runtime = "50M"
     main.default = 5000
 
     [resources.apt]
-    packages = "postgresql, postgresql-contrib, python3, python3-venv, libopenjp2-7"
+    packages = "postgresql, postgresql-contrib, python3, python3-venv, libopenjp2-7, redis-server"
 
     [resources.database]
     type = "postgresql"