From 0cd5aed87b1dbb918e6f92647713db0e7f90b3ab Mon Sep 17 00:00:00 2001 From: Lab-8916100448256 <38373466+Lab-8916100448256@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:03:06 +0200 Subject: [PATCH 1/7] fix assets path --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4d7e371..df09d2c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,7 @@ location __PATH__/ { # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 50M; - location __PATH__/assets/ { + location __PATH__/libreto/assets/ { alias __INSTALL_DIR__/libreto/libreto/assets/; } From 33a57bed58d76e3be017d6b339f82063cd165820 Mon Sep 17 00:00:00 2001 From: Lab-8916100448256 <38373466+Lab-8916100448256@users.noreply.github.com> Date: Tue, 2 Jul 2024 17:09:09 +0200 Subject: [PATCH 2/7] fix __COMMENTED_PROVIDER__ --- conf/config.dist.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/config.dist.php b/conf/config.dist.php index 2101880..4993320 100644 --- a/conf/config.dist.php +++ b/conf/config.dist.php @@ -43,15 +43,15 @@ $providers = array( 'html' => true, ), ); -// CUSTOM_PROVIDER$providers += array( -// CUSTOM_PROVIDER '__PROVIDER__' => array( -// CUSTOM_PROVIDER 'name' => "__PROVIDER__", -// CUSTOM_PROVIDER 'url' => "__ETHERPAD_INSTANCE__", -// CUSTOM_PROVIDER 'default_text' => "Get involved with Etherpad at http://etherpad.org", -// CUSTOM_PROVIDER 'markdown' => true, -// CUSTOM_PROVIDER 'html' => true, -// CUSTOM_PROVIDER ), -// CUSTOM_PROVIDER); +__COMMENTED_PROVIDER__$providers += array( +__COMMENTED_PROVIDER__ '__PROVIDER__' => array( +__COMMENTED_PROVIDER__ 'name' => "__PROVIDER__", +__COMMENTED_PROVIDER__ 'url' => "__ETHERPAD_INSTANCE__", +__COMMENTED_PROVIDER__ 'default_text' => "Get involved with Etherpad at http://etherpad.org", +__COMMENTED_PROVIDER__ 'markdown' => true, +__COMMENTED_PROVIDER__ 'html' => true, +__COMMENTED_PROVIDER__ ), +__COMMENTED_PROVIDER__); $options = array( 'name' => "Libreto", From 2c5f9b30f3e066d0f2ba206d58473f68ac911ef6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Jul 2024 22:30:00 +0000 Subject: [PATCH 3/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8fae09d..dff429c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Libreto for YunoHost -[![Integration level](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![Working status](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/libreto.svg)](https://ci-apps.yunohost.org/ci/apps/libreto/) ![Working status](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) [![Install Libreto with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreto) diff --git a/README_es.md b/README_es.md index adbc35b..d7a0945 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Libreto para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/libreto.svg)](https://ci-apps.yunohost.org/ci/apps/libreto/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) [![Instalar Libreto con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreto) diff --git a/README_eu.md b/README_eu.md index 48542ca..5c18d04 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Libreto YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/libreto.svg)](https://ci-apps.yunohost.org/ci/apps/libreto/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) [![Instalatu Libreto YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreto) diff --git a/README_fr.md b/README_fr.md index 79b81e7..52ed22d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Libreto pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/libreto.svg)](https://ci-apps.yunohost.org/ci/apps/libreto/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) [![Installer Libreto avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreto) diff --git a/README_gl.md b/README_gl.md index fa3e9fa..6647700 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Libreto para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/libreto.svg)](https://ci-apps.yunohost.org/ci/apps/libreto/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) [![Instalar Libreto con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreto) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 2e03bc8..0fa7ae1 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Libreto -[![集成程度](https://dash.yunohost.org/integration/libreto.svg)](https://dash.yunohost.org/appci/app/libreto) ![工作状态](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/libreto.svg)](https://ci-apps.yunohost.org/ci/apps/libreto/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/libreto.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/libreto.maintain.svg) [![使用 YunoHost 安装 Libreto](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=libreto) From fb532e561030d9ac7dcd265f82146d04a90a71d0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Jul 2024 03:39:29 +0200 Subject: [PATCH 4/7] Upgrade to v2024.07.05 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ca12e01..2b86bf5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Libreto" description.en = "Aggregate your pads to create a wiki" description.fr = "Agrégez vos pads pour créer un wiki" -version = "2019.08.07~ynh1" +version = "2024.07.05~ynh1" maintainers = ["ljf"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] # This is not used as we are using git clone + submodules. It's only here for autoupdate. - url = "https://github.com/Ventricule/libreto/archive/da3f312fec0a829cc3df1191113e93b49fb4786e.tar.gz" - sha256 = "de713b5656e7ae32bd52d69c64cd7d87ac3307533aa451f828c36fb957b0e8ad" + url = "https://github.com/Ventricule/libreto/archive/eb05d3785f8977ae2745ad8de0240fc07128e574.tar.gz" + sha256 = "79b55fc1d9d29f56d95fe35e8b83b8654833e425dc0d9a23669c8bf6400a15eb" prefetch = false autoupdate.strategy = "latest_github_commit" From 872081eb41a718f1f12142849d8c4f7a3f876374 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 6 Jul 2024 01:39:31 +0000 Subject: [PATCH 5/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dff429c..3603d6f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Shipped version:** 2019.08.07~ynh1 +**Shipped version:** 2024.07.05~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index d7a0945..82230f7 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Versión actual:** 2019.08.07~ynh1 +**Versión actual:** 2024.07.05~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 5c18d04..e7cb2f5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Paketatutako bertsioa:** 2019.08.07~ynh1 +**Paketatutako bertsioa:** 2024.07.05~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 52ed22d..4612392 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Libreto est un carnet de note collaboratif fondé sur etherpad. Il peut devenir un mini-site, le carnet de bord d'un workshop ou le support de rédaction d'un livre collectif. -**Version incluse :** 2019.08.07~ynh1 +**Version incluse :** 2024.07.05~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 6647700..681a36a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Versión proporcionada:** 2019.08.07~ynh1 +**Versión proporcionada:** 2024.07.05~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 0fa7ae1..84321c1 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**分发版本：** 2019.08.07~ynh1 +**分发版本：** 2024.07.05~ynh1 **演示：** From 5baa655f323f144a6996ab4df7c216ddc8c2ee3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Jul 2024 07:50:18 +0200 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index ca12e01..2b86bf5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Libreto" description.en = "Aggregate your pads to create a wiki" description.fr = "Agrégez vos pads pour créer un wiki" -version = "2019.08.07~ynh1" +version = "2024.07.05~ynh1" maintainers = ["ljf"] @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] # This is not used as we are using git clone + submodules. It's only here for autoupdate. - url = "https://github.com/Ventricule/libreto/archive/da3f312fec0a829cc3df1191113e93b49fb4786e.tar.gz" - sha256 = "de713b5656e7ae32bd52d69c64cd7d87ac3307533aa451f828c36fb957b0e8ad" + url = "https://github.com/Ventricule/libreto/archive/eb05d3785f8977ae2745ad8de0240fc07128e574.tar.gz" + sha256 = "79b55fc1d9d29f56d95fe35e8b83b8654833e425dc0d9a23669c8bf6400a15eb" prefetch = false autoupdate.strategy = "latest_github_commit" From 47cbc06813219a98765d8ffee61de2baa544da69 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Jul 2024 05:50:23 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dff429c..3603d6f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Shipped version:** 2019.08.07~ynh1 +**Shipped version:** 2024.07.05~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index d7a0945..82230f7 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Versión actual:** 2019.08.07~ynh1 +**Versión actual:** 2024.07.05~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 5c18d04..e7cb2f5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Paketatutako bertsioa:** 2019.08.07~ynh1 +**Paketatutako bertsioa:** 2024.07.05~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 52ed22d..4612392 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Libreto est un carnet de note collaboratif fondé sur etherpad. Il peut devenir un mini-site, le carnet de bord d'un workshop ou le support de rédaction d'un livre collectif. -**Version incluse :** 2019.08.07~ynh1 +**Version incluse :** 2024.07.05~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 6647700..681a36a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**Versión proporcionada:** 2019.08.07~ynh1 +**Versión proporcionada:** 2024.07.05~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 0fa7ae1..84321c1 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Libreto is a collaborative etherpad-based notebook. It can become a mini-site, the synopsis of a workshop or the support for writing a collective book. -**分发版本：** 2019.08.07~ynh1 +**分发版本：** 2024.07.05~ynh1 **演示：**