From f10461dbd9a699f7d20bce8fbd3f0e9c520b526f Mon Sep 17 00:00:00 2001 From: mrflos Date: Wed, 29 May 2024 12:02:31 +0300 Subject: [PATCH 1/5] fix(manifest): right sha by @plabuse and bump version --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index e356473..6a6ade6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "YesWiki" description.en = "Wiki that is quick and easy to use" description.fr = "Wiki facile et rapide à prendre en main" -version = "4.4.4~ynh4" +version = "4.4.4~ynh5" maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf"] @@ -84,7 +84,7 @@ sha256 = "60032781016d2bdcecce4ad5ae91e72407e64a994f63661e27a7a935ba52d50b" [resources.sources.importerplugin] url = "https://repository.yeswiki.net/doryphore/extension-importer-1.0.0.zip" -sha256 = "7c5e730b4724a991ae64fdf457b9ec6d0416621f7fecb38e5b7a73e36d22eb00" +sha256 = "5e0312e5053588e45e5c415b43ca75d388bcf589d09fa6f09da1e3d7f5cfd755" [resources.sources.ferme] url = "https://repository.yeswiki.net/doryphore/extension-ferme-1.1.8.zip" From 7428f548628db5bdc4bf5e03e2afb6d216af492b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 29 May 2024 09:02:47 +0000 Subject: [PATCH 2/5] 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 e2b32bd..f190973 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Shipped version:** 4.4.4~ynh4 +**Shipped version:** 4.4.4~ynh5 **Demo:** diff --git a/README_es.md b/README_es.md index 4f4e947..0da85ff 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Versión actual:** 4.4.4~ynh4 +**Versión actual:** 4.4.4~ynh5 **Demo:** diff --git a/README_eu.md b/README_eu.md index 9139e95..4f67270 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Paketatutako bertsioa:** 4.4.4~ynh4 +**Paketatutako bertsioa:** 4.4.4~ynh5 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 03a0422..836fb10 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip - Cultiver un bout de liberté... -**Version incluse :** 4.4.4~ynh4 +**Version incluse :** 4.4.4~ynh5 **Démo :** diff --git a/README_gl.md b/README_gl.md index 47fec82..1098832 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Versión proporcionada:** 4.4.4~ynh4 +**Versión proporcionada:** 4.4.4~ynh5 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index ab37a98..3105983 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**分发版本：** 4.4.4~ynh4 +**分发版本：** 4.4.4~ynh5 **演示：** From 856e8d011fae101e0bce92d02c2b9d40b8e79239 Mon Sep 17 00:00:00 2001 From: mrflos Date: Wed, 29 May 2024 23:54:37 +0300 Subject: [PATCH 3/5] fix: better installation text + fixed importer version + bump version --- manifest.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 6a6ade6..2ecd50f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "YesWiki" description.en = "Wiki that is quick and easy to use" description.fr = "Wiki facile et rapide à prendre en main" -version = "4.4.4~ynh5" +version = "4.4.4~ynh6" maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf"] @@ -50,6 +50,8 @@ default = "fr" [install.wikimodel] ask.en = "Choose the wiki model" ask.fr = "Choisissez le modèle de wiki" +help.en = "YesWiki installs a default YesWiki installation, CLIC will change default look and add a view with installed yunohost apps." +help.fr = "YesWiki est une installation par défaut de YesWiki, CLIC change le look et les pages par défaut pour ajouter la vue des applications YunoHost installées." type = "select" choices = ["YesWiki", "CLIC"] default = "YesWiki" @@ -83,7 +85,7 @@ url = "https://repository.yeswiki.net/doryphore/extension-yunohost-1.0.0.zip" sha256 = "60032781016d2bdcecce4ad5ae91e72407e64a994f63661e27a7a935ba52d50b" [resources.sources.importerplugin] -url = "https://repository.yeswiki.net/doryphore/extension-importer-1.0.0.zip" +url = "https://repository.yeswiki.net/doryphore/extension-importer-1.0.1.zip" sha256 = "5e0312e5053588e45e5c415b43ca75d388bcf589d09fa6f09da1e3d7f5cfd755" [resources.sources.ferme] From 98680c83c1472ebad296d0a90bce658db927688f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 29 May 2024 20:54:48 +0000 Subject: [PATCH 4/5] 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 f190973..b9b96ed 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Shipped version:** 4.4.4~ynh5 +**Shipped version:** 4.4.4~ynh6 **Demo:** diff --git a/README_es.md b/README_es.md index 0da85ff..65eee5c 100644 --- a/README_es.md +++ b/README_es.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Versión actual:** 4.4.4~ynh5 +**Versión actual:** 4.4.4~ynh6 **Demo:** diff --git a/README_eu.md b/README_eu.md index 4f67270..1e24381 100644 --- a/README_eu.md +++ b/README_eu.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Paketatutako bertsioa:** 4.4.4~ynh5 +**Paketatutako bertsioa:** 4.4.4~ynh6 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 836fb10..97a09af 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip - Cultiver un bout de liberté... -**Version incluse :** 4.4.4~ynh5 +**Version incluse :** 4.4.4~ynh6 **Démo :** diff --git a/README_gl.md b/README_gl.md index 1098832..d305b9c 100644 --- a/README_gl.md +++ b/README_gl.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Versión proporcionada:** 4.4.4~ynh5 +**Versión proporcionada:** 4.4.4~ynh6 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3105983..510a5ec 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**分发版本：** 4.4.4~ynh5 +**分发版本：** 4.4.4~ynh6 **演示：** From ca081e36a68f010c5926482cde661292caa815ad Mon Sep 17 00:00:00 2001 From: mrflos Date: Thu, 30 May 2024 00:00:40 +0300 Subject: [PATCH 5/5] fix(sha): used correct sha --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 2ecd50f..4d98338 100644 --- a/manifest.toml +++ b/manifest.toml @@ -86,7 +86,7 @@ sha256 = "60032781016d2bdcecce4ad5ae91e72407e64a994f63661e27a7a935ba52d50b" [resources.sources.importerplugin] url = "https://repository.yeswiki.net/doryphore/extension-importer-1.0.1.zip" -sha256 = "5e0312e5053588e45e5c415b43ca75d388bcf589d09fa6f09da1e3d7f5cfd755" +sha256 = "443f46bb4b1316a408bee4cee1f69ef8f16ae072e9e2761f4dca641e20303c71" [resources.sources.ferme] url = "https://repository.yeswiki.net/doryphore/extension-ferme-1.1.8.zip"