From d5095335513fbcab8f40ca11fbe0e013bc282c7d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 21 May 2024 14:42:38 +0000 Subject: [PATCH 1/9] Upgrade to v2.30.1 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2f1fc3e..0f8d415 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "DotClear 2" description.en = "Blog publishing application" description.fr = "Moteur de blog" -version = "2.27.3~ynh1" +version = "2.30.1~ynh1" maintainers = ["kay0u"] @@ -56,14 +56,14 @@ ram.runtime = "50M" [resources.sources.latest] prefetch = false in_subdir = 2 - url = "https://download.dotclear.org/latest/dotclear-2.27.3.tar.gz" - sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6" + url = "https://download.dotclear.org/latest/dotclear-2.30.1.tar.gz" + sha256 = "6ee7713d1fbed3050e0b45ba17322f6d2332958887285dbbf69c3de0555d5d50" [resources.sources.attic] prefetch = false in_subdir = 2 - url = "https://download.dotclear.org/attic/dotclear-2.27.3.tar.gz" - sha256 = "86d31cd9f1d8f3147555858c339adb6752db9e8585731eddf697bb1e3fba80c6" + url = "https://download.dotclear.org/attic/dotclear-2.30.1.tar.gz" + sha256 = "6ee7713d1fbed3050e0b45ba17322f6d2332958887285dbbf69c3de0555d5d50" [resources.system_user] From f15d301afeb25bc6da1dd86ef2dd25e0d54c1650 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 21 May 2024 14:42:44 +0000 Subject: [PATCH 2/9] Auto-update READMEs --- ALL_README.md | 8 ++++++++ README.md | 28 +++++++++++++------------- README_es.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++++++--------------- README_gl.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 238 insertions(+), 30 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..152f2e7 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lea el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 6a4cbc8..fe9a793 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,19 +9,19 @@ It shall NOT be edited by hand. [![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install DotClear 2 quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install DotClear 2 quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. -**Shipped version:** 2.27.3~ynh1 +**Shipped version:** 2.30.1~ynh1 -**Demo:** https://www.softaculous.com/demos/Dotclear +**Demo:** ## Screenshots @@ -29,19 +29,19 @@ Dotclear is an open-source web publishing software. Dotclear project's purpose i ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug or sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..16cca1b --- /dev/null +++ b/README_es.md @@ -0,0 +1,50 @@ + + +# DotClear 2 para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + +[![Instalar DotClear 2 con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarDotClear 2 rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. + + +**Versión actual:** 2.30.1~ynh1 + +**Demo:** + +## Capturas + +![Captura de DotClear 2](./doc/screenshots/ss2_dotclear.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +o +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..945ddb2 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,50 @@ + + +# DotClear 2 YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + +[![Instalatu DotClear 2 YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek DotClear 2 YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. + + +**Paketatutako bertsioa:** 2.30.1~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![DotClear 2(r)en pantaila-argazkia](./doc/screenshots/ss2_dotclear.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +edo +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 56807ec..c04c9f1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # DotClear 2 pour YunoHost @@ -9,19 +9,19 @@ It shall NOT be edited by hand. [![Installer DotClear 2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer DotClear 2 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 DotClear 2 rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble Dotclear est un logiciel de publication Web open source. L'objectif du projet Dotclear est de fournir un outil convivial permettant à chacun de publier sur le Web, quelles que soient ses compétences techniques. -**Version incluse :** 2.27.3~ynh1 +**Version incluse :** 2.30.1~ynh1 -**Démo :** https://www.softaculous.com/demos/Dotclear +**Démo :** ## Captures d’écran @@ -29,22 +29,22 @@ Dotclear est un logiciel de publication Web open source. L'objectif du projet Do ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug ou sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..4c3760e --- /dev/null +++ b/README_gl.md @@ -0,0 +1,50 @@ + + +# DotClear 2 para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + +[![Instalar DotClear 2 con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar DotClear 2 de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. + + +**Versión proporcionada:** 2.30.1~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de DotClear 2](./doc/screenshots/ss2_dotclear.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +ou +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..40b7861 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,50 @@ + + +# YunoHost 上的 DotClear 2 + +[![集成程度](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + +[![使用 YunoHost 安装 DotClear 2](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包,您可以在 YunoHost 服务器上快速、简单地安装 DotClear 2。* +> *如果您还没有 YunoHost,请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. + + +**分发版本:** 2.30.1~ynh1 + +**演示:** + +## 截图 + +![DotClear 2 的截图](./doc/screenshots/ss2_dotclear.png) + +## 文档与资源 + +- 官方应用网站: +- 官方管理文档: +- 上游应用代码库: +- YunoHost 商店: +- 报告 bug: + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支,请这样操作: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +或 +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息:** From 5b77cd2f4db679505d1750f4ccad9010b536382f Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 22 May 2024 01:42:50 +0200 Subject: [PATCH 3/9] fix ldap auth --- conf/class.auth.ldap.php | 18 ++++++++++-------- scripts/install | 6 ++++-- scripts/upgrade | 6 ++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/conf/class.auth.ldap.php b/conf/class.auth.ldap.php index d6ab2e2..49ddcc9 100644 --- a/conf/class.auth.ldap.php +++ b/conf/class.auth.ldap.php @@ -1,13 +1,15 @@ userExists($user_id)) + if (App::users()->userExists($user_id)) { - $this->sudo(array(dcCore::app(), 'updUser'), $user_id, $cur); + $this->sudo(array(App::users(), 'updUser'), $user_id, $cur); } # If not, we create him. # In order for him to connect, @@ -69,7 +71,7 @@ class ldapDcAuth extends Auth $cur->user_lang = 'fr'; # Can change this, PR are welcome $cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome $cur->user_default_blog = 'default'; # Can change this, PR are welcome - $this->sudo(array(dcCore::app(),'addUser'), $cur); + $this->sudo(array(App::users(),'addUser'), $cur); # Possible roles: # admin "administrator" # contentadmin "manage all entries and comments" @@ -100,7 +102,7 @@ class ldapDcAuth extends Auth $set_perms[$perm_id] = true; } } - $this->sudo(array(dcCore::app(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true); + $this->sudo(array(App::users(), 'setUserBlogPermissions'), $user_id, 'default', $set_perms, true); } $this->con->commit(); diff --git a/scripts/install b/scripts/install index 19755e4..f04c718 100755 --- a/scripts/install +++ b/scripts/install @@ -95,8 +95,10 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_ cat << EOF >> $php_config -require dirname(__FILE__).'/class.auth.ldap.php'; -define('DC_AUTH_CLASS','ldapDcAuth'); +require_once dirname(__FILE__).'/class.auth.ldap.php'; +define('DC_AUTH_LDAP','ldapDcAuth'); +use Dotclear\Helper\Container\Factories; +Factories::addService("core", AuthInterface::class, DC_AUTH_LDAP); EOF ynh_store_file_checksum --file=$php_config diff --git a/scripts/upgrade b/scripts/upgrade index 74f06d6..dbcf199 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -116,8 +116,10 @@ ynh_add_config --template="../conf/class.auth.ldap.php" --destination="$install_ cat << EOF >> $php_config -require dirname(__FILE__).'/class.auth.ldap.php'; -define('DC_AUTH_CLASS','ldapDcAuth'); +require_once dirname(__FILE__).'/class.auth.ldap.php'; +define('DC_AUTH_LDAP','ldapDcAuth'); +use Dotclear\Helper\Container\Factories; +Factories::addService("core", AuthInterface::class, DC_AUTH_LDAP); EOF # Recalculate and store the checksum of the file for the next upgrade. From 8abbba2f28596b18beba89dd59781aef3381d3e7 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Wed, 29 May 2024 20:13:41 +0200 Subject: [PATCH 4/9] update test PR --- tests.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests.toml b/tests.toml index 15bdcb9..4eb9355 100644 --- a/tests.toml +++ b/tests.toml @@ -6,8 +6,8 @@ test_format = 1.0 args.init_admin_permission="package_checker" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.name = "2.24.1~ynh1" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.domain="domain.tld" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.path="/dotclear2" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.admin="package_checker" - test_upgrade_from.6d4eeccdddff2e4fa5476bcf1b4884d3d1c466eb.args.is_public="true" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.name = "2.27.3~ynh1" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.domain="domain.tld" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.path="/dotclear2" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.admin="package_checker" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.is_public="true" From 7264870c66fba63da7b4311ec7dac9e6e4574e29 Mon Sep 17 00:00:00 2001 From: Kayou Date: Thu, 30 May 2024 09:44:24 +0200 Subject: [PATCH 5/9] add missing arg for the test_upgrade_from --- tests.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests.toml b/tests.toml index 4eb9355..7cfb44b 100644 --- a/tests.toml +++ b/tests.toml @@ -11,3 +11,4 @@ test_format = 1.0 test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.path="/dotclear2" test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.admin="package_checker" test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.is_public="true" + test_upgrade_from.bca9fa0e72faf78e020e0483f76b89c28c7620cf.args.init_admin_permission="package_checker" From 30697f7a776643fc84b394646eff534d48a8a7dc Mon Sep 17 00:00:00 2001 From: Kay0u Date: Sun, 23 Jun 2024 21:44:40 +0200 Subject: [PATCH 6/9] handle the 2.27 -> 2.30 migration --- doc/POST_UPGRADE.d/2.30.0~ynh1.md | 5 +++++ scripts/upgrade | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 doc/POST_UPGRADE.d/2.30.0~ynh1.md diff --git a/doc/POST_UPGRADE.d/2.30.0~ynh1.md b/doc/POST_UPGRADE.d/2.30.0~ynh1.md new file mode 100644 index 0000000..864af3b --- /dev/null +++ b/doc/POST_UPGRADE.d/2.30.0~ynh1.md @@ -0,0 +1,5 @@ +There are a lot of broken plugins after the 2.30 migration. + +In order to migrate your blog, we had to deactivate all plugins by creating a `_disabled` file inside each plugin folder located in `__INSTALL_DIR__/plugins/`. + +Please remove these `_disabled` files one by one and make sure your blog is still working after each deletion. \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index dbcf199..fb57d17 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,6 +58,15 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +if ynh_compare_current_package_version --comparison lt --version 2.30.0; then + ynh_print_warn --message="Disable all plugins before the migration. To reactivate them, navigate to all plugins at $install_dir/plugins/, and remove each \"_disabled\" file one by one, and make sure you blog works as expected after each deletion" + for folder in "$install_dir"/plugins/*/ + do + ynh_print_warn --message="Plugin $folder disabled" + touch "$folder"/_disabled + done +fi + if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." From 5dc8e0e043f237d1a325994ecc7834a8dd7a5d15 Mon Sep 17 00:00:00 2001 From: Kayou Date: Mon, 24 Jun 2024 21:39:34 +0200 Subject: [PATCH 7/9] fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index fb57d17..5240104 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,7 +58,7 @@ fi # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -if ynh_compare_current_package_version --comparison lt --version 2.30.0; then +if ynh_compare_current_package_version --comparison lt --version 2.30.0~ynh1; then ynh_print_warn --message="Disable all plugins before the migration. To reactivate them, navigate to all plugins at $install_dir/plugins/, and remove each \"_disabled\" file one by one, and make sure you blog works as expected after each deletion" for folder in "$install_dir"/plugins/*/ do From 860bf9d9960d7c3a401ac6ef7cb45def75db4a91 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 20 Aug 2024 06:16:31 +0000 Subject: [PATCH 8/9] Upgrade to v2.31.1 --- manifest.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0f8d415..3f52411 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "DotClear 2" description.en = "Blog publishing application" description.fr = "Moteur de blog" -version = "2.30.1~ynh1" +version = "2.31.1~ynh1" maintainers = ["kay0u"] @@ -56,14 +56,14 @@ ram.runtime = "50M" [resources.sources.latest] prefetch = false in_subdir = 2 - url = "https://download.dotclear.org/latest/dotclear-2.30.1.tar.gz" - sha256 = "6ee7713d1fbed3050e0b45ba17322f6d2332958887285dbbf69c3de0555d5d50" + url = "https://download.dotclear.org/latest/dotclear-2.31.1.tar.gz" + sha256 = "b5cdfee93674dc2004c311a3009d65f957dfd3688be1ede238fb797eabccfbd0" [resources.sources.attic] prefetch = false in_subdir = 2 - url = "https://download.dotclear.org/attic/dotclear-2.30.1.tar.gz" - sha256 = "6ee7713d1fbed3050e0b45ba17322f6d2332958887285dbbf69c3de0555d5d50" + url = "https://download.dotclear.org/attic/dotclear-2.31.1.tar.gz" + sha256 = "b5cdfee93674dc2004c311a3009d65f957dfd3688be1ede238fb797eabccfbd0" [resources.system_user] From 0d615971546befffa7189a17705cdb2ada2fe929 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 20 Aug 2024 06:16:39 +0000 Subject: [PATCH 9/9] Auto-update READMEs --- ALL_README.md | 2 ++ README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_id.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_ru.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 4 ++-- 9 files changed, 114 insertions(+), 12 deletions(-) create mode 100644 README_id.md create mode 100644 README_ru.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..e3c80d2 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,6 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) +- [Прочитать README на русский](README_ru.md) - [阅读中文(简体)的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index fe9a793..c7d8547 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # DotClear 2 for YunoHost -[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Working status](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Working status](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Install DotClear 2 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. -**Shipped version:** 2.30.1~ynh1 +**Shipped version:** 2.31.1~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 16cca1b..edccbcc 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # DotClear 2 para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Instalar DotClear 2 con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) @@ -19,7 +19,7 @@ No se debe editar a mano. Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. -**Versión actual:** 2.30.1~ynh1 +**Versión actual:** 2.31.1~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 945ddb2..8075906 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # DotClear 2 YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Instalatu DotClear 2 YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) @@ -19,7 +19,7 @@ EZ editatu eskuz. Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. -**Paketatutako bertsioa:** 2.30.1~ynh1 +**Paketatutako bertsioa:** 2.31.1~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index c04c9f1..a06bc39 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # DotClear 2 pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Installer DotClear 2 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Dotclear est un logiciel de publication Web open source. L'objectif du projet Dotclear est de fournir un outil convivial permettant à chacun de publier sur le Web, quelles que soient ses compétences techniques. -**Version incluse :** 2.30.1~ynh1 +**Version incluse :** 2.31.1~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 4c3760e..788d1bb 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # DotClear 2 para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![Instalar DotClear 2 con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) @@ -19,7 +19,7 @@ NON debe editarse manualmente. Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. -**Versión proporcionada:** 2.30.1~ynh1 +**Versión proporcionada:** 2.31.1~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..8824454 --- /dev/null +++ b/README_id.md @@ -0,0 +1,50 @@ + + +# DotClear 2 untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + +[![Pasang DotClear 2 dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang DotClear 2 secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. + + +**Versi terkirim:** 2.31.1~ynh1 + +**Demo:** + +## Tangkapan Layar + +![Tangkapan Layar pada DotClear 2](./doc/screenshots/ss2_dotclear.png) + +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +atau +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_ru.md b/README_ru.md new file mode 100644 index 0000000..e5a0bd8 --- /dev/null +++ b/README_ru.md @@ -0,0 +1,50 @@ + + +# DotClear 2 для YunoHost + +[![Уровень интеграции](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) + +[![Установите DotClear 2 с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) + +*[Прочтите этот README на других языках.](./ALL_README.md)* + +> *Этот пакет позволяет Вам установить DotClear 2 быстро и просто на YunoHost-сервер.* +> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.* + +## Обзор + +Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. + + +**Поставляемая версия:** 2.31.1~ynh1 + +**Демо-версия:** + +## Снимки экрана + +![Снимок экрана DotClear 2](./doc/screenshots/ss2_dotclear.png) + +## Документация и ресурсы + +- Официальный веб-сайт приложения: +- Официальная документация администратора: +- Репозиторий кода главной ветки приложения: +- Магазин YunoHost: +- Сообщите об ошибке: + +## Информация для разработчиков + +Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing). + +Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +или +sudo yunohost app upgrade dotclear2 -u https://github.com/YunoHost-Apps/dotclear2_ynh/tree/testing --debug +``` + +**Больше информации о пакетировании приложений:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 40b7861..b7eb11b 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 DotClear 2 -[![集成程度](https://dash.yunohost.org/integration/dotclear2.svg)](https://dash.yunohost.org/appci/app/dotclear2) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/dotclear2.svg)](https://ci-apps.yunohost.org/ci/apps/dotclear2/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/dotclear2.maintain.svg) [![使用 YunoHost 安装 DotClear 2](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=dotclear2) @@ -19,7 +19,7 @@ Dotclear is an open-source web publishing software. Dotclear project's purpose is to provide a user-friendly tool allowing anyone to publish on the web, regardless of their technical skills. -**分发版本:** 2.30.1~ynh1 +**分发版本:** 2.31.1~ynh1 **演示:**