From a29e1139b73462baa2ff24720978d43d28dc63f1 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 15:49:30 +0100 Subject: [PATCH 1/8] add pull_request_template.md --- pull_request_template.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..2cef46f --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,22 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how do you fix that problem* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/APP_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. From 72a8768447a5c8edb59623cee90d5082a3d8c84a Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 15:52:30 +0100 Subject: [PATCH 2/8] fix link in README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 160ca1e..0809694 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ 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://framagit.org/toitoinebzh/pluxml_ynh/tree/testing). +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/pluxml_ynh/tree/testing). To try the testing branch, please proceed like that. ``` diff --git a/README_fr.md b/README_fr.md index e790b66..ccfa034 100644 --- a/README_fr.md +++ b/README_fr.md @@ -73,7 +73,7 @@ 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://framagit.org/toitoinebzh/pluxml_ynh/tree/testing ). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pluxml_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` From 8da3f53ee2d25f13326e9c38af8eac156f076657 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 15:55:49 +0100 Subject: [PATCH 3/8] fix add_header warning with package_check --- conf/nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1584f75..24e2e0f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -49,19 +49,19 @@ location __PATH__/ { # Cache-control location ~ ^__PATH__/data/ { - add_header Cache-Control public; + more_set_headers Cache-Control public; expires 12h; } location ~ ^__PATH__/core/ { - add_header Cache-Control public; + more_set_headers Cache-Control public; expires 12h; } location ~ ^__PATH__/plugins/ { - add_header Cache-Control public; + more_set_headers Cache-Control public; expires 12h; } location ~ ^__PATH__/themes/ { - add_header Cache-Control public; + more_set_headers Cache-Control public; expires 12h; } From 5065b344dc82f49e82478ebf8352632ab1913030 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 16:01:36 +0100 Subject: [PATCH 4/8] fix error with package_check about help message for public section --- manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.json b/manifest.json index 598cbb1..2751881 100644 --- a/manifest.json +++ b/manifest.json @@ -68,6 +68,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If checked, the app will be public", + "fr": "Si cochée, votre application sera publique" + }, "default": true }, { From fbb70b5777284d6c73911cae9de7ff75ad1834fb Mon Sep 17 00:00:00 2001 From: antoine Date: Fri, 20 Dec 2019 10:59:18 +0100 Subject: [PATCH 5/8] add oc langage and remove po langage --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2751881..8465544 100644 --- a/manifest.json +++ b/manifest.json @@ -81,7 +81,7 @@ "en": "Default language", "fr": "Langue par défaut" }, - "choices": ["de","en","es","fr","it","nl","pl","pt","po","ro","ru"], + "choices": ["de","en","es","fr","it","nl","oc","pl","pt","ro","ru"], "default": "en" } ] From bf6409d084802e40dbfdb3d9f08644ad3f96901f Mon Sep 17 00:00:00 2001 From: toitoinebzh <44553182+toitoinebzh@users.noreply.github.com> Date: Thu, 26 Dec 2019 10:33:51 +0100 Subject: [PATCH 6/8] update PR template * remove ping @ apps-group * correct link for build status --- pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 2cef46f..b6fa7f7 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -15,8 +15,8 @@ --- - [ ] **Code review** : - [ ] **Approval (LGTM)** : -*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* + - **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/) +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/pluxml_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/pluxml_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. From 4233840a197a25364007903b695b08b7de9aef26 Mon Sep 17 00:00:00 2001 From: toitoinebzh <44553182+toitoinebzh@users.noreply.github.com> Date: Fri, 27 Dec 2019 13:03:50 +0100 Subject: [PATCH 7/8] Update pull_request_template.md Co-Authored-By: Kayou --- pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pull_request_template.md b/pull_request_template.md index b6fa7f7..8da111f 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -17,6 +17,6 @@ - [ ] **Approval (LGTM)** : - **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/pluxml_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/pluxml_ynh%20PR-NUM-/) +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/pluxml_ynh%20PR-NUM-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/pluxml_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. From a359f1c7289cbf3ba8ac5176f859ce0c77ac57cc Mon Sep 17 00:00:00 2001 From: toitoinebzh <44553182+toitoinebzh@users.noreply.github.com> Date: Fri, 27 Dec 2019 13:08:20 +0100 Subject: [PATCH 8/8] fix link in PR template --- pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 8da111f..de66c1a 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -17,6 +17,6 @@ - [ ] **Approval (LGTM)** : - **CI succeeded** : -[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/pluxml_ynh%20PR-NUM-/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/pluxml_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/pluxml_ynh%20PR34%20(-USER-)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/pluxml_ynh%20PR34%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.