From b6c7e787c09724edc15ad4ced1e669c5f2bb8a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:06:33 +0100 Subject: [PATCH 1/7] Update manifest.toml --- manifest.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.toml b/manifest.toml index c24fcfa..68fbc2d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,8 +23,11 @@ code = "https://github.com/dokuwiki/dokuwiki" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = true + sso = true + disk = "50M" ram.build = "200M" ram.runtime = "50M" From 42db7e664247a6af94a9cac132fb3ea873e5759c Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Tue, 6 Feb 2024 22:53:29 +0100 Subject: [PATCH 2/7] Upgrade to v2024.2.6 (#108) --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 68fbc2d..3b66462 100644 --- a/manifest.toml +++ b/manifest.toml @@ -58,8 +58,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/dokuwiki/dokuwiki/releases/download/release-2023-04-04a/dokuwiki-2023-04-04a.tgz" - sha256 = "153c99cf42b9068b1ec21a2c765b862a44b374ad2f1a39223f5511a982b160bb" + url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06.tar.gz" + sha256 = "fa5d890587d90e808402a95b581ccd173765045df23bd48f834b09a9df7252ed" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 21f964222f641731668e7f1aa4c3f38acee9e206 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:59:35 +0100 Subject: [PATCH 3/7] chore: use latest dokuwiki hotfix version 2024-02-06a --- manifest.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3b66462..da552d1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -8,9 +8,9 @@ description.de = "Standardkonformes, einfach zu benutzendes Wiki und zielt haupt description.es = "Sistema de Wiki de uso sencillicimo y compatible con los estándares" description.it = "Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo" -version = "2023.04.04a~ynh2" +version = "2024-02-06a~ynh1" -maintainers = ["Gofannon"] +maintainers = [""] [upstream] license = "GPL-2.0-or-later" @@ -58,8 +58,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06.tar.gz" - sha256 = "fa5d890587d90e808402a95b581ccd173765045df23bd48f834b09a9df7252ed" + url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06a.tar.gz" + sha256 = "3d025174169bb15be36b934f63974772b8caa9ea23e1b0c93f897396642b1697" autoupdate.strategy = "latest_github_tag" [resources.system_user] From f078898234a661fd0fa036854fe40c9b3f8a6120 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:18:25 +0100 Subject: [PATCH 4/7] chore(linter): fix linter warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ! manifest ✘ The 'version' field should match the format ~ynh. For example: 4.3-2~ynh3. ..... --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index da552d1..19834f3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -8,7 +8,7 @@ description.de = "Standardkonformes, einfach zu benutzendes Wiki und zielt haupt description.es = "Sistema de Wiki de uso sencillicimo y compatible con los estándares" description.it = "Wiki aderente agli standard, semplice da usare, finalizzato principalmente alla creazione di documentazione di qualsiasi tipo" -version = "2024-02-06a~ynh1" +version = "2024.02.06a~ynh1" maintainers = [""] From cd85ecf220623607c1d39027d4bc4db869e8987d Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Fri, 15 Mar 2024 02:38:40 +0100 Subject: [PATCH 5/7] add autoupdate.version_regex to fix the autoupdate --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 19834f3..b9541bd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,6 +61,7 @@ ram.runtime = "50M" url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06a.tar.gz" sha256 = "3d025174169bb15be36b934f63974772b8caa9ea23e1b0c93f897396642b1697" autoupdate.strategy = "latest_github_tag" + autoupdate.version_regex = "^release-(.*)$" [resources.system_user] From 8b82d71623624e2aed11efd5d0aab79834b62753 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 15 Mar 2024 01:38:44 +0000 Subject: [PATCH 6/7] Auto-update README --- README.md | 19 +++++++++---------- README_fr.md | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d0fba81..4b6041f 100644 --- a/README.md +++ b/README.md @@ -25,10 +25,9 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that * Default authorization is set as read only so guest people cannot edit pages. (Especially needed if wiki is public to avoid spam and defacing. Can be changed from admin panel) * During the upgrade, official plugins are also upgraded. We recommend that you should check that they run properly in the administration panel after the upgrade. We cannot know if some plugins are broken... +**Shipped version:** 2024.02.06a~ynh1 -**Shipped version:** 2023.04.04a~ynh2 - -**Demo:** https://demo.yunohost.org/dokuwiki/doku.php?id=start&do=login&u=demo&p=demo +**Demo:** ## Screenshots @@ -36,11 +35,11 @@ DokuWiki is a simple to use and highly versatile Open Source wiki software that ## 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 @@ -48,10 +47,10 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug or sudo yunohost app upgrade dokuwiki -u https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 3f7c2f2..21abccb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,10 +25,9 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent * Droits d'édition par défaut du wiki définis en lecture seule afin que les invités ne puissent éditer les pages. (Nécessaire surtout lorsque le wiki est public pour éviter le spam et le vandalisme. Peut être changé depuis la partie administration du wiki) * Lors de la mise à jour, les plugins officiels sont également mis à jour. Nous vous recommandons toutefois de vérifier le bon fonctionnement des plugins dans le panneau d'administration après cette opération. Nous ne pouvons pas savoir si des plugins spéciaux posent problèmes... +**Version incluse :** 2024.02.06a~ynh1 -**Version incluse :** 2023.04.04a~ynh2 - -**Démo :** https://demo.yunohost.org/dokuwiki/doku.php?id=start&do=login&u=demo&p=demo +**Démo :** ## Captures d’écran @@ -36,11 +35,11 @@ DokuWiki est un logiciel wiki Open Source simple à utiliser et très polyvalent ## 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 @@ -48,10 +47,10 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/dokuwiki_ynh/tree/testing --debug ou sudo yunohost app upgrade dokuwiki -u https://github.com/YunoHost-Apps/dokuwiki_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 :** From 8b3a69bb648ef4429a98bce35736a71bcc73c4c5 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 20 Mar 2024 22:56:32 +0100 Subject: [PATCH 7/7] better autoupdate.version_regex --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b9541bd..55228b8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,7 @@ ram.runtime = "50M" url = "https://github.com/dokuwiki/dokuwiki/archive/refs/tags/release-2024-02-06a.tar.gz" sha256 = "3d025174169bb15be36b934f63974772b8caa9ea23e1b0c93f897396642b1697" autoupdate.strategy = "latest_github_tag" - autoupdate.version_regex = "^release-(.*)$" + autoupdate.version_regex = "^release-(.*)tar.gz$" [resources.system_user]