Merge pull request #10 from YunoHost-Apps/testing

Testing

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # 2FAuth for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![Working status](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg)  
 [![Install 2FAuth with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=2fauth)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -27,13 +27,13 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo
 - Edit accounts, even the imported ones
 - Generate TOTP and HOTP security codes
 
-**Shipped version:** 3.1.0~ynh1
+**Shipped version:** 3.1.1~ynh1
 
 **Demo:** https://demo.2fauth.app/login
 
 ## Screenshots
 
-![](./doc/screenshots/screenshot.png)
+![Screenshot of 2FAuth](./doc/screenshots/screenshot.png)
 
 ## Disclaimers / important information
 
@@ -43,20 +43,21 @@ You have to create a user account to use the app and you cannot create more than
 Authentication documentation: https://docs.2fauth.app/security/authentication/
 ## Documentation and resources
 
-* Official admin documentation: https://docs.2fauth.app/
+* Official admin documentation: <https://docs.2fauth.app/>
-* Upstream app code repository: https://github.com/Bubka/2FAuth
+* Upstream app code repository: <https://github.com/Bubka/2FAuth>
-* YunoHost documentation for this app: https://yunohost.org/app_2fauth
+* YunoHost documentation for this app: <https://yunohost.org/app_2fauth>
-* Report a bug: https://github.com/YunoHost-Apps/2fauth_ynh/issues
+* Report a bug: <https://github.com/YunoHost-Apps/2fauth_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade 2fauth -u https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -1,10 +1,14 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # 2FAuth pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/2fauth.svg)](https://dash.yunohost.org/appci/app/2fauth) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/2fauth.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/2fauth.maintain.svg)  
 [![Installer 2FAuth avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=2fauth)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer 2FAuth 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.*
@@ -23,13 +27,13 @@ It aims to ease you perform your 2FA authentication steps whatever the device yo
 - Edit accounts, even the imported ones
 - Generate TOTP and HOTP security codes
 
-**Version incluse :** 3.1.0~ynh1
+**Version incluse :** 3.1.1~ynh1
 
 **Démo :** https://demo.2fauth.app/login
 
 ## Captures d'écran
 
-![](./doc/screenshots/screenshot.png)
+![Capture d'écran de 2FAuth](./doc/screenshots/screenshot.png)
 
 ## Avertissements / informations importantes
 
@@ -39,20 +43,21 @@ You have to create a user account to use the app and you cannot create more than
 Authentication documentation: https://docs.2fauth.app/security/authentication/
 ## Documentations et ressources
 
-* Documentation officielle de l'admin : https://docs.2fauth.app/
+* Documentation officielle de l'admin : <https://docs.2fauth.app/>
-* Dépôt de code officiel de l'app : https://github.com/Bubka/2FAuth
+* Dépôt de code officiel de l'app : <https://github.com/Bubka/2FAuth>
-* Documentation YunoHost pour cette app : https://yunohost.org/app_2fauth
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_2fauth>
-* Signaler un bug : https://github.com/YunoHost-Apps/2fauth_ynh/issues
+* Signaler un bug : <https://github.com/YunoHost-Apps/2fauth_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade 2fauth -u https://github.com/YunoHost-Apps/2fauth_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Bubka/2FAuth/archive/refs/tags/v3.1.0.tar.gz
+SOURCE_URL=https://github.com/Bubka/2FAuth/archive/refs/tags/v3.1.1.tar.gz
-SOURCE_SUM=98dbabc102b046f41e63c2a4afcbd506f9a19bbfe7ef993a0710ffa990d84d7e
+SOURCE_SUM=8dc50cfd719d690bdb409583633087f35f980a04b7047dca7a52f113121bd857
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -1,7 +1,7 @@
 location / {
 
   # Path to source
-  alias __FINALPATH__/public/;
+  root __FINALPATH__/public/;
 
   index index.php;
 
@@ -14,7 +14,7 @@ location / {
 
   error_page 404 /index.php;
 
-  try_files $uri $uri/ /index.php;
+  try_files $uri $uri/ /index.php?$query_string;
 
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;

manifest.json

@@ -6,7 +6,7 @@
         "en": "self-hosted alternative to One Time Passcode",
         "fr": "Alternative auto-hébergée a One Time Passcode"
     },
-    "version": "3.1.0~ynh1",
+    "version": "3.1.1~ynh1",
     "url": "https://github.com/Bubka/2FAuth",
     "upstream": {
         "license": "AGPL-3.0",