Merge pull request #50 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

README.md

@@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy
 - automatic sending of cycles by email
 - no data sales/no advertising
 
-**Shipped version:** 13~ynh1
+**Shipped version:** 13~ynh5
 
 **Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>
 

README_es.md

@@ -0,0 +1,65 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Moncycle para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg)
+
+[![Instalar Moncycle con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=moncycle)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarMoncycle rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Make it easy to monitor menstrual cycles and apply natural methods. Billings. Symptothermy. FertilityCare
+
+### Features:
+
+- a menstrual cycle tracking chart
+- dedicated to natural methods
+- monitoring the evolution of cervical mucus
+- body temperature tracking (optional)
+- FertilityCare rating (optional)
+- simple on phone as on PC
+- aesthetic visual with dark mode
+- open source code
+- no pseudo predictive intelligence
+- PDF/CSV export for your instructors
+- finished Excel or Google Sheets
+- the same account on several devices
+- automatic sending of cycles by email
+- no data sales/no advertising
+
+**Versión actual:** 13~ynh5
+
+**Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>
+
+## Capturas
+
+![Captura de Moncycle](./doc/screenshots/moncycle_app.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://moncycle.app>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/jean-io/moncycle.app>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/moncycle>
+- Reportar un error: <https://github.com/YunoHost-Apps/moncycle_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade moncycle -u https://github.com/YunoHost-Apps/moncycle_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy
 - automatic sending of cycles by email
 - no data sales/no advertising
 
-**Paketatutako bertsioa:** 13~ynh1
+**Paketatutako bertsioa:** 13~ynh5
 
 **Demoa:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>
 

README_fr.md

@@ -36,7 +36,7 @@ Rendre facile le suivi des cycles menstruels et l’application des méthodes na
 - pas de vente de données/pas de publicité
 
 
-**Version incluse :** 13~ynh1
+**Version incluse :** 13~ynh5
 
 **Démo :** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>
 

README_gl.md

@@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy
 - automatic sending of cycles by email
 - no data sales/no advertising
 
-**Versión proporcionada:** 13~ynh1
+**Versión proporcionada:** 13~ynh5
 
 **Demo:** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>
 

README_zh_Hans.md

@@ -3,7 +3,7 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Moncycle
+# YunoHost 上的 Moncycle
 
 [![集成程度](https://dash.yunohost.org/integration/moncycle.svg)](https://dash.yunohost.org/appci/app/moncycle) ![工作状态](https://ci-apps.yunohost.org/ci/badges/moncycle.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/moncycle.maintain.svg)
 
@@ -35,7 +35,7 @@ Make it easy to monitor menstrual cycles and apply natural methods. Billings. Sy
 - automatic sending of cycles by email
 - no data sales/no advertising
 
-**分发版本：** 13~ynh1
+**分发版本：** 13~ynh5
 
 **演示：** <https://tableau.moncycle.app/connexion.php?email1=demo.bill@moncycle.app&mdp=demo>
 

conf/moncycleapp.cron

@@ -1 +1 @@
-0 1 * * * __APP__ /usr/bin/php__PHPVERSION__ --define apc.enable_cli=1 -f __INSTALL_DIR__/script/cron.php
+0 1 * * * __APP__ cd __INSTALL_DIR__/script && /usr/bin/php__PHPVERSION__ --define apc.enable_cli=1 -f __INSTALL_DIR__/script/cron.php

conf/version.json

@@ -1,6 +1,6 @@
 {
     "app": "moncycle.app",
-    "version": "13~ynh1",
+    "version": "13~ynh5",
-    "build": "2024-04-23",
+    "build": "2024-05-20",
-    "commit": "5415446"
+    "commit": "3317aa3"
 }

manifest.toml

@@ -5,7 +5,7 @@ name = "Moncycle"
 description.en = "Menstrual cycle follow-up for natural family planning"
 description.fr = "Suivi de cycle pour les méthodes naturelles de régulation de naissance"
 
-version = "13~ynh1"
+version = "13~ynh5"
 
 maintainers = ["Raoul de Limezy"]
 
@@ -34,8 +34,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/jean-io/moncycle.app/archive/refs/tags/v13.tar.gz"
+        url = "https://github.com/jean-io/moncycle.app/archive/3317aa3307c7faa25fd90e5e23ccadb167a7c822.zip"
-        sha256 = "db7ae0dcb3c307d6881ae1d1af67670ac4951d67fa788ce7cc0cb2bf4f08eb3f"
+        sha256 = "af999e814ee813cde886ffef2778d9f0ebe7b94bbaabf4184f5577812fdb78db"
         autoupdate.strategy = "latest_github_release"
 
     [resources.system_user]

sources/patches/main-01-mail.patch

@@ -1,12 +1,9 @@
 diff --git a/www_data/lib/mail.php b/www_data/lib/mail.php
-index 9b58b50..0112cc5 100644
+index fc2246e..2e060e3 100644
 --- a/www_data/lib/mail.php
 +++ b/www_data/lib/mail.php
-@@ -12,16 +12,14 @@ use PHPMailer\PHPMailer\PHPMailer;
+@@ -15,10 +15,10 @@ function mail_init(){
  
- function mail_init(){
- 	$mail = new PHPMailer();
--
  	$mail->isSMTP();
  	$mail->Host       = SMTP_HOST;
 -	$mail->SMTPAuth   = true;
@@ -17,7 +14,4 @@ index 9b58b50..0112cc5 100644
 +	$mail->SMTPSecure = false;
  	$mail->Port       = SMTP_PORT;
  	$mail->CharSet    = 'UTF-8';
--
+ 
- 	$mail->setFrom(SMTP_MAIL, 'moncycle.app');
- 	return $mail;
- }