From c938a6ea79eae06ab464de464a379665a43495d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 27 Feb 2024 09:13:26 +0100 Subject: [PATCH 1/5] Update nginx.conf --- conf/nginx.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 96bf29e..9608359 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,24 +1,24 @@ -location __PATH__/cache { +location ^__PATH__/cache { rewrite ^(.*)$ /error break; } -location __PATH__/content { +location ^__PATH__/content { rewrite ^(.*)$ /error break; } -location __PATH__/system { +location ^__PATH__/system { rewrite ^(.*)$ /error break; } #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location __PATH__/ { +location ^__PATH__/ { alias __INSTALL_DIR__/ ; index yellow.php; if (!-e $request_filename) { - rewrite ^(.*)$ __PATH__/yellow.php last; + rewrite ^(.*)$ ^__PATH__/yellow.php last; break; } From c5a6f81bfbfcfcd7b084acd1fc2f2db3a1deeecb Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Sat, 2 Mar 2024 21:57:36 +0100 Subject: [PATCH 2/5] Upgrade to v2024.03.02 (#73) * Upgrade to v2024.03.02 * Auto-update README --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4ff1243..fe884e1 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 Yellow is for people who make small websites -**Shipped version:** 2024.01.06~ynh1 +**Shipped version:** 2024.03.02~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ diff --git a/README_fr.md b/README_fr.md index 9298832..fac48f7 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) po Yellow is for people who make small websites -**Version incluse :** 2024.01.06~ynh1 +**Version incluse :** 2024.03.02~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index eb26a3a..f52906a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2024.01.06~ynh1" +version = "2024.03.02~ynh1" maintainers = [] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/4c68bcc9bf52d602562ecb87761f9ad3d994ecbd.tar.gz" - sha256 = "822f74e0b5aaffd7a609876c7140a69ab4c4b98c668df18ec8f6ca2c2367cdbb" + url = "https://github.com/datenstrom/yellow/archive/c4d39bef641e2bbd9f5f805614f25a9bcf85b993.tar.gz" + sha256 = "b375bbbfcca90f566e9ae7ffd5ef5e733d2df4eb938d08684ecf3a1d5f0f609f" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" From 542097d0d91a54720df73f202edf0e81ea87dc56 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:54:35 +0200 Subject: [PATCH 3/5] Update nginx.conf: no need for ^ in non-regex locations ? x_x --- conf/nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9608359..5c4e020 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,17 +1,17 @@ -location ^__PATH__/cache { +location __PATH__/cache { rewrite ^(.*)$ /error break; } -location ^__PATH__/content { +location __PATH__/content { rewrite ^(.*)$ /error break; } -location ^__PATH__/system { +location __PATH__/system { rewrite ^(.*)$ /error break; } #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; -location ^__PATH__/ { +location __PATH__/ { alias __INSTALL_DIR__/ ; From a533f2ef5d8742b4a769f4f8609332fdf1911872 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 7 Apr 2024 15:54:39 +0000 Subject: [PATCH 4/5] Auto-update READMEs --- ALL_README.md | 6 ++++++ README.md | 28 ++++++++++++++-------------- README_eu.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 ++++++++++++++++---------------- README_gl.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 30 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..77b7509 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index fe884e1..3203805 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Yellow with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Yellow 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 Yellow 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 @@ -20,7 +20,7 @@ Yellow is for people who make small websites **Shipped version:** 2024.03.02~ynh1 -**Demo:** https://datenstrom.se/yellow/demo/ +**Demo:** ## Screenshots @@ -28,22 +28,22 @@ Yellow is for people who make small websites ## 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/yellow_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/yellow_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/yellow_ynh/tree/testing --debug or sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..5f27fd8 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,49 @@ + + +# Yellow YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) + +[![Instalatu Yellow YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Yellow YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Yellow is for people who make small websites + +**Paketatutako bertsioa:** 2024.03.02~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Yellow(r)en pantaila-argazkia](./doc/screenshots/datenstrom-yellow-en.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/yellow_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +edo +sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index fac48f7..756b9c3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Yellow pour YunoHost @@ -9,18 +9,18 @@ It shall NOT be edited by hand. [![Installer Yellow avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Yellow 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 Yellow 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 Yellow is for people who make small websites -**Version incluse :** 2024.03.02~ynh1 +**Version incluse :** 2024.03.02~ynh1 -**Démo :** https://datenstrom.se/yellow/demo/ +**Démo :** ## Captures d’écran @@ -28,22 +28,22 @@ Yellow is for people who make small websites ## 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/yellow_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/yellow_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/yellow_ynh/tree/testing --debug ou sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_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..e9540fa --- /dev/null +++ b/README_gl.md @@ -0,0 +1,49 @@ + + +# Yellow para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/yellow.svg)](https://dash.yunohost.org/appci/app/yellow) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yellow.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yellow.maintain.svg) + +[![Instalar Yellow con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yellow) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Yellow 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 + +Yellow is for people who make small websites + +**Versión proporcionada:** 2024.03.02~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Yellow](./doc/screenshots/datenstrom-yellow-en.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/yellow_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +ou +sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** From e2e8bc0f37d36f08a6352e061bc9ed4129da86df Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Sun, 7 Apr 2024 17:54:59 +0200 Subject: [PATCH 5/5] Update nginx.conf: no need for ^ in non-regex locations ? x_x --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5c4e020..96bf29e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -18,7 +18,7 @@ location __PATH__/ { index yellow.php; if (!-e $request_filename) { - rewrite ^(.*)$ ^__PATH__/yellow.php last; + rewrite ^(.*)$ __PATH__/yellow.php last; break; }