From bb421454c968fb36b31adeed69a352299b6da344 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 26 Sep 2022 10:45:12 +0200 Subject: [PATCH 1/9] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2e68986..50efd41 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,7 +112,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path"--keep="web/config/settings.php" + ynh_setup_source --dest_dir="$final_path" --keep="web/config/settings.php" fi chmod 750 "$final_path" From d28510e9687312a085f6662f682918a480759cfc Mon Sep 17 00:00:00 2001 From: tituspijean Date: Mon, 26 Sep 2022 10:45:53 +0200 Subject: [PATCH 2/9] Bump package version --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index abe3701..3f122cd 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CalDAV web client", "fr": "Client web pour CalDAV" }, - "version": "2.5.0~ynh1", + "version": "2.5.0~ynh2", "url": "http://agendav.org", "upstream": { "license": "GPL-3.0", From f1afd1e695f6a086a4082dd38fa472adbbd1c98f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 26 Sep 2022 08:45:56 +0000 Subject: [PATCH 3/9] 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 463591d..95995af 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 [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. -**Shipped version:** 2.5.0~ynh1 +**Shipped version:** 2.5.0~ynh2 **Demo:** https://demo.yunohost.org/agendav/ diff --git a/README_fr.md b/README_fr.md index 60a62bf..ee77dd0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. -**Version incluse :** 2.5.0~ynh1 +**Version incluse :** 2.5.0~ynh2 **Démo :** https://demo.yunohost.org/agendav/ From 7c4279379ab49319e9185348d34c50482e3e7b91 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 08:59:01 +0100 Subject: [PATCH 4/9] Upgrade to version 2.6.0 (#67) * Upgrade to v2.6.0 * Auto-update README Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot --- README.md | 3 +-- README_fr.md | 3 +-- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 95995af..e9c20bd 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. -**Shipped version:** 2.5.0~ynh2 - +**Shipped version:** 2.6.0~ynh1 **Demo:** https://demo.yunohost.org/agendav/ ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index ee77dd0..3e5128f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,8 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. -**Version incluse :** 2.5.0~ynh2 - +**Version incluse :** 2.6.0~ynh1 **Démo :** https://demo.yunohost.org/agendav/ ## Documentations et ressources diff --git a/conf/app.src b/conf/app.src index 40ec512..d88a091 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/agendav/agendav/releases/download/2.5.0/agendav-2.5.0.tar.gz -SOURCE_SUM=b0c4c12fdc4272de3e0296403eeea0e5b22af1e83ab6becf7a1eb0eea9e9f48e +SOURCE_URL=https://github.com/agendav/agendav/releases/download/2.6.0/agendav-2.6.0.tar.gz +SOURCE_SUM=af72c07886e30d2443ce9587992f59c78fad5ab4a069e311286e1e7216db895e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3f122cd..a2d1f8b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CalDAV web client", "fr": "Client web pour CalDAV" }, - "version": "2.5.0~ynh2", + "version": "2.6.0~ynh1", "url": "http://agendav.org", "upstream": { "license": "GPL-3.0", From d4df756ba86085226d98d153ee6892f10279890c Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Thu, 23 Feb 2023 23:18:45 +0100 Subject: [PATCH 5/9] Upgrade auto-updater (#69) * Auto-update README * [autopatch] Upgrade auto-updater * Auto-update README --------- Co-authored-by: tituspijean --- .github/workflows/updater.yml | 4 ++-- README.md | 3 ++- README_fr.md | 17 +++++++++-------- 3 files changed, 13 insertions(+), 11 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 e9c20bd..75a42db 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # AgenDAV for YunoHost -[![Integration level](https://dash.yunohost.org/integration/agendav.svg)](https://dash.yunohost.org/appci/app/agendav) ![Working status](https://ci-apps.yunohost.org/ci/badges/agendav.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/agendav.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/agendav.svg)](https://dash.yunohost.org/appci/app/agendav) ![Working status](https://ci-apps.yunohost.org/ci/badges/agendav.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/agendav.maintain.svg) + [![Install AgenDAV with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=agendav) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 3e5128f..18f781a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # AgenDAV pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/agendav.svg)](https://dash.yunohost.org/appci/app/agendav) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/agendav.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/agendav.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/agendav.svg)](https://dash.yunohost.org/appci/app/agendav) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/agendav.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/agendav.maintain.svg) + [![Installer AgenDAV avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=agendav) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer AgenDAV 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 AgenDAV 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 [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. @@ -23,9 +24,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour **Démo :** https://demo.yunohost.org/agendav/ ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* 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 : @@ -41,4 +42,4 @@ ou sudo yunohost app upgrade agendav -u https://github.com/YunoHost-Apps/agendav_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 From 978f22883c84c24d68832c70331fa32512993287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 21:07:33 +0200 Subject: [PATCH 6/9] Update _common.sh --- scripts/_common.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 92977e3..1387a6a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,10 +4,12 @@ # COMMON VARIABLES #================================================= -php_dependencies="php$YNH_DEFAULT_PHP_VERSION-ctype php$YNH_DEFAULT_PHP_VERSION-curl php$YNH_DEFAULT_PHP_VERSION-mbstring php$YNH_DEFAULT_PHP_VERSION-mcrypt php$YNH_DEFAULT_PHP_VERSION-tokenizer php$YNH_DEFAULT_PHP_VERSION-xml php$YNH_DEFAULT_PHP_VERSION-xmlreader php$YNH_DEFAULT_PHP_VERSION-xmlwriter php$YNH_DEFAULT_PHP_VERSION-mysql" +YNH_PHP_VERSION="8.1" + +php_dependencies="php$YNH_PHP_VERSION-ctype php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-mbstring php$YNH_PHP_VERSION-mcrypt php$YNH_PHP_VERSION-tokenizer php$YNH_PHP_VERSION-xml php$YNH_PHP_VERSION-xmlreader php$YNH_PHP_VERSION-xmlwriter php$YNH_PHP_VERSION-mysql" # dependencies used by the app (must be on a single line) -pkg_dependencies="$php_dependencies" +pkg_dependencies="$php_dependencies mariadb-server" #================================================= # PERSONAL HELPERS From 750f9de5a52cea14c559190a89466cb6b88d7063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 21:26:35 +0200 Subject: [PATCH 7/9] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1387a6a..9c93881 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.1" +YNH_PHP_VERSION="7.4" php_dependencies="php$YNH_PHP_VERSION-ctype php$YNH_PHP_VERSION-curl php$YNH_PHP_VERSION-mbstring php$YNH_PHP_VERSION-mcrypt php$YNH_PHP_VERSION-tokenizer php$YNH_PHP_VERSION-xml php$YNH_PHP_VERSION-xmlreader php$YNH_PHP_VERSION-xmlwriter php$YNH_PHP_VERSION-mysql" From d0e9dbd7b0dcb1565a6a4a709c09f08e65471c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 9 Jul 2023 22:38:39 +0200 Subject: [PATCH 8/9] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a2d1f8b..a8d13a2 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "CalDAV web client", "fr": "Client web pour CalDAV" }, - "version": "2.6.0~ynh1", + "version": "2.6.0~ynh2", "url": "http://agendav.org", "upstream": { "license": "GPL-3.0", From cee63fc61b1c5688d2defcf9585c99a4ea6f11cd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Jul 2023 20:38:44 +0000 Subject: [PATCH 9/9] 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 75a42db..55ec4d3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. -**Shipped version:** 2.6.0~ynh1 +**Shipped version:** 2.6.0~ynh2 **Demo:** https://demo.yunohost.org/agendav/ ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 18f781a..87cb65a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po [AgenDAV](http://agendav.org/) is a CalDAV web client which features an AJAX interface to allow users to manage their own calendars and shared ones. -**Version incluse :** 2.6.0~ynh1 +**Version incluse :** 2.6.0~ynh2 **Démo :** https://demo.yunohost.org/agendav/ ## Documentations et ressources