From 7a48f5b9b35ff22529190f282bfcf5f56944741a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Sep 2020 15:24:46 +0200 Subject: [PATCH] Upgrade to v.1.14.0 --- README.md | 19 ++++++++----------- README_fr.md | 33 +++++++++++++++------------------ check_process | 4 ++-- conf/app.src | 4 ++-- manifest.json | 8 ++++---- pull_request_template.md | 16 +++++----------- scripts/install | 13 ------------- 7 files changed, 36 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index c2a0c54..a46f51d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Rainloop is a lightweight webmail. -**Shipped version:** 1.12.1 +**Shipped version:** 1.14.0 ## Screenshots @@ -27,15 +27,15 @@ Rainloop is a lightweight webmail. Go to http://DOMAIN.TLD/rainloop/app/?admin -- The default login is : admin -- The default password is : Password chosen during install +- The default login: admin +- The default password: Password chosen during install -- If you lost the admin password, you can retrieve it using ``sudo yunohost app setting rainloop password`` +- If you lost the admin password, you can retrieve it using `sudo yunohost app setting rainloop password` Each user can add a remote carddav server from their own parameters interface. -- If you use baikal, the CardDav address is: https://DOMAIN.TLD/baikal/card.php/addressbooks/USER/default/ -- If you use NextCloud, the CardDav address is: https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts +- If you use baikal, the CardDav address is `https://DOMAIN.TLD/baikal/card.php/addressbooks/USER/default/` +- If you use NextCloud, the CardDav address is `https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts` ## Documentation @@ -48,9 +48,8 @@ Each user can add a remote carddav server from their own parameters interface. #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/rainloop/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/rainloop/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/rainloop/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/rainloop/) ## Limitations @@ -67,10 +66,8 @@ Each user can add a remote carddav server from their own parameters interface. --- -Developers info ----------------- +## Developers info -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/rainloop_ynh/tree/testing). To try the testing branch, please proceed like that. diff --git a/README_fr.md b/README_fr.md index 8289038..00ea253 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,14 +5,14 @@ *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Rainloop rapidement et simplement sur un serveur Yunohost. +> *Ce package vous permet d'installer Rainloop rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble Rainloop est un webmail léger. -**Version incluse:** 1.12.1 +**Version incluse:** 1.14.0 ## Captures d'écran @@ -27,19 +27,19 @@ Rainloop est un webmail léger. Veuillez vous rendre sur http://DOMAIN.TLD/rainloop/app/?admin -- Le nom d'utilisateur admin par défaut est : admin -- Le mot de passe admin par défaut est : Mot de passe choisi lors de l'installation -- Si vous avez oublié votre mot de passe, vous pouvez le retrouver avec ``sudo yunohost app setting rainloop password`` +- Le nom d'utilisateur admin par défaut : admin +- Le mot de passe admin par défaut : Mot de passe choisi lors de l'installation +- Si vous avez oublié votre mot de passe, vous pouvez le retrouver avec `sudo yunohost app setting rainloop password` Chaque utilisateur peut ajouter un carnet d'adresse distant CardDav via leurs propres paramètres. -- Si vous utilisez Baikal, l'adresse à renseigner est du type : https://DOMAIN.TLD/baikal/card.php/addressbooks/UTILISATEUR/default -- Si vous utilisez NextCloud, l'adresse à renseigner est du type : https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts +- Si vous utilisez Baikal, l'adresse à renseigner est du type `https://DOMAIN.TLD/baikal/card.php/addressbooks/UTILISATEUR/default` +- Si vous utilisez NextCloud, l'adresse à renseigner est du type `https://DOMAIN.TLD/nextcloud/remote.php/carddav/addressbooks/USER/contacts` ## Documentation - * Documentation officielle: https://www.rainloop.net/docs/configuration/ - * Documentation YunoHost: https://yunohost.org/#/app_rainloop_fr + * Documentation officielle : https://www.rainloop.net/docs/configuration/ + * Documentation YunoHost : https://yunohost.org/#/app_rainloop_fr ## Caractéristiques spécifiques YunoHost @@ -47,9 +47,8 @@ Chaque utilisateur peut ajouter un carnet d'adresse distant CardDav via leurs pr #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/rainloop/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/rainloop/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/rainloop/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/rainloop%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/rainloop/) ## Limitations @@ -59,17 +58,15 @@ Chaque utilisateur peut ajouter un carnet d'adresse distant CardDav via leurs pr ## Links - * Signaler un bug: https://github.com/YunoHost-Apps/rainloop_ynh/issues - * Site de Rainloop: https://www.rainloop.net/ - * Github de Rainloop: https://github.com/RainLoop/rainloop-webmail - * Site web YunoHost: https://yunohost.org/ + * Signaler un bug : https://github.com/YunoHost-Apps/rainloop_ynh/issues + * Site de Rainloop : https://www.rainloop.net/ + * Github de Rainloop : https://github.com/RainLoop/rainloop-webmail + * Site web YunoHost : https://yunohost.org/ --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs -**Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/rainloop_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. diff --git a/check_process b/check_process index 3473ae1..c9dd208 100644 --- a/check_process +++ b/check_process @@ -2,9 +2,9 @@ ; Manifest domain="domain.tld" (DOMAIN) path="/rainloop" (PATH) - lang="English" + lang="en" is_public=1 (PUBLIC|public=1|private=0) - password="pass" + password="pass" ldap=1 ; Checks diff --git a/conf/app.src b/conf/app.src index d886508..ae685cc 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/RainLoop/rainloop-webmail/releases/download/v1.12.1/rainloop-community-1.12.1.zip -SOURCE_SUM=5d7f99d0e145d22617de8c17e43f34842245d5570662f97f4352487671df811b +SOURCE_URL=https://github.com/RainLoop/rainloop-webmail/releases/download/v1.14.0/rainloop-community-1.14.0.zip +SOURCE_SUM=de5809c27615123d6d422bcc3d4c76868f03d292bbaba82c4392c349aa531829 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 3998dd4..f92a5a9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "Lightweight multi-account webmail", "fr": "Webmail léger multi-comptes" }, - "version": "1.12.1~ynh3", + "version": "1.14.0~ynh1", "url": "https://www.rainloop.net/", "license": "AGPL-3.0-or-later", "maintainer": { "name": "scith, Djip007, polytan02" }, "requirements": { - "yunohost": ">= 3.5.0" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ @@ -76,8 +76,8 @@ "en": "Select default language", "fr": "Definir la langue par defaut" }, - "choices": ["English", "Francais"], - "default": "English" + "choices": ["en", "fr"], + "default": "en" } ] } diff --git a/pull_request_template.md b/pull_request_template.md index 667862d..82767fc 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -2,7 +2,7 @@ - *Description of why you made this PR* ## Solution -- *And how you fix that* +- *And how do you fix that problem* ## PR Status - [ ] Code finished. @@ -11,14 +11,8 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/rainloop_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/rainloop_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/rainloop_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/rainloop_ynh%20PR-NUM-%20(USERNAME)/) diff --git a/scripts/install b/scripts/install index 1845838..25ec305 100644 --- a/scripts/install +++ b/scripts/install @@ -103,19 +103,6 @@ ynh_add_fpm_config #================================================= ynh_script_progression --message= "Configuring rainloop..." --weight=3 -# Set lang => define from install manifest -case "$lang" in - Francais) - lang="fr" - ;; - English) - lang="en" - ;; - *) - lang="en" -esac -ynh_app_setting_set --app=$app --key=lang --value=$lang - # Set plugins # This plugin is trying to automatically grab unknown domains if users want to add external email accounts plugins="ynh-login-mapping,auto-domain-grab"