From 40adc9d7d282c6c0fc6c89fc454ae9740de99070 Mon Sep 17 00:00:00 2001 From: antoine Date: Fri, 6 Nov 2020 16:34:09 +0100 Subject: [PATCH] update readme ans PR template --- README.md | 13 ++++++------- README_fr.md | 15 +++++++-------- pull_request_template.md | 11 ++++------- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 142e0f5..92856d3 100644 --- a/README.md +++ b/README.md @@ -47,9 +47,8 @@ Can the app be used by multiple users? yes #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/fluxbb/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/) ## Limitations @@ -57,9 +56,9 @@ Can the app be used by multiple users? yes ## Additional information -* Other information you would add about this application +* Other info you would like to add about this app. -**More information on the documentation page:** +**More info on the documentation page:** https://yunohost.org/packaging_apps ## Links @@ -70,11 +69,11 @@ https://yunohost.org/packaging_apps --- -Developers info +Developer 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/fluxbb_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/fluxbb_ynh/tree/testing). To try the testing branch, please proceed like that. ``` diff --git a/README_fr.md b/README_fr.md index db47928..df7a05d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer FluxBB 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.* +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble @@ -40,16 +40,15 @@ Comment configurer cette application: via le panneau d'administration. ## Caractéristiques spécifiques YunoHost -#### Support multi-utilisateurs +#### Support multi-utilisateur L'authentification LDAP et HTTP est-elle prise en charge? non L'application peut-elle être utilisée par plusieurs utilisateurs? oui -#### Supported architectures +#### Architectures supportées -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/fluxbb%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/fluxbb/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/fluxbb/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/fluxbb%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/fluxbb/) ## Limitations @@ -59,10 +58,10 @@ L'application peut-elle être utilisée par plusieurs utilisateurs? oui * Change-url : une fois l'url modifiée, allez dans le panneau de configuration pour modifier le champ `Base URL` -**Plus d'informations sur la page de documentation:** +**Plus d'informations sur la page de documentation :** https://yunohost.org/packaging_apps -## Links +## Liens * Signaler un bug: https://github.com/YunoHost-Apps/fluxbb_ynh/issues * Site de l'application: https://fluxbb.org/ diff --git a/pull_request_template.md b/pull_request_template.md index 4f61da2..1d15a15 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,11 +11,8 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(-USER-)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(-USER-)/) -*Please replace '-NUM-' in this link by the PR number and -USER- by your user name on [Jenkins](https://ci-apps-dev.yunohost.org/jenkins/)* -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/fluxbb_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/fluxbb_ynh%20PR-NUM-%20(USERNAME)/)