diff --git a/README.md b/README.md index 5fc43ff..34e9ed0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Webtrees for YunoHost -[![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![Working status](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) [![Install Webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) *[Lire ce readme en français.](./README_fr.md)* @@ -23,31 +23,32 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Shipped version:** 2.1.4~ynh1 +**Shipped version:** 2.1.5~ynh1 **Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo ## Screenshots -![](./doc/screenshots/1200px-Webtrees.png) +![Screenshot of Webtrees](./doc/screenshots/1200px-Webtrees.png) ## Documentation and resources -* Official app website: https://www.webtrees.net -* Official admin documentation: https://wiki.webtrees.net -* Upstream app code repository: https://github.com/fisharebest/webtrees -* YunoHost documentation for this app: https://yunohost.org/app_webtrees -* Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug or sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 64f6465..e3d1abe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Webtrees pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) [![Installer Webtrees avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Webtrees 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.* @@ -19,31 +23,32 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Version incluse :** 2.1.4~ynh1 +**Version incluse :** 2.1.5~ynh1 **Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo ## Captures d'écran -![](./doc/screenshots/1200px-Webtrees.png) +![Capture d'écran de Webtrees](./doc/screenshots/1200px-Webtrees.png) ## Documentations et ressources -* Site officiel de l'app : https://www.webtrees.net -* Documentation officielle de l'admin : https://wiki.webtrees.net -* Dépôt de code officiel de l'app : https://github.com/fisharebest/webtrees -* Documentation YunoHost pour cette app : https://yunohost.org/app_webtrees -* Signaler un bug : https://github.com/YunoHost-Apps/webtrees_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug ou sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/app.src b/conf/app.src index bb1a6eb..a209e71 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.1.4/webtrees-2.1.4.zip -SOURCE_SUM=4669dae1a6cbabba4e23c7514b3d5d4b5a59d42188728859bce2c45f1cc555a1 +SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.1.5/webtrees-2.1.5.zip +SOURCE_SUM=61b672bf91eefb34866773346ffef4b822aa66464095f0207739324af4c34374 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 6a09480..7e8d92f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web-based genealogy application", "fr": "Logiciel libre de généalogie en ligne" }, - "version": "2.1.4~ynh1", + "version": "2.1.5~ynh1", "url": "https://www.webtrees.net", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index 821507e..8ecb9d2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="7.4" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml mailutils" +pkg_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml mailutils" #================================================= # PERSONAL HELPERS