From bf7a3cb7b85fd6c47d2e134b66087a36f1484ad7 Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 11 May 2024 21:32:48 +0700 Subject: [PATCH 1/7] Tests --- conf/version.json | 6 +++--- manifest.toml | 6 +++--- sources/patches/main-01-mail.patch | 32 ++++++++++++------------------ 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/conf/version.json b/conf/version.json index dd88c1e..17accaf 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh1", - "build": "2024-04-23", - "commit": "5415446" + "version": "13~ynh2", + "build": "2024-05-11", + "commit": "dfadfec" } diff --git a/manifest.toml b/manifest.toml index 0c59e04..867d162 100644 --- a/manifest.toml +++ b/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~ynh2" 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" - sha256 = "db7ae0dcb3c307d6881ae1d1af67670ac4951d67fa788ce7cc0cb2bf4f08eb3f" + url = "https://github.com/jean-io/moncycle.app/archive/dfadfec65ec696257857cedd937a93c62c76e463.zip" + sha256 = "f2fc644459c76484bfbcf5c748138e577e24334651c29f0e817d50abb5de4861" autoupdate.strategy = "latest_github_release" [resources.system_user] diff --git a/sources/patches/main-01-mail.patch b/sources/patches/main-01-mail.patch index 0e2a784..5308771 100644 --- a/sources/patches/main-01-mail.patch +++ b/sources/patches/main-01-mail.patch @@ -1,23 +1,17 @@ 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; -+ $mail->SMTPAuth = false; - $mail->Username = SMTP_MAIL; - $mail->Password = SMTP_PASSWORD; -- $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; -+ $mail->SMTPSecure = false; - $mail->Port = SMTP_PORT; - $mail->CharSet = 'UTF-8'; -- - $mail->setFrom(SMTP_MAIL, 'moncycle.app'); - return $mail; - } \ No newline at end of file + $mail->isSMTP(); + $mail->Host = SMTP_HOST; +- $mail->SMTPAuth = true; ++ $mail->SMTPAuth = false; + $mail->Username = SMTP_MAIL; + $mail->Password = SMTP_PASSWORD; +- $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; ++ $mail->SMTPSecure = false; + $mail->Port = SMTP_PORT; + $mail->CharSet = 'UTF-8'; + \ No newline at end of file From cf1b6e690e26edb5411bce87f126649db6d128a4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 11 May 2024 17:18:42 +0000 Subject: [PATCH 2/7] Auto-update READMEs --- ALL_README.md | 1 + README.md | 2 +- README_es.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 4 +-- 7 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..8938aae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Lee 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) diff --git a/README.md b/README.md index 1f4245e..bf451c0 100644 --- a/README.md +++ b/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~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..eb9f554 --- /dev/null +++ b/README_es.md @@ -0,0 +1,65 @@ + + +# 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~ynh2 + +**Demo:** + +## Capturas + +![Captura de Moncycle](./doc/screenshots/moncycle_app.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## 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:** diff --git a/README_eu.md b/README_eu.md index c91abb4..5494d6e 100644 --- a/README_eu.md +++ b/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~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 9904dc4..9a105cc 100644 --- a/README_fr.md +++ b/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~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index be132ba..b7f067d 100644 --- a/README_gl.md +++ b/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~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3e05dc0..3164bc8 100644 --- a/README_zh_Hans.md +++ b/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~ynh2 **演示:** From 16ea59d9d885373497dba975d6dcf68f4be452eb Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 14 May 2024 08:04:48 +0700 Subject: [PATCH 3/7] Update --- conf/version.json | 6 +++--- manifest.toml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/version.json b/conf/version.json index 17accaf..9a91339 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh2", - "build": "2024-05-11", - "commit": "dfadfec" + "version": "13~ynh3", + "build": "2024-05-14", + "commit": "d665882" } diff --git a/manifest.toml b/manifest.toml index 867d162..e5792aa 100644 --- a/manifest.toml +++ b/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~ynh2" +version = "13~ynh3" maintainers = ["Raoul de Limezy"] @@ -34,8 +34,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/jean-io/moncycle.app/archive/dfadfec65ec696257857cedd937a93c62c76e463.zip" - sha256 = "f2fc644459c76484bfbcf5c748138e577e24334651c29f0e817d50abb5de4861" + url = "https://github.com/jean-io/moncycle.app/archive/d665882cb0a4d0b7a1ecf7b6f9d845ed24508993.zip" + sha256 = "cd8148af28d51e02b64345369c30dff8c260fbc6bc37634277398fd7cc22f53d" autoupdate.strategy = "latest_github_release" [resources.system_user] From 2be3bbb1a1e85038a02fe1efa2e96d6f821f70a2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 20 May 2024 18:35:02 +0700 Subject: [PATCH 4/7] Fix emails Update main-01-mail.patch Update main-01-mail.patch Update main-01-mail.patch Update main-01-mail.patch Update main-01-mail.patch Update main-01-mail.patch Update main-01-mail.patch Fix mail 2 --- conf/version.json | 4 ++-- manifest.toml | 2 +- sources/patches/main-01-mail.patch | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) mode change 100644 => 100755 sources/patches/main-01-mail.patch diff --git a/conf/version.json b/conf/version.json index 9a91339..4ad83b9 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh3", - "build": "2024-05-14", + "version": "13~ynh4", + "build": "2024-05-20", "commit": "d665882" } diff --git a/manifest.toml b/manifest.toml index e5792aa..0e54bac 100644 --- a/manifest.toml +++ b/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~ynh3" +version = "13~ynh4" maintainers = ["Raoul de Limezy"] diff --git a/sources/patches/main-01-mail.patch b/sources/patches/main-01-mail.patch old mode 100644 new mode 100755 index 5308771..0ae2892 --- a/sources/patches/main-01-mail.patch +++ b/sources/patches/main-01-mail.patch @@ -4,14 +4,14 @@ index fc2246e..2e060e3 100644 +++ b/www_data/lib/mail.php @@ -15,10 +15,10 @@ function mail_init(){ - $mail->isSMTP(); - $mail->Host = SMTP_HOST; -- $mail->SMTPAuth = true; -+ $mail->SMTPAuth = false; - $mail->Username = SMTP_MAIL; - $mail->Password = SMTP_PASSWORD; -- $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; -+ $mail->SMTPSecure = false; - $mail->Port = SMTP_PORT; - $mail->CharSet = 'UTF-8'; - \ No newline at end of file + $mail->isSMTP(); + $mail->Host = SMTP_HOST; +- $mail->SMTPAuth = true; ++ $mail->SMTPAuth = false; + $mail->Username = SMTP_MAIL; + $mail->Password = SMTP_PASSWORD; +- $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS; ++ $mail->SMTPSecure = false; + $mail->Port = SMTP_PORT; + $mail->CharSet = 'UTF-8'; + From 793f9eb2e47a588e390b5ae768cf502ea9e6579b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 May 2024 16:04:25 +0000 Subject: [PATCH 5/7] 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 bf451c0..da198ea 100644 --- a/README.md +++ b/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~ynh2 +**Shipped version:** 13~ynh4 **Demo:** diff --git a/README_es.md b/README_es.md index eb9f554..ddb2b16 100644 --- a/README_es.md +++ b/README_es.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 actual:** 13~ynh2 +**Versión actual:** 13~ynh4 **Demo:** diff --git a/README_eu.md b/README_eu.md index 5494d6e..10a6118 100644 --- a/README_eu.md +++ b/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~ynh2 +**Paketatutako bertsioa:** 13~ynh4 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 9a105cc..39c440c 100644 --- a/README_fr.md +++ b/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~ynh2 +**Version incluse :** 13~ynh4 **Démo :** diff --git a/README_gl.md b/README_gl.md index b7f067d..677c480 100644 --- a/README_gl.md +++ b/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~ynh2 +**Versión proporcionada:** 13~ynh4 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3164bc8..3704363 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.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 -**分发版本:** 13~ynh2 +**分发版本:** 13~ynh4 **演示:** From 704cdc56c555d6cd9dc967571242ee4cf08eba57 Mon Sep 17 00:00:00 2001 From: Limezy Date: Mon, 20 May 2024 23:28:55 +0700 Subject: [PATCH 6/7] Update + cron fix --- conf/moncycleapp.cron | 2 +- conf/version.json | 4 ++-- manifest.toml | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/moncycleapp.cron b/conf/moncycleapp.cron index 576bdad..bbbcaa9 100644 --- a/conf/moncycleapp.cron +++ b/conf/moncycleapp.cron @@ -1 +1 @@ -0 1 * * * __APP__ /usr/bin/php__PHPVERSION__ --define apc.enable_cli=1 -f __INSTALL_DIR__/script/cron.php \ No newline at end of file +0 1 * * * __APP__ cd __INSTALL_DIR__/script && /usr/bin/php__PHPVERSION__ --define apc.enable_cli=1 -f __INSTALL_DIR__/script/cron.php \ No newline at end of file diff --git a/conf/version.json b/conf/version.json index 4ad83b9..f06fbb8 100644 --- a/conf/version.json +++ b/conf/version.json @@ -1,6 +1,6 @@ { "app": "moncycle.app", - "version": "13~ynh4", + "version": "13~ynh5", "build": "2024-05-20", - "commit": "d665882" + "commit": "3317aa3" } diff --git a/manifest.toml b/manifest.toml index 0e54bac..0cfbf56 100644 --- a/manifest.toml +++ b/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~ynh4" +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/d665882cb0a4d0b7a1ecf7b6f9d845ed24508993.zip" - sha256 = "cd8148af28d51e02b64345369c30dff8c260fbc6bc37634277398fd7cc22f53d" + url = "https://github.com/jean-io/moncycle.app/archive/3317aa3307c7faa25fd90e5e23ccadb167a7c822.zip" + sha256 = "af999e814ee813cde886ffef2778d9f0ebe7b94bbaabf4184f5577812fdb78db" autoupdate.strategy = "latest_github_release" [resources.system_user] From 0f5c4587266bf53d199894f1f677ce4a0c89561e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 4 Jun 2024 20:47:21 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- ALL_README.md | 2 +- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.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) diff --git a/README.md b/README.md index da198ea..69a773a 100644 --- a/README.md +++ b/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~ynh4 +**Shipped version:** 13~ynh5 **Demo:** diff --git a/README_es.md b/README_es.md index ddb2b16..e210afa 100644 --- a/README_es.md +++ b/README_es.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 actual:** 13~ynh4 +**Versión actual:** 13~ynh5 **Demo:** diff --git a/README_eu.md b/README_eu.md index 10a6118..f98b824 100644 --- a/README_eu.md +++ b/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~ynh4 +**Paketatutako bertsioa:** 13~ynh5 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 39c440c..f83f17d 100644 --- a/README_fr.md +++ b/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~ynh4 +**Version incluse :** 13~ynh5 **Démo :** diff --git a/README_gl.md b/README_gl.md index 677c480..3d59ca4 100644 --- a/README_gl.md +++ b/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~ynh4 +**Versión proporcionada:** 13~ynh5 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3704363..a9b7ecd 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.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 -**分发版本:** 13~ynh4 +**分发版本:** 13~ynh5 **演示:**