From e82f22685697428a0f24b15a9682dd075d0c5223 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Nov 2021 06:01:29 +0000 Subject: [PATCH 1/7] Upgrade to v1.8.16 --- manifest.json | 223 +++++++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 103 deletions(-) diff --git a/manifest.json b/manifest.json index e91ade3..05890a7 100644 --- a/manifest.json +++ b/manifest.json @@ -1,111 +1,128 @@ { - "name": "Etherpad MyPads", - "id": "etherpad_mypads", - "packaging_format": 1, - "description": { - "en": "Online editor providing collaborative editing in real-time", - "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" - }, - "version": "1.8.15~ynh1", - "url": "http://etherpad.org", - "upstream": { + "name": "Etherpad MyPads", + "id": "etherpad_mypads", + "packaging_format": 1, + "description": { + "en": "Online editor providing collaborative editing in real-time", + "fr": "Éditeur en ligne fournissant l'édition collaborative en temps réel" + }, + "version": "1.8.16~ynh1", + "url": "http://etherpad.org", + "upstream": { "license": "Apache-2.0", "website": "http://etherpad.org", "demo": "https://video.etherpad.com", "admindoc": "http://etherpad.org/doc/v1.8.15", "code": "https://github.com/ether/etherpad-lite" }, - "license": "Apache-2.0", - "maintainer": { - "name": "", - "email": "" - }, - "previous_maintainers": [{ - "name": "Maniack Crudelis", - "email": "maniackc_dev@crudelis.fr" - }], - "requirements": { - "yunohost": ">= 4.3.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "mysql" - ], - "arguments": { - "install" : [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/pad", - "default": "/pad" - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "password", - "type": "password" - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose your language", - "fr": "Choisissez la langue" - }, - "choices" : ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"], - "default" : "en" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one.", - "fr": "Si votre instance Etherpad est publique, tout le monde pourra créer un pad ou voir un pad existant." - }, - "default": true - }, - { - "name": "export", - "type": "string", - "ask": { - "en": "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?", - "fr": "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?" - }, - "choices" : ["none", "abiword", "libreoffice"], - "default" : "none" - }, - { - "name": "mypads", - "type": "boolean", - "ask": { - "en": "Do you want to install MyPads plugin?", - "fr": "Voulez-vous installer le plugin MyPads ?" - }, - "help": { - "en": "MyPads plugin" - }, - "default": true - }, - { - "name": "useldap", - "type": "boolean", - "ask": { - "en": "Do you want to use LDAP with MyPads?", - "fr": "Voulez-vous utiliser LDAP avec MyPads ?" - }, - "help": { - "en": "Using LDAP won't let you add new user aside from YunoHost users.", - "fr": "Utiliser LDAP ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost." - }, - "default": true - } - ] - } + "license": "Apache-2.0", + "maintainer": { + "name": "", + "email": "" + }, + "previous_maintainers": [ + { + "name": "Maniack Crudelis", + "email": "maniackc_dev@crudelis.fr" + } + ], + "requirements": { + "yunohost": ">= 4.3.0" + }, + "multi_instance": true, + "services": [ + "nginx", + "mysql" + ], + "arguments": { + "install": [ + { + "name": "domain", + "type": "domain" + }, + { + "name": "path", + "type": "path", + "example": "/pad", + "default": "/pad" + }, + { + "name": "admin", + "type": "user" + }, + { + "name": "password", + "type": "password" + }, + { + "name": "language", + "type": "string", + "ask": { + "en": "Choose your language", + "fr": "Choisissez la langue" + }, + "choices": [ + "ca", + "de", + "en", + "es", + "fr", + "gl", + "hu", + "it", + "nl", + "pt" + ], + "default": "en" + }, + { + "name": "is_public", + "type": "boolean", + "help": { + "en": "If your Etherpad instance is public, everyone will be able to create a pad or see an existing one.", + "fr": "Si votre instance Etherpad est publique, tout le monde pourra créer un pad ou voir un pad existant." + }, + "default": true + }, + { + "name": "export", + "type": "string", + "ask": { + "en": "Use AbiWord (~260 Mo) or LibreOffice (~400 Mo) (more stable) to expand export possibilities (PDF, doc)?", + "fr": "Utiliser AbiWord (~260 Mo) ou LibreOffice (~400 Mo) (plus stable) pour étendre les possibilités d'export (PDF, doc) ?" + }, + "choices": [ + "none", + "abiword", + "libreoffice" + ], + "default": "none" + }, + { + "name": "mypads", + "type": "boolean", + "ask": { + "en": "Do you want to install MyPads plugin?", + "fr": "Voulez-vous installer le plugin MyPads ?" + }, + "help": { + "en": "MyPads plugin" + }, + "default": true + }, + { + "name": "useldap", + "type": "boolean", + "ask": { + "en": "Do you want to use LDAP with MyPads?", + "fr": "Voulez-vous utiliser LDAP avec MyPads ?" + }, + "help": { + "en": "Using LDAP won't let you add new user aside from YunoHost users.", + "fr": "Utiliser LDAP ne vous permettra pas d'ajouter un nouvel utilisateur en dehors des utilisateurs de YunoHost." + }, + "default": true + } + ] + } } From 0e41e275345988b4fea4d7399bd7b47be48a5965 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 29 Nov 2021 06:01:35 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57b37bd..503f166 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 Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. -**Shipped version:** 1.8.15~ynh1 +**Shipped version:** 1.8.16~ynh1 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 8c6bc48..3b7ba17 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers d'utilisateurs simultanés en temps réel. Il fournit des capacités complètes d'exportation de données et s'exécute sur votre serveur, sous votre contrôle. -**Version incluse :** 1.8.15~ynh1 +**Version incluse :** 1.8.16~ynh1 **Démo :** https://video.etherpad.com From 6201a3a79651e1d9ab488e6ece55f3e88996a4f2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 16:06:22 +0100 Subject: [PATCH 3/7] Fix --- config_panel.toml | 1 - scripts/config | 1 - 2 files changed, 2 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index 43dedcd..604bb12 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -1,5 +1,4 @@ version = "1.0" -name = "Etherpad configuration panel" [main] name = "Etherpad configuration" diff --git a/scripts/config b/scripts/config index 58e84d5..0652689 100644 --- a/scripts/config +++ b/scripts/config @@ -7,7 +7,6 @@ #================================================= # Load common variables for all scripts. -source _variables source _common.sh source /usr/share/yunohost/helpers From d3216a4552305f99cb0022c031c14921703cfb22 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 16:07:01 +0100 Subject: [PATCH 4/7] Update config --- scripts/config | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/config b/scripts/config index 0652689..90c0c2f 100644 --- a/scripts/config +++ b/scripts/config @@ -269,10 +269,4 @@ apply_config() { #================================================= # GENERIC FINALIZATION #================================================= -# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT -#================================================= - -case $1 in - show) show_config;; - apply) apply_config;; -esac +ynh_app_config_run $1 From 0395fb13763a14ad6a85967809da7473f030f58c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 5 Dec 2021 16:12:08 +0100 Subject: [PATCH 5/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b0583d7..6c576a7 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -20,7 +20,7 @@ mypads_version=1.7.22 # Plugin versions ep_align_version=0.3.42 ep_author_hover_version=0.3.28 -ep_comments_page_version=0.1.79 +ep_comments_page_version=0.1.80 ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 ep_font_color_version=0.0.52 From 434bbfa878617dc2bacfdb4ffd9189eda7f059d6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Dec 2021 09:15:11 +0100 Subject: [PATCH 6/7] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51d4af9..41d6afb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +## [1.8.16~ynh1]() - 2021-12-09 + +#### Changed +* [Upgrade to 1.8.16](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/157/commits/e82f22685697428a0f24b15a9682dd075d0c5223) +* [Upgrade ep_comments_page to 0.1.80](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/157/commits/0395fb13763a14ad6a85967809da7473f030f58c) + ## [1.8.15~ynh1]() - 2021-11-20 #### Changed From fec3c4d416f63ea1a0da831c42258dfe5a0933eb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Dec 2021 09:35:34 +0100 Subject: [PATCH 7/7] Update config --- scripts/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/config b/scripts/config index 90c0c2f..4a199de 100644 --- a/scripts/config +++ b/scripts/config @@ -10,6 +10,8 @@ source _common.sh source /usr/share/yunohost/helpers +ynh_abort_if_errors + #================================================= # RETRIEVE ARGUMENTS #=================================================