From 56ed40026c63570d53d28a8687ce7b14d0b12226 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 24 Mar 2021 19:51:54 +0100 Subject: [PATCH 01/15] protect final_path --- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + 3 files changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index ee2e394..9e767f0 100644 --- a/scripts/install +++ b/scripts/install @@ -216,6 +216,7 @@ ynh_store_file_checksum --file="$final_path/credentials.json" # Set files ownership to etherpad chown -R $app: $final_path +chmod o-rwx $final_path # Restrict access to credentials.json chmod 600 $final_path/credentials.json diff --git a/scripts/restore b/scripts/restore index d4da3c7..202a1c4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -136,6 +136,7 @@ ynh_exec_warn_less npm cache clean --force # Restore permissions on app files chown -R $app: $final_path +chmod o-rwx $final_path #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/scripts/upgrade b/scripts/upgrade index 28521a1..2b7eb5b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -356,6 +356,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path # Set files ownership to etherpad chown -R $app: $final_path +chmod o-rwx $final_path chmod 600 "$final_path/credentials.json" # Restrict access to credentials.json chown $app -R /var/log/$app/etherpad.log From bd8e7ae4c9e1f6c34978888793f5858bc3b8033d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 2 Apr 2021 23:16:23 +0200 Subject: [PATCH 02/15] Upgrade plugins --- manifest.json | 22 +--------------------- pull_request_template.md | 11 ++--------- scripts/_variables | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 40 deletions(-) diff --git a/manifest.json b/manifest.json index a44fa03..86d243d 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "email": "maniackc_dev@crudelis.fr" }], "requirements": { - "yunohost": ">= 3.8.1" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -30,38 +30,22 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Etherpad MyPads", - "fr": "Choisissez un domaine pour Etherpad MyPads" - }, "example": "sub.domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Etherpad MyPads", - "fr": "Choisissez un chemin pour Etherpad MyPads" - }, "example": "/pad", "default": "/pad" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose the Etherpad MyPads administrator (must be an existing YunoHost user)", - "fr": "Choisissez l'administrateur Etherpad MyPads (doit être un utilisateur YunoHost existant)" - }, "example": "john" }, { "name": "password", "type": "password", - "ask": { - "en": "Set the administrator password (between 8 and 30 characters)", - "fr": "Définissez le mot de passe administrateur (entre 8 et 30 caractères)" - }, "example": "Choose a password" }, { @@ -77,10 +61,6 @@ { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public website?", - "fr": "Est-ce un site public ?" - }, "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." diff --git a/pull_request_template.md b/pull_request_template.md index d7cd620..6c28fc5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,13 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -*Minor decision* -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/etherpad_mypads_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/etherpad_mypads_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/_variables b/scripts/_variables index ec5a324..5f3eaf4 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -14,17 +14,17 @@ nodejs_version=12 mypads_version=1.7.19 # Plugin versions -ep_align_version=0.3.31 -ep_author_hover_version=0.3.17 +ep_align_version=0.3.32 +ep_author_hover_version=0.3.18 ep_automatic_logut_version=1.0.8 -ep_comments_page_version=0.1.58 +ep_comments_page_version=0.1.60 ep_countable_version=0.0.9 ep_delete_empty_pads_version=0.0.7 -ep_font_color_version=0.0.40 -ep_headings2_version=0.2.26 -ep_markdown_version=0.1.30 +ep_font_color_version=0.0.41 +ep_headings2_version=0.2.27 +ep_markdown_version=0.1.31 ep_page_view_version=0.5.24 -ep_spellcheck_version=0.0.25 -ep_subscript_and_superscript_version=0.2.22 -ep_table_of_contents_version=0.3.18 -ep_font_size_version=0.4.19 +ep_spellcheck_version=0.0.26 +ep_subscript_and_superscript_version=0.2.23 +ep_table_of_contents_version=0.3.19 +ep_font_size_version=0.4.21 From a0ec0a35feb63aa8b5029d7bf358b7fe46fb163f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 15:14:52 +0200 Subject: [PATCH 03/15] Fix doc link --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ec2c3dc..125df95 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether ## Documentation * Official documentation: http://etherpad.org/doc/v1.8.4 - * YunoHost documentation: https://yunohost.org/#/app_etherpad_mypads + * YunoHost documentation: https://yunohost.org/en/app_etherpad_mypads ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 3e90ad5..96e6df0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa ## Documentation * Documentation officielle : http://etherpad.org/doc/v1.8.4 - * Documentation YunoHost : https://yunohost.org/#/app_etherpad_mypads_fr + * Documentation YunoHost : https://yunohost.org/fr/app_etherpad_mypads ## Fonctionnalités spécifiques à YunoHost From ee62c4bb03006a926c28ce48f2d14af775bd745e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 13 Apr 2021 20:01:16 +0200 Subject: [PATCH 04/15] Update _variables --- scripts/_variables | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_variables b/scripts/_variables index 5f3eaf4..f84cb8c 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -7,14 +7,14 @@ abiword_app_depencencies="abiword" libreoffice_app_dependencies="unoconv libreoffice-writer" # NodeJS version -nodejs_version=12 +nodejs_version=14 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. mypads_version=1.7.19 # Plugin versions -ep_align_version=0.3.32 +ep_align_version=0.3.33 ep_author_hover_version=0.3.18 ep_automatic_logut_version=1.0.8 ep_comments_page_version=0.1.60 @@ -25,6 +25,6 @@ ep_headings2_version=0.2.27 ep_markdown_version=0.1.31 ep_page_view_version=0.5.24 ep_spellcheck_version=0.0.26 -ep_subscript_and_superscript_version=0.2.23 +ep_subscript_and_superscript_version=0.2.25 ep_table_of_contents_version=0.3.19 ep_font_size_version=0.4.21 From 354477e38fa86bb2aeefd06b396bc8c8f0d5fb27 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Apr 2021 15:48:14 +0200 Subject: [PATCH 05/15] Fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 125df95..0715971 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,8 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether #### Supported architectures -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) ## Limitations diff --git a/README_fr.md b/README_fr.md index 96e6df0..70b6ce1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -42,8 +42,8 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa #### Architectures supportées -* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) -* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps.yunohost.org/ci/apps/etherpad_mypads/) +* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/etherpad_mypads.svg)](https://ci-apps-arm.yunohost.org/ci/apps/etherpad_mypads/) ## Limitations From 0429eb85c0be7f977fb360dcf99d323efc6d6da3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Apr 2021 23:11:25 +0200 Subject: [PATCH 06/15] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 691cfab..e26ddbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ Changelog ========= +## [1.8.4~ynh3](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133) - 2021-04-23 + +#### Changed +* [Remove page_view plugin (part of the core now)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/def10182c0d7e7aa8a9123e3606203fbd37a20ea) +* [Add countable plugin (working again)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf) +* [Update to mypads 1.7.19 and other plugin](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/bd8e7ae4c9e1f6c34978888793f5858bc3b8033d) +* [New permissions](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf) + ## [1.8.4~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105) - 2020-08-09 #### Changed From 037c56d106fa715acb83eac70318fe369eb92363 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Apr 2021 23:23:44 +0200 Subject: [PATCH 07/15] Fix --- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 9e767f0..ee2e394 100644 --- a/scripts/install +++ b/scripts/install @@ -216,7 +216,6 @@ ynh_store_file_checksum --file="$final_path/credentials.json" # Set files ownership to etherpad chown -R $app: $final_path -chmod o-rwx $final_path # Restrict access to credentials.json chmod 600 $final_path/credentials.json diff --git a/scripts/restore b/scripts/restore index 202a1c4..d4da3c7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -136,7 +136,6 @@ ynh_exec_warn_less npm cache clean --force # Restore permissions on app files chown -R $app: $final_path -chmod o-rwx $final_path #================================================= # ADVERTISE SERVICE IN ADMIN PANEL diff --git a/scripts/upgrade b/scripts/upgrade index 2b7eb5b..e30515d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -356,7 +356,7 @@ ynh_system_user_create --username=$app --home_dir=$final_path # Set files ownership to etherpad chown -R $app: $final_path -chmod o-rwx $final_path + chmod 600 "$final_path/credentials.json" # Restrict access to credentials.json chown $app -R /var/log/$app/etherpad.log From 8d9cb53b86b765fbe4fcb1d9bc27ea6340b15d11 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Apr 2021 23:39:52 +0200 Subject: [PATCH 08/15] Update _variables --- scripts/_variables | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_variables b/scripts/_variables index f84cb8c..2c70a83 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -7,11 +7,11 @@ abiword_app_depencencies="abiword" libreoffice_app_dependencies="unoconv libreoffice-writer" # NodeJS version -nodejs_version=14 +nodejs_version=12 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. -mypads_version=1.7.19 +mypads_version=1.7.20 # Plugin versions ep_align_version=0.3.33 From e3118b442cefff755ef435c5d8ca40c66a7a69b6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 29 Apr 2021 19:33:12 +0200 Subject: [PATCH 09/15] Update _variables --- scripts/_variables | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_variables b/scripts/_variables index 2c70a83..be97fdf 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -7,7 +7,7 @@ abiword_app_depencencies="abiword" libreoffice_app_dependencies="unoconv libreoffice-writer" # NodeJS version -nodejs_version=12 +nodejs_version=14 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. @@ -18,13 +18,13 @@ ep_align_version=0.3.33 ep_author_hover_version=0.3.18 ep_automatic_logut_version=1.0.8 ep_comments_page_version=0.1.60 -ep_countable_version=0.0.9 +ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 ep_font_color_version=0.0.41 ep_headings2_version=0.2.27 ep_markdown_version=0.1.31 ep_page_view_version=0.5.24 ep_spellcheck_version=0.0.26 -ep_subscript_and_superscript_version=0.2.25 +ep_subscript_and_superscript_version=0.2.26 ep_table_of_contents_version=0.3.19 ep_font_size_version=0.4.21 From 068ed33eb3355cdfa878dcafe7392ebab402a0a2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 1 May 2021 19:45:29 +0200 Subject: [PATCH 10/15] Upgrade plugins --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/_variables | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0715971..4d46ddb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allow you to install Etherpad quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* ## Overview Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. diff --git a/README_fr.md b/README_fr.md index 70b6ce1..8e69c05 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,7 +6,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Etherpad rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.* +Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/install_fr) pour savoir comment l'installer et en profiter.* ## Résumé Etherpad est un éditeur en ligne Open Source hautement personnalisable qui permet l'édition collaborative en temps réel. diff --git a/manifest.json b/manifest.json index 86d243d..d320516 100644 --- a/manifest.json +++ b/manifest.json @@ -55,7 +55,7 @@ "en": "Choose your language", "fr": "Choisissez la langue" }, - "choices" : ["en", "fr"], + "choices" : ["de", "en", "es", "fr", "it", "pt"], "default" : "en" }, { diff --git a/scripts/_variables b/scripts/_variables index be97fdf..e89bc02 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -14,17 +14,17 @@ nodejs_version=14 mypads_version=1.7.20 # Plugin versions -ep_align_version=0.3.33 -ep_author_hover_version=0.3.18 +ep_align_version=0.3.34 +ep_author_hover_version=0.3.19 ep_automatic_logut_version=1.0.8 ep_comments_page_version=0.1.60 ep_countable_version=0.0.11 ep_delete_empty_pads_version=0.0.7 -ep_font_color_version=0.0.41 -ep_headings2_version=0.2.27 -ep_markdown_version=0.1.31 +ep_font_color_version=0.0.42 +ep_headings2_version=0.2.28 +ep_markdown_version=0.1.32 ep_page_view_version=0.5.24 -ep_spellcheck_version=0.0.26 +ep_spellcheck_version=0.0.27 ep_subscript_and_superscript_version=0.2.26 -ep_table_of_contents_version=0.3.19 -ep_font_size_version=0.4.21 +ep_table_of_contents_version=0.3.20 +ep_font_size_version=0.4.22 From a8a6ea3b24ba6ac11b7d875e48442a2c86c95ba7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 1 May 2021 20:01:32 +0200 Subject: [PATCH 11/15] Update _variables --- scripts/_variables | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/_variables b/scripts/_variables index e89bc02..4e07d29 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -7,24 +7,24 @@ abiword_app_depencencies="abiword" libreoffice_app_dependencies="unoconv libreoffice-writer" # NodeJS version -nodejs_version=14 +nodejs_version=12 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. -mypads_version=1.7.20 +mypads_version=1.7.17 # Plugin versions -ep_align_version=0.3.34 -ep_author_hover_version=0.3.19 +ep_align_version=0.2.5 +ep_author_hover_version=0.3.0 ep_automatic_logut_version=1.0.8 -ep_comments_page_version=0.1.60 +ep_comments_page_version=0.1.5 ep_countable_version=0.0.11 -ep_delete_empty_pads_version=0.0.7 -ep_font_color_version=0.0.42 -ep_headings2_version=0.2.28 -ep_markdown_version=0.1.32 +ep_delete_empty_pads_version=0.0.6 +ep_font_color_version=0.0.15 +ep_headings2_version=0.1.3 +ep_markdown_version=0.1.7 ep_page_view_version=0.5.24 -ep_spellcheck_version=0.0.27 -ep_subscript_and_superscript_version=0.2.26 -ep_table_of_contents_version=0.3.20 -ep_font_size_version=0.4.22 +ep_spellcheck_version=0.0.7 +ep_subscript_and_superscript_version=0.1.2 +ep_table_of_contents_version=0.2.3 +ep_font_size_version=0.3.8 From 49fbe9d084d45aa9ddfe04ab99be6ebc86bc9840 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 1 May 2021 20:08:05 +0200 Subject: [PATCH 12/15] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e26ddbd..9ea8017 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,6 @@ Changelog #### Changed * [Remove page_view plugin (part of the core now)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/def10182c0d7e7aa8a9123e3606203fbd37a20ea) * [Add countable plugin (working again)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf) -* [Update to mypads 1.7.19 and other plugin](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/bd8e7ae4c9e1f6c34978888793f5858bc3b8033d) * [New permissions](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf) ## [1.8.4~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105) - 2020-08-09 From df88cb26ca2fd255082e6cd4a6d9b5492cce32ea Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 2 May 2021 16:14:37 +0200 Subject: [PATCH 13/15] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e30515d..8d4de8c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -404,7 +404,7 @@ then # Find the /div just after the field to open a pad mod_line=$(grep -nA5 "index.createOpenPad" $final_path/src/templates/index.html | grep "" | cut -d '-' -f 1) # In order to add a link to mypads plugin. - sed -i "$mod_line s@div>@&\n\t

Mypads
@" $final_path/src/templates/index.html + sed -i "$mod_line s@div>@&\n\t

MyPads
@" $final_path/src/templates/index.html fi #================================================= From 84fae0d0e5e50ec5d7e7a5055f059941c3bc1ceb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 2 May 2021 16:28:36 +0200 Subject: [PATCH 14/15] Set possible language same as MyPads --- CHANGELOG.md | 1 - manifest.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ea8017..af1de70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ Changelog #### Changed * [Remove page_view plugin (part of the core now)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/def10182c0d7e7aa8a9123e3606203fbd37a20ea) -* [Add countable plugin (working again)](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf) * [New permissions](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/133/commits/943ec31536dabe4f2146253f3e478598cdafe4bf) ## [1.8.4~ynh1](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/pull/105) - 2020-08-09 diff --git a/manifest.json b/manifest.json index d320516..839be8b 100644 --- a/manifest.json +++ b/manifest.json @@ -55,7 +55,7 @@ "en": "Choose your language", "fr": "Choisissez la langue" }, - "choices" : ["de", "en", "es", "fr", "it", "pt"], + "choices" : ["de", "en", "es", "fr", "it"], "default" : "en" }, { From 4c4996c94838f508a74a93a8322dee59c6e1bf34 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 2 May 2021 17:32:41 +0200 Subject: [PATCH 15/15] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ee2e394..4455e05 100644 --- a/scripts/install +++ b/scripts/install @@ -249,7 +249,7 @@ npm install ep_automatic_logut@${ep_automatic_logut_version} >> $install_log 2>& # Framapad - Adds comments on sidebar and link it to the text. npm install ep_comments_page@${ep_comments_page_version} >> $install_log 2>&1 # Framapad - Displays paragraphs, sentences, words and characters counts. -npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 +#npm install ep_countable@${ep_countable_version} >> $install_log 2>&1 # Framapad - Delete pads which were never edited npm install ep_delete_empty_pads@${ep_delete_empty_pads_version} >> $install_log 2>&1 # Framapad - Apply colors to fonts