From 3fee6a17acf66aceeea3d56d7559577523a1866e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 3 Sep 2021 13:15:47 +0200 Subject: [PATCH 1/6] Fix --- doc/DESCRIPTION.md | 1 + manifest.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 doc/DESCRIPTION.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..36baea1 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1cc637d..8ffe354 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "packaging_format": 1, "description": { "en": "Fast, light, user-friendly forum software", - "fr": "Forum de discussions rapide et léger." + "fr": "Forum de discussions rapide et léger" }, "version": "1.5.11~ynh2", "url": "https://fluxbb.org/", From a0f0f9ce8de54c81609aac4b1c9057c639be5f55 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 3 Sep 2021 11:15:54 +0000 Subject: [PATCH 2/6] 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 d688ef3..130a2ff 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Fast, light, user-friendly forum software +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. **Shipped version:** 1.5.11~ynh2 diff --git a/README_fr.md b/README_fr.md index d866254..3ebf383 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Forum de discussions rapide et léger. +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. **Version incluse :** 1.5.11~ynh2 From 5880f2f67e0add9990729852fae7a96216a2cf12 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 4 Sep 2021 22:15:43 +0200 Subject: [PATCH 3/6] No choice in language... removing --- Find Results | 30 ++++++++++++++++++++++++++++++ check_process | 3 +-- doc/DESCRIPTION.md | 2 +- doc/DISCLAIMER.md | 3 +++ manifest.json | 10 ---------- scripts/install | 2 -- scripts/upgrade | 1 - 7 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 Find Results diff --git a/Find Results b/Find Results new file mode 100644 index 0000000..79be306 --- /dev/null +++ b/Find Results @@ -0,0 +1,30 @@ +Searching 22 files for "language" (regex, case sensitive) + +/Users/macmini/Documents/Github/fluxbb_ynh/check_process: + 4 path="/path" + 5 admin="john" + 6: language="en" + 7 is_public=1 + 8 password="password_fluxbb" + . + 26 ; commit=6a8fea2965da32112d10a659637e3b1cd0b2c61c + 27 name=1.5.11 + 28: manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=en&is_public=1&password=password_fluxbb&port=666& + 29 + +/Users/macmini/Documents/Github/fluxbb_ynh/LICENSE: + 106 A "Standard Interface" means an interface that either is an official + 107 standard defined by a recognized standards body, or, in the case of + 108: interfaces specified for a particular programming language, one that + 109: is widely used among developers working in that language. + 110 + 111 The "System Libraries" of an executable work include anything, other + +/Users/macmini/Documents/Github/fluxbb_ynh/scripts/upgrade: + 21 admin=$(ynh_app_setting_get --app=$app --key=admin) + 22 final_path=$(ynh_app_setting_get --app=$app --key=final_path) + 23: language=$(ynh_app_setting_get --app=$app --key=language) + 24 db_name=$(ynh_app_setting_get --app=$app --key=db_name) + 25 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + +6 matches across 3 files diff --git a/check_process b/check_process index e4f025c..0e4d873 100644 --- a/check_process +++ b/check_process @@ -3,7 +3,6 @@ domain="domain.tld" path="/path" admin="john" - language="en" is_public=1 password="password_fluxbb" port="666" @@ -25,4 +24,4 @@ Notification=none ;;; Upgrade options ; commit=6a8fea2965da32112d10a659637e3b1cd0b2c61c name=1.5.11 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=en&is_public=1&password=password_fluxbb&port=666& + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&password=password_fluxbb&port=666& diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 36baea1..25bd100 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. \ No newline at end of file +FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..b008ddd 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1,3 @@ +### Limitations with YunoHost + +HTTP and LDAP authentication are not supported. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8ffe354..4378920 100644 --- a/manifest.json +++ b/manifest.json @@ -57,16 +57,6 @@ }, "default": true }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["en"], - "default": "en" - }, { "name": "password", "type": "password" diff --git a/scripts/install b/scripts/install index 78a3a8f..99d67fb 100755 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE password=$YNH_APP_ARG_PASSWORD app=$YNH_APP_INSTANCE_NAME @@ -51,7 +50,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # CREATE A MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 3cf6acb..4d8372f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) From 8c06e221cf00acd3c4e4337a513d9290a48e42ff Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 4 Sep 2021 20:15:55 +0000 Subject: [PATCH 4/6] Auto-update README --- README.md | 6 ++++++ README_fr.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/README.md b/README.md index 130a2ff..3681829 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. + **Shipped version:** 1.5.11~ynh2 **Demo:** https://fluxbb.org/forums/index.php @@ -25,6 +26,11 @@ FluxBB is designed as a lighter, faster alternative to some of the traditional f ![](./doc/screenshots/fluxbb_screenshot.png) +## Disclaimers / important information + +### Limitations with YunoHost + +HTTP and LDAP authentication are not supported. ## Documentation and resources * Official app website: https://fluxbb.org/ diff --git a/README_fr.md b/README_fr.md index 3ebf383..0fa014b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,6 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. + **Version incluse :** 1.5.11~ynh2 **Démo :** https://fluxbb.org/forums/index.php @@ -21,6 +22,11 @@ FluxBB is designed as a lighter, faster alternative to some of the traditional f ![](./doc/screenshots/fluxbb_screenshot.png) +## Avertissements / informations importantes + +### Limitations with YunoHost + +HTTP and LDAP authentication are not supported. ## Documentations et ressources * Site officiel de l'app : https://fluxbb.org/ From 0f98fa52595e8a09e57c5bbbb2d5f4f8d7283afc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 17 Sep 2021 10:23:56 +0200 Subject: [PATCH 5/6] Fix --- .github/workflows/updater.yml | 48 ----------------------------------- Find Results | 30 ---------------------- manifest.json | 2 +- 3 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 .github/workflows/updater.yml delete mode 100644 Find Results diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index ca77fed..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,48 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - draft: false diff --git a/Find Results b/Find Results deleted file mode 100644 index 79be306..0000000 --- a/Find Results +++ /dev/null @@ -1,30 +0,0 @@ -Searching 22 files for "language" (regex, case sensitive) - -/Users/macmini/Documents/Github/fluxbb_ynh/check_process: - 4 path="/path" - 5 admin="john" - 6: language="en" - 7 is_public=1 - 8 password="password_fluxbb" - . - 26 ; commit=6a8fea2965da32112d10a659637e3b1cd0b2c61c - 27 name=1.5.11 - 28: manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=en&is_public=1&password=password_fluxbb&port=666& - 29 - -/Users/macmini/Documents/Github/fluxbb_ynh/LICENSE: - 106 A "Standard Interface" means an interface that either is an official - 107 standard defined by a recognized standards body, or, in the case of - 108: interfaces specified for a particular programming language, one that - 109: is widely used among developers working in that language. - 110 - 111 The "System Libraries" of an executable work include anything, other - -/Users/macmini/Documents/Github/fluxbb_ynh/scripts/upgrade: - 21 admin=$(ynh_app_setting_get --app=$app --key=admin) - 22 final_path=$(ynh_app_setting_get --app=$app --key=final_path) - 23: language=$(ynh_app_setting_get --app=$app --key=language) - 24 db_name=$(ynh_app_setting_get --app=$app --key=db_name) - 25 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -6 matches across 3 files diff --git a/manifest.json b/manifest.json index 4378920..a73bd5c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Fast, light, user-friendly forum software", "fr": "Forum de discussions rapide et léger" }, - "version": "1.5.11~ynh2", + "version": "1.5.11~ynh3", "url": "https://fluxbb.org/", "upstream": { "license": "GPL-2.0-only", From badc9ac44e225b2cf3f6c3a2f52cfc7376226611 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 17 Sep 2021 08:24:03 +0000 Subject: [PATCH 6/6] 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 3681829..da82b5d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Shipped version:** 1.5.11~ynh2 +**Shipped version:** 1.5.11~ynh3 **Demo:** https://fluxbb.org/forums/index.php diff --git a/README_fr.md b/README_fr.md index 0fa014b..b8f0f9b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour FluxBB is designed as a lighter, faster alternative to some of the traditional feature heavy forum applications. It is easy to use and has a proven track record of stability and security making it an ideal choice of forum for your website. -**Version incluse :** 1.5.11~ynh2 +**Version incluse :** 1.5.11~ynh3 **Démo :** https://fluxbb.org/forums/index.php