From 3e81e3944b237528af4cae6839ebc91ced39cc23 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Dec 2022 19:53:21 +0100 Subject: [PATCH 1/5] Upgrade to version 2.8.13 (#138) * Upgrade to v2.8.13 * Auto-update README * Update check_process Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot Co-authored-by: ericgaspar --- README.md | 3 +-- README_fr.md | 3 +-- check_process | 10 ++++------ conf/app.src | 4 ++-- manifest.json | 4 ++-- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 9af83f5..cabadff 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Discourse is modern forum software for your community. Use it as a mailing list, discussion forum, long-form chat room, and more! -**Shipped version:** 2.8.8~ynh1 - +**Shipped version:** 2.8.13~ynh1 **Demo:** https://try.discourse.org diff --git a/README_fr.md b/README_fr.md index 22110c5..acacbf8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,8 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Discourse est un logiciel de forum moderne pour votre communauté. Utilisez-le comme liste de diffusion, forum de discussion, salle de discussion longue durée, et plus encore ! -**Version incluse :** 2.8.8~ynh1 - +**Version incluse :** 2.8.13~ynh1 **Démo :** https://try.discourse.org diff --git a/check_process b/check_process index 88b9e72..98cb36b 100644 --- a/check_process +++ b/check_process @@ -12,10 +12,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 2.6.1~ynh2 - upgrade=1 from_commit=c626379c98bb7f052061446cd152e4406979d49d - # 2.7.13~ynh5 - upgrade=1 from_commit=c1a386fa83c9278ba7bd58875b51e03606f84f13 + # 2.8.8~ynh1 + upgrade=1 from_commit=ec974723113fa8f984af8ab47d1cc99765ae6c2f backup_restore=1 # Activate multi-instance test only if you have more than 2Gb RAM! multi_instance=0 @@ -25,6 +23,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=c626379c98bb7f052061446cd152e4406979d49d - name=2.6.1~ynh2 + ; commit=ec974723113fa8f984af8ab47d1cc99765ae6c2f + name=2.8.8~ynh1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1 diff --git a/conf/app.src b/conf/app.src index a71f742..a9721c4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.8.tar.gz -SOURCE_SUM=9a264da3f973c6129325883e29843f0c4100db6a941bcc05f1070bcd70b321f7 +SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.13.tar.gz +SOURCE_SUM=21813abb7add3bb5244e7a3166ecd91cadb5a39a7a8b02202d7e5ef8b97582eb SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 1f5f4a3..8ca6caf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Discussion platform", "fr": "Plateforme de discussion" }, - "version": "2.8.8~ynh1", + "version": "2.8.13~ynh1", "url": "http://Discourse.org", "upstream": { "license": "GPL-2.0", @@ -51,4 +51,4 @@ } ] } -} \ No newline at end of file +} From 2ab285986ac4c5b8f2d3a8a8db26c59a5a9d0255 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:14:47 +0100 Subject: [PATCH 2/5] Upgrade to version 2.8.14 (#140) * Upgrade to v2.8.14 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cabadff..ee75448 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 Discourse is modern forum software for your community. Use it as a mailing list, discussion forum, long-form chat room, and more! -**Shipped version:** 2.8.13~ynh1 +**Shipped version:** 2.8.14~ynh1 **Demo:** https://try.discourse.org diff --git a/README_fr.md b/README_fr.md index acacbf8..7512d91 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Discourse est un logiciel de forum moderne pour votre communauté. Utilisez-le comme liste de diffusion, forum de discussion, salle de discussion longue durée, et plus encore ! -**Version incluse :** 2.8.13~ynh1 +**Version incluse :** 2.8.14~ynh1 **Démo :** https://try.discourse.org diff --git a/conf/app.src b/conf/app.src index a9721c4..c499f0f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.13.tar.gz -SOURCE_SUM=21813abb7add3bb5244e7a3166ecd91cadb5a39a7a8b02202d7e5ef8b97582eb +SOURCE_URL=https://github.com/discourse/discourse/archive/v2.8.14.tar.gz +SOURCE_SUM=b4b9a2857515ab79b2bc71cc0bdd09f9bf749d506c095b76d86846c9adf62623 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 8ca6caf..fa71c31 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Discussion platform", "fr": "Plateforme de discussion" }, - "version": "2.8.13~ynh1", + "version": "2.8.14~ynh1", "url": "http://Discourse.org", "upstream": { "license": "GPL-2.0", From 1952e7ad6ec32fcb1ce4e7f2cf5f2f3b8a53ae33 Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Thu, 5 Jan 2023 19:16:15 +0100 Subject: [PATCH 3/5] Typo (#141) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to version 2.8.13 (#138) (#139) * Upgrade to v2.8.13 * Auto-update README * Update check_process Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot Co-authored-by: ericgaspar Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot * Typo Co-authored-by: JimboJoe Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee75448..eb6c51c 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you use the administration UI in YunoHost to setup a mail forwarding address For example, your user has email address `foo@myyunohostdomain.org` and all mail is forwarded to `foo@theirexternalmail.com`. Discourse receives replies from `foo@theirexternalmail.com` but cannot understand how to deliver this to the user account with `foo@myyunohostdomain.org` configured. -Their is on-going work to allow for [multiple email addresses for one user](https://meta.discourse.org/t/additional-email-address-per-user-account-support/59847) in Discourse development but at current major version (2.3 as of 2019-08-06), there is no web interface for this functionality. It is possible to set it up via the command-line interface but it is **experimental** and you should not undertake this work unless you take some time to understand what it is you are going to do. +There is on-going work to allow for [multiple email addresses for one user](https://meta.discourse.org/t/additional-email-address-per-user-account-support/59847) in Discourse development but at current major version (2.3 as of 2019-08-06), there is no web interface for this functionality. It is possible to set it up via the command-line interface but it is **experimental** and you should not undertake this work unless you take some time to understand what it is you are going to do. Here's how to setup a secondary mail address for a user account: From 1d09e3f70d5ac944e37586ade42c7713ddd2cecd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 5 Jan 2023 18:16:23 +0000 Subject: [PATCH 4/5] Auto-update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb6c51c..ee75448 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you use the administration UI in YunoHost to setup a mail forwarding address For example, your user has email address `foo@myyunohostdomain.org` and all mail is forwarded to `foo@theirexternalmail.com`. Discourse receives replies from `foo@theirexternalmail.com` but cannot understand how to deliver this to the user account with `foo@myyunohostdomain.org` configured. -There is on-going work to allow for [multiple email addresses for one user](https://meta.discourse.org/t/additional-email-address-per-user-account-support/59847) in Discourse development but at current major version (2.3 as of 2019-08-06), there is no web interface for this functionality. It is possible to set it up via the command-line interface but it is **experimental** and you should not undertake this work unless you take some time to understand what it is you are going to do. +Their is on-going work to allow for [multiple email addresses for one user](https://meta.discourse.org/t/additional-email-address-per-user-account-support/59847) in Discourse development but at current major version (2.3 as of 2019-08-06), there is no web interface for this functionality. It is possible to set it up via the command-line interface but it is **experimental** and you should not undertake this work unless you take some time to understand what it is you are going to do. Here's how to setup a secondary mail address for a user account: From cc52378ad4f7c3f3a7ae2e2ff9b3d3905748b933 Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Thu, 4 May 2023 20:29:17 +0200 Subject: [PATCH 5/5] Upgrade auto-updater (#145) * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean --- .github/workflows/updater.yml | 4 ++-- README.md | 3 ++- README_fr.md | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index fb72ba0..a56d7cb 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Fetch the source code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Run the updater script @@ -33,7 +33,7 @@ jobs: - name: Create Pull Request id: cpr if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} diff --git a/README.md b/README.md index ee75448..f1a5d99 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Discourse for YunoHost -[![Integration level](https://dash.yunohost.org/integration/discourse.svg)](https://dash.yunohost.org/appci/app/discourse) ![Working status](https://ci-apps.yunohost.org/ci/badges/discourse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/discourse.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/discourse.svg)](https://dash.yunohost.org/appci/app/discourse) ![Working status](https://ci-apps.yunohost.org/ci/badges/discourse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/discourse.maintain.svg) + [![Install Discourse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=discourse) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 7512d91..74bad4c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Discourse pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/discourse.svg)](https://dash.yunohost.org/appci/app/discourse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/discourse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/discourse.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/discourse.svg)](https://dash.yunohost.org/appci/app/discourse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/discourse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/discourse.maintain.svg) + [![Installer Discourse avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=discourse) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Discourse 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.* +> *Ce package vous permet d’installer Discourse 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.* -## Vue d'ensemble +## Vue d’ensemble Discourse est un logiciel de forum moderne pour votre communauté. Utilisez-le comme liste de diffusion, forum de discussion, salle de discussion longue durée, et plus encore ! @@ -21,9 +22,9 @@ Discourse est un logiciel de forum moderne pour votre communauté. Utilisez-le c **Démo :** https://try.discourse.org -## Captures d'écran +## Captures d’écran -![Capture d'écran de Discourse](./doc/screenshots/screenshot.png) +![Capture d’écran de Discourse](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -194,8 +195,8 @@ systemctl restart discourse ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -211,4 +212,4 @@ ou sudo yunohost app upgrade discourse -u https://github.com/YunoHost-Apps/discourse_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file