From 2b0ec5833d075df60b9dbd4d235c369d804fab19 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 31 Jan 2022 18:15:37 +0100 Subject: [PATCH 01/11] Update _common.sh --- scripts/_common.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3805ec3..1553e05 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,19 +18,19 @@ nodejs_version=14 mypads_version=1.7.22 # Plugin versions -ep_align_version=0.3.43 +ep_align_version=0.3.45 ep_author_hover_version=0.3.29 -ep_comments_page_version=0.1.84 +ep_comments_page_version=0.1.91 ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 -ep_font_color_version=0.0.54 -ep_headings2_version=0.2.37 -ep_markdown_version=0.1.43 +ep_font_color_version=0.0.56 +ep_headings2_version=0.2.38 +ep_markdown_version=0.1.45 ep_page_view_version=0.5.24 -ep_spellcheck_version=0.0.35 -ep_subscript_and_superscript_version=0.2.38 -ep_table_of_contents_version=0.3.31 -ep_font_size_version=0.4.33 +ep_spellcheck_version=0.0.39 +ep_subscript_and_superscript_version=0.2.39 +ep_table_of_contents_version=0.3.35 +ep_font_size_version=0.4.37 #================================================= # PERSONAL HELPERS From 0165da34bed38645725e891660ba24b7eaa29a46 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 17 Feb 2022 14:06:03 +0100 Subject: [PATCH 02/11] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 8f16630..d203484 100644 --- a/scripts/install +++ b/scripts/install @@ -65,7 +65,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=3 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value=$password +ynh_app_setting_set --app=$app --key=password --value="$password" ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=export --value=$export ynh_app_setting_set --app=$app --key=mypads --value=$mypads From 4c6951773bc4cf7955bc1b7407973cacc7db9302 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 07:23:13 +0100 Subject: [PATCH 03/11] 1.8.17 --- conf/app.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app.src b/conf/app.src index 86caea3..1c98603 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.16.tar.gz -SOURCE_SUM=dfdb60910aa9df85bde8cad8729ef6a33e36014739a3e8ce105f5e96a6b99d8c +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.8.17.tar.gz +SOURCE_SUM=077df9a46046f579644d26525c42008d8b758796ba447ddbd99fe1d975156f31 SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index eb0bb41..f554c12 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "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~ynh2", + "version": "1.8.17~ynh1", "url": "http://etherpad.org", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 1553e05..78f7e8b 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -19,8 +19,8 @@ mypads_version=1.7.22 # Plugin versions ep_align_version=0.3.45 -ep_author_hover_version=0.3.29 -ep_comments_page_version=0.1.91 +ep_author_hover_version=0.3.31 +ep_comments_page_version=0.1.92 ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 ep_font_color_version=0.0.56 From bbf9f5af6eb8ed5e15c14ddfde3d7eda2b6b417b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 24 Feb 2022 06:23:17 +0000 Subject: [PATCH 04/11] 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 4d91716..d3ce139 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.16~ynh2 +**Shipped version:** 1.8.17~ynh1 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 32ef35a..4b69e0f 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.16~ynh2 +**Version incluse :** 1.8.17~ynh1 **Démo :** https://video.etherpad.com From 5a4944af34fb09c1e915bd43edc0de5ac8bf6538 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 14:43:28 +0100 Subject: [PATCH 05/11] Update _common.sh --- scripts/_common.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 78f7e8b..c1539aa 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,19 +18,19 @@ nodejs_version=14 mypads_version=1.7.22 # Plugin versions -ep_align_version=0.3.45 -ep_author_hover_version=0.3.31 -ep_comments_page_version=0.1.92 +ep_align_version=0.3.46 +ep_author_hover_version=0.3.32 +ep_comments_page_version=0.1.93 ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 -ep_font_color_version=0.0.56 -ep_headings2_version=0.2.38 -ep_markdown_version=0.1.45 +ep_font_color_version=0.0.57 +ep_headings2_version=0.2.39 +ep_markdown_version=0.1.46 ep_page_view_version=0.5.24 -ep_spellcheck_version=0.0.39 -ep_subscript_and_superscript_version=0.2.39 -ep_table_of_contents_version=0.3.35 -ep_font_size_version=0.4.37 +ep_spellcheck_version=0.0.40 +ep_subscript_and_superscript_version=0.2.40 +ep_table_of_contents_version=0.3.36 +ep_font_size_version=0.4.38 #================================================= # PERSONAL HELPERS From 4f6b5c71f2adc16232ba7e07d796605be2dad1b0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 14:46:01 +0100 Subject: [PATCH 06/11] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba78c12..08bf9e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Changelog ========= +## [1.8.17~ynh1]() - 2022-02-24 + +#### Changed +* [Upgrade to 1.8.17](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/159/commits/d08a7d53b0b350dcbbdd983d421c68c2eb065c34) +* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/159/commits/e4929cf6e31b71970a24165845365c2342d1fd61) + + ## [1.8.16~ynh2]() - 2021-12-21 #### Changed From 14a4e2f24ed8472eda216f20422d940e61528fa6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 14:47:00 +0100 Subject: [PATCH 07/11] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08bf9e7..fe4cc93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ Changelog ## [1.8.17~ynh1]() - 2022-02-24 #### Changed -* [Upgrade to 1.8.17](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/159/commits/d08a7d53b0b350dcbbdd983d421c68c2eb065c34) -* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/159/commits/e4929cf6e31b71970a24165845365c2342d1fd61) +* [Upgrade to 1.8.17](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/160/commits/4c6951773bc4cf7955bc1b7407973cacc7db9302) +* [Upgrade plugins to upstream](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/160/commits/5a4944af34fb09c1e915bd43edc0de5ac8bf6538) ## [1.8.16~ynh2]() - 2021-12-21 From cff4d9c050c6e1a46f596913c51fb4d14b366a9a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 14:49:57 +0100 Subject: [PATCH 08/11] Update updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 478d4a6..4412413 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -10,7 +10,7 @@ # automatic actions when a new upstream release is detected. # Remove this exit command when you are ready to run this Action -#exit 1 +exit 1 #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS From f4d55ca69f27b400f876b813ed87b41b300241b4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 14:50:25 +0100 Subject: [PATCH 09/11] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f554c12..6617cf9 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,7 @@ "license": "Apache-2.0", "website": "http://etherpad.org", "demo": "https://video.etherpad.com", - "admindoc": "http://etherpad.org/doc/v1.8.16", + "admindoc": "http://etherpad.org/doc/v1.8.17", "code": "https://github.com/ether/etherpad-lite" }, "license": "Apache-2.0", From cbf69990d3bfa725c368013738189d0e5158aeef Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 24 Feb 2022 13:50:34 +0000 Subject: [PATCH 10/11] 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 d3ce139..14cb7a5 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether ## Documentation and resources * Official app website: http://etherpad.org -* Official admin documentation: http://etherpad.org/doc/v1.8.16 +* Official admin documentation: http://etherpad.org/doc/v1.8.17 * Upstream app code repository: https://github.com/ether/etherpad-lite * YunoHost documentation for this app: https://yunohost.org/app_etherpad_mypads * Report a bug: https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues diff --git a/README_fr.md b/README_fr.md index 4b69e0f..412c8cb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -60,7 +60,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa ## Documentations et ressources * Site officiel de l'app : http://etherpad.org -* Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.16 +* Documentation officielle de l'admin : http://etherpad.org/doc/v1.8.17 * Dépôt de code officiel de l'app : https://github.com/ether/etherpad-lite * Documentation YunoHost pour cette app : https://yunohost.org/app_etherpad_mypads * Signaler un bug : https://github.com/YunoHost-Apps/etherpad_mypads_ynh/issues From f64362b9206c7a0ccfd611f879a8785dbd89f591 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 24 Feb 2022 15:22:28 +0100 Subject: [PATCH 11/11] remove config --- config_panel.toml => config_panel.toml.exemple | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config_panel.toml => config_panel.toml.exemple (100%) diff --git a/config_panel.toml b/config_panel.toml.exemple similarity index 100% rename from config_panel.toml rename to config_panel.toml.exemple