Merge pull request #34 from YunoHost-Apps/testing

Few enhancement

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.
 ```

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.
 ```

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;
   }
 

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
             },
             {
@@ -77,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"
 	    }
         ]

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)** :  
+
+- **CI succeeded** : 
+[![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.