diff --git a/README.md b/README.md index 42b4c23..8a4ac86 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Galette is a membership management web application towards non profit organizations. -**Shipped version:** 0.9.5.2~ynh3 +**Shipped version:** 0.9.6.1~ynh1 + **Demo:** https://demo.galette.eu/login diff --git a/README_fr.md b/README_fr.md index fd4970a..fad35e5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Outil de gestion d'adhérents et de cotisation en ligne pour associations -**Version incluse :** 0.9.5.2~ynh3 +**Version incluse :** 0.9.6.1~ynh1 + **Démo :** https://demo.galette.eu/login diff --git a/check_process b/check_process index c5402df..d4f9b69 100644 --- a/check_process +++ b/check_process @@ -15,9 +15,9 @@ setup_public=1 upgrade=1 # 0.9.5~ynh1 - upgrade=1 from_commit=d05248ceeffca8401dea6ac14bf7af7096345cbe + # upgrade=1 from_commit=d05248ceeffca8401dea6ac14bf7af7096345cbe # 0.9.5.2~ynh1 - upgrade=1 from_commit=3c3d7d56540e12245f45dc7c3b9334285ac475ca + # upgrade=1 from_commit=3c3d7d56540e12245f45dc7c3b9334285ac475ca backup_restore=1 multi_instance=1 port_already_use=0 diff --git a/conf/app.src b/conf/app.src index f3976ff..15aca24 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.tuxfamily.org/galette/galette-0.9.5.2.tar.bz2 -SOURCE_SUM=274511844032e9bf3eeb00ef70b676dea7e74e2922141f17b63d90796ead6e83 +SOURCE_URL=https://download.tuxfamily.org/galette/galette-0.9.6.1.tar.bz2 +SOURCE_SUM=7f3d09af19711372cc35d48352e115ee96e835ea879298347289d274308bb011 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 9f2fc2d..cb3a8f6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,15 @@ "en": "Membership management web application for non profit organizations", "fr": "Outil de gestion d'adhérents et de cotisation en ligne pour associations" }, - "version": "0.9.5.2~ynh3", + "version": "0.9.6.1~ynh1", "url": "https://www.galette.eu", "upstream": { "license": "GPL-3.0-or-later", "website": "https://www.galette.eu", "demo": "https://demo.galette.eu/login", "admindoc": "https://doc.galette.eu/fr/master/", - "code": "https://github.com/galette/galette" + "code": "https://github.com/galette/galette", + "cpe": "cpe:2.3:a:galette:galette" }, "license": "GPL-3.0-or-later", "maintainer": { @@ -26,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm" + "php7.4-fpm" ], "arguments": { "install": [ @@ -63,9 +64,12 @@ "ask": { "en": "Choose SQL databe you want" }, - "choices": ["pgsql", "mysql"], + "choices": [ + "pgsql", + "mysql" + ], "default": "pgsql" } ] } -} +} \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index 7e4130d..ecc0e7e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" pkg_dependencies="php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql"