From b0aad47403ec0e21a763564f08940a6b0d35c923 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 2 May 2022 23:40:20 +0200 Subject: [PATCH 1/7] `core` repo has been renamed into `framework` --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 0691bfb..1296311 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "website": "https://flarum.org", "demo": "https://discuss.flarum.org/d/21101-demos-come-to-flarum", "admindoc": "https://docs.flarum.org", - "code": "https://github.com/flarum/flarum" + "code": "https://github.com/flarum/framework" }, "license": "MIT", "maintainer": { From 84454cceddd6f5edfd65045becff4cc3c04b9756 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 May 2022 21:40:51 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 526eac4..24bca26 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Reload PHP-FPM with `sudo service php*php_version*-fpm reload`. * Official app website: https://flarum.org * Official admin documentation: https://docs.flarum.org -* Upstream app code repository: https://github.com/flarum/flarum +* Upstream app code repository: https://github.com/flarum/framework * YunoHost documentation for this app: https://yunohost.org/app_flarum * Report a bug: https://github.com/YunoHost-Apps/flarum_ynh/issues diff --git a/README_fr.md b/README_fr.md index 03cea40..e580a78 100644 --- a/README_fr.md +++ b/README_fr.md @@ -74,7 +74,7 @@ Rechargez PHP-FPM avec `sudo service php*php_version*-fpm reload`. * Site officiel de l'app : https://flarum.org * Documentation officielle de l'admin : https://docs.flarum.org -* Dépôt de code officiel de l'app : https://github.com/flarum/flarum +* Dépôt de code officiel de l'app : https://github.com/flarum/framework * Documentation YunoHost pour cette app : https://yunohost.org/app_flarum * Signaler un bug : https://github.com/YunoHost-Apps/flarum_ynh/issues From c4f751b24b932820859886e24670670e01a4ae1c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 May 2022 21:42:22 +0000 Subject: [PATCH 3/7] Upgrade to v1.2.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1296311..8e5b8ac 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Forum de nouvelle génération, simplement", "de": "Forum der nächsten Generation leicht gemacht" }, - "version": "1.2.0~ynh1", + "version": "1.2.1~ynh1", "url": "http://flarum.org/", "upstream": { "license": "MIT", From 2f0db325cf9b196bb9781b9e4079b8f113872861 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 2 May 2022 21:42:26 +0000 Subject: [PATCH 4/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 24bca26..e42c635 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. -**Shipped version:** 1.2.0~ynh1 +**Shipped version:** 1.2.1~ynh1 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum diff --git a/README_fr.md b/README_fr.md index e580a78..4cdf092 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. -**Version incluse :** 1.2.0~ynh1 +**Version incluse :** 1.2.1~ynh1 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum From bc9f4532cfc2264cb69fd4136f56dbf2cdb34d01 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 May 2022 06:28:20 +0000 Subject: [PATCH 5/7] Upgrade to v1.3.0 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2259223..346707a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/flarum/flarum/archive/v1.2.0.zip -SOURCE_SUM=e3261ebb9fde29742c58ba05b2bc5af6f65b03ae4a9b638cf97f72c60a124935 +SOURCE_URL=https://github.com/flarum/flarum/archive/v1.3.0.zip +SOURCE_SUM=78955c2f34f32593738b6e1908b282bb92fe50c4e3d33b5492f46fc19309084e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 8e5b8ac..cae83a3 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Forum de nouvelle génération, simplement", "de": "Forum der nächsten Generation leicht gemacht" }, - "version": "1.2.1~ynh1", + "version": "1.3.0~ynh1", "url": "http://flarum.org/", "upstream": { "license": "MIT", diff --git a/scripts/_common.sh b/scripts/_common.sh index 19e1c01..36f2c88 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -13,7 +13,7 @@ YNH_COMPOSER_VERSION="2.0.13" extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip" # Version numbers -project_version="1.2.0" +project_version="1.3.0" #core_version is now retrieved from the manifest ldap_version="*" From ef5f328acb1c0af0e943f36403f32f97424da77c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 17 May 2022 06:28:24 +0000 Subject: [PATCH 6/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e42c635..94adece 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. -**Shipped version:** 1.2.1~ynh1 +**Shipped version:** 1.3.0~ynh1 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum diff --git a/README_fr.md b/README_fr.md index 4cdf092..b282ff5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. -**Version incluse :** 1.2.1~ynh1 +**Version incluse :** 1.3.0~ynh1 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum From 8d05924c5e7142eb9cef8cce1dff0fd9465d32ff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 May 2022 18:49:55 +0000 Subject: [PATCH 7/7] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 94adece..2751e9c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Flarum for YunoHost -[![Integration level](https://dash.yunohost.org/integration/flarum.svg)](https://dash.yunohost.org/appci/app/flarum) ![](https://ci-apps.yunohost.org/ci/badges/flarum.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/flarum.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/flarum.svg)](https://dash.yunohost.org/appci/app/flarum) ![Working status](https://ci-apps.yunohost.org/ci/badges/flarum.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/flarum.maintain.svg) [![Install Flarum with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=flarum) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +23,7 @@ Flarum is a simple discussion platform for your website. It's fast and easy to u ## Screenshots -![](./doc/screenshots/beta16.jpg) +![Screenshot of Flarum](./doc/screenshots/beta16.jpg) ## Disclaimers / important information @@ -75,21 +75,22 @@ Reload PHP-FPM with `sudo service php*php_version*-fpm reload`. ## Documentation and resources -* Official app website: https://flarum.org -* Official admin documentation: https://docs.flarum.org -* Upstream app code repository: https://github.com/flarum/framework -* YunoHost documentation for this app: https://yunohost.org/app_flarum -* Report a bug: https://github.com/YunoHost-Apps/flarum_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/flarum_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/flarum_ynh/tree/testing --debug or sudo yunohost app upgrade flarum -u https://github.com/YunoHost-Apps/flarum_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 b282ff5..1a71672 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Flarum pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/flarum.svg)](https://dash.yunohost.org/appci/app/flarum) ![](https://ci-apps.yunohost.org/ci/badges/flarum.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/flarum.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/flarum.svg)](https://dash.yunohost.org/appci/app/flarum) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/flarum.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/flarum.maintain.svg) [![Installer Flarum avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=flarum) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Flarum 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,7 +23,7 @@ Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapid ## Captures d'écran -![](./doc/screenshots/beta16.jpg) +![Capture d'écran de Flarum](./doc/screenshots/beta16.jpg) ## Avertissements / informations importantes @@ -72,21 +76,22 @@ Rechargez PHP-FPM avec `sudo service php*php_version*-fpm reload`. ## Documentations et ressources -* Site officiel de l'app : https://flarum.org -* Documentation officielle de l'admin : https://docs.flarum.org -* Dépôt de code officiel de l'app : https://github.com/flarum/framework -* Documentation YunoHost pour cette app : https://yunohost.org/app_flarum -* Signaler un bug : https://github.com/YunoHost-Apps/flarum_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/flarum_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/flarum_ynh/tree/testing --debug ou sudo yunohost app upgrade flarum -u https://github.com/YunoHost-Apps/flarum_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 :**