From 943ec31536dabe4f2146253f3e478598cdafe4bf Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 20 Mar 2021 19:08:44 +0100
Subject: [PATCH 01/23] Add permissions

---
 README.md          |  1 +
 README_fr.md       |  1 +
 manifest.json      |  4 ++--
 scripts/_variables | 26 +++++++++++++-------------
 scripts/install    | 13 ++++++-------
 scripts/remove     |  2 +-
 scripts/upgrade    | 35 ++++++++++++-----------------------
 7 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 67a9db7..ee5080d 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
   * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Adds author names to span titles*
   * [ep_automatic_logut](https://www.npmjs.com/package/ep_automatic_logut) - *Automatically disconnects user after some period of time (Prevent server overload)*
   * [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Adds comments on sidebar and link it to the text.*
+  * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Adds paragraphs, words and characters count*
   * [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited*
   * [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Apply colors to fonts*
   * [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Add support for Font Sizes*
diff --git a/README_fr.md b/README_fr.md
index ead6f39..6a9dfd9 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -55,6 +55,7 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
   * [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Ajoute des noms d'auteurs*
   * [ep_automatic_logut](https://www.npmjs.com/package/ep_automatic_logut) - *Déconnecte automatiquement l'utilisateur après une certaine période de temps (Prévient la surcharge du serveur)*
   * [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajoute des commentaires sur la sidebar et le lie au texte.*
+  * [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajoute l'afficher le nombre de paragraphes, de mots et de caractères*
   * [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Supprimer les pads qui n'ont jamais été édités*
   * [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Appliquer les couleurs aux polices de caractères*
   * [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Permet de définir la taille de la police*.
diff --git a/manifest.json b/manifest.json
index 7e66103..a44fa03 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.4~ynh2",
+	"version": "1.8.4~ynh3",
 	"url": "https://framapad.org",
 	"license": "Apache-2.0",
 	"maintainer": {
@@ -105,7 +105,7 @@
 					"fr": "Voulez-vous installer le plugin MyPads ?"
 				},
 				"help": {
-					"en": "<a href=https://git.framasoft.org/framasoft/ep_mypads target=_blank>mypads plugin</a>"
+					"en": "<a href=https://git.framasoft.org/framasoft/ep_mypads target=_blank>MyPads plugin</a>"
 				},
 				"default": true
 			},
diff --git a/scripts/_variables b/scripts/_variables
index 70a9eb8..ec5a324 100644
--- a/scripts/_variables
+++ b/scripts/_variables
@@ -11,20 +11,20 @@ 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.17
+mypads_version=1.7.19
 
 # Plugin versions
-ep_align_version=0.2.5
-ep_author_hover_version=0.3.0
+ep_align_version=0.3.31
+ep_author_hover_version=0.3.17
 ep_automatic_logut_version=1.0.8
-ep_comments_page_version=0.1.5
-#ep_countable_version=0.0.7
-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_comments_page_version=0.1.58
+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_page_view_version=0.5.24
-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
+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
diff --git a/scripts/install b/scripts/install
index b3532a4..0e80c80 100644
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,6 @@ 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=is_public --value=$is_public
 ynh_print_OFF; ynh_app_setting_set --app=$app --key=password --value=$password; ynh_print_ON
 ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=export --value=$export
@@ -250,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
@@ -306,15 +305,15 @@ ynh_add_fail2ban_config --logpath="/var/log/nginx/$domain-access.log" --failrege
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..."
+ynh_script_progression --message="Configuring permissions..." --weight=2
 
 if [ $is_public -eq 1 ]; then
-	ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
-else
-	# etherpad admin page doesn't support SSO...
-	ynh_app_setting_set --app=$app --key=skipped_uris --value="/admin"
+	ynh_permission_update --permission="main" --add="visitors"	
 fi
 
+# Etherpad admin page doesn't support SSO...
+ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
+
 #=================================================
 # RELOAD NGINX
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 5507df8..60f8e32 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -95,7 +95,7 @@ ynh_remove_logrotate
 #=================================================
 # REMOVE FAIL2BAN CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing Fail2ban configuration..." --weight=7
+ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=7
 
 # Remove the dedicated fail2ban config
 ynh_remove_fail2ban_config
diff --git a/scripts/upgrade b/scripts/upgrade
index 23f0a3b..e4ed5a5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 language=$(ynh_app_setting_get --app=$app --key=language)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
 export=$(ynh_app_setting_get --app=$app --key=export)
@@ -57,15 +56,6 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=2
 
-# Fix is_public as a boolean value
-if [ "$is_public" = "Yes" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=1
-	is_public=1
-elif [ "$is_public" = "No" ]; then
-	ynh_app_setting_set --app=$app --key=is_public --value=0
-	is_public=0
-fi
-
 # If db_name doesn't exist, create it
 if [ -z "$db_name" ]; then
 	db_name=$(ynh_sanitize_dbid --db_name=$app)
@@ -135,6 +125,18 @@ if [ -z "$overwrite_systemd" ]; then
 	ynh_app_setting_set $app overwrite_systemd $overwrite_systemd
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+  ynh_legacy_permissions_delete_all
+
+  ynh_app_setting_delete --app=$app --key=is_public
+fi
+
+if ! ynh_permission_exists --permission="admin"; then
+  # Create the required permissions
+  ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@@ -404,19 +406,6 @@ then
 	sed -i "$mod_line s@div>@&\n\t<center><br><font size="5"><a href="./mypads/">Mypads</a></font></center>@" $final_path/src/templates/index.html
 fi
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Upgrading SSOwat configuration..."
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]; then
-	ynh_app_setting_set --app=$app --key=skipped_uris --value="/"
-else
-	# etherpad admin page doesn't support SSO...
-	ynh_app_setting_set --app=$app --key=skipped_uris --value="/admin"
-fi
-
 #=================================================
 # RELOAD NGINX
 #=================================================

From d037041b9a979b6d2f66942d33c1c66e2f3d961c Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Mar 2021 14:13:12 +0100
Subject: [PATCH 02/23] Update check_process

---
 check_process | 1 -
 1 file changed, 1 deletion(-)

diff --git a/check_process b/check_process
index 8672ecd..2ff2c0f 100644
--- a/check_process
+++ b/check_process
@@ -38,7 +38,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		port_already_use=1	(9001)
 		change_url=1
         actions=1
         config_panel=1

From 5ac9356765dd81c61467e3bb4e54a9fbf4608944 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Mar 2021 14:25:19 +0100
Subject: [PATCH 03/23] Add service description

---
 scripts/install | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0e80c80..cc6e39d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -232,7 +232,7 @@ ynh_add_systemd_config
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
-yunohost service add $app --log "/var/log/$app/etherpad.log"
+yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
 
 #=================================================
 # INSTALL FRAMAPAD'S PLUGINS
diff --git a/scripts/restore b/scripts/restore
index 248d03c..d4da3c7 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -141,7 +141,7 @@ chown -R $app: $final_path
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
-yunohost service add $app --log "/var/log/$app/etherpad.log"
+yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
 
 #=================================================
 # RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index e4ed5a5..28521a1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -364,7 +364,7 @@ chown $app -R /var/log/$app/etherpad.log
 # ADVERTISE SERVICE IN ADMIN PANEL
 #=================================================
 
-yunohost service add $app --log "/var/log/$app/etherpad.log"
+yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/etherpad.log"
 
 #=================================================
 # UPGRADE FAIL2BAN

From def10182c0d7e7aa8a9123e3606203fbd37a20ea Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Mar 2021 14:34:11 +0100
Subject: [PATCH 04/23] Remove page_view

---
 README.md          |  1 -
 README_fr.md       |  1 -
 check_process      |  1 -
 conf/settings.json |  4 ----
 config_panel.toml  |  5 -----
 scripts/_variables |  3 +--
 scripts/config     | 13 -------------
 scripts/install    |  2 --
 8 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 67a9db7..49931fa 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,6 @@ You can also find a configuration file for Etherpad at this path `/var/www/ether
   * [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Adds heading support to Etherpad Lite.*
   * [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and Export as Markdown in Etherpad*
   * [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad*
-  * [ep_page_view](https://www.npmjs.com/package/ep_page_view) - *Add support to do 'page view', with a toggle on/off option in Settings, also Page Breaks with Control Enter*
   * [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add support to do 'Spell checking'*
   * [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Add support for Subscript and Superscript*
   * [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *View a table of contents for your pad*
diff --git a/README_fr.md b/README_fr.md
index ead6f39..1bd3719 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -61,7 +61,6 @@ Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpa
   * [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Ajoute le support de titre à Etherpad Lite.*
   * [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Modifier et exporter en tant que Markdown dans Etherpad*
   * [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad*
-  * [ep_page_view](https://www.npmjs.com/package/ep_page_view) - *Ajouter la prise en charge de 'page view', avec une option d'activation/désactivation dans Paramètres, ainsi que 'Page Breaks' avec Control + Entrée*
   * [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajouter le support pour faire de la vérification orthographique*
   * [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Ajouter la prise en charge de Subscript et Superscript*.
   * [ep_table_of_contents](https://www.npmjs.com/package/ep_table_of_contents) - *Voir une table des matières pour votre pad*
diff --git a/check_process b/check_process
index 8672ecd..3f2642f 100644
--- a/check_process
+++ b/check_process
@@ -18,7 +18,6 @@
         main.pad_configuration.pad_config_chatandusers=1|0
         main.pad_configuration.pad_config_alwaysshowchat=1|0
         main.pad_configuration.pad_config_show_markdown=1|0
-        main.pad_configuration.pad_config_pageview=1|0
         main.pad_configuration.pad_config_automatic_logout=0|1
         main.pad_configuration.pad_config_skinname=noskin|colibris|noskin
         main.mypads_configuration.mypads=0|1
diff --git a/conf/settings.json b/conf/settings.json
index 6c65f50..13cd91d 100644
--- a/conf/settings.json
+++ b/conf/settings.json
@@ -211,10 +211,6 @@
 		// ep_markdown
 		"ep_markdown_default": false,	// Setting as default
 
-		// ep_page_view
-		"ep_page_view_default" : false,	// Set page view as default
-		"ep_page_view_disable_change" : false,	// Disable change of page view setting in UI
-
   // Other plugins config
 	// ep_comments_page
 		// Display comments as icons, not boxes
diff --git a/config_panel.toml b/config_panel.toml
index 7045e5f..8b1f163 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -42,11 +42,6 @@ name = "Etherpad configuration"
         type = "boolean"
         default = false
 
-        [main.pad_configuration.pad_config_pageview]
-        ask = "Page view?"
-        type = "boolean"
-        default = false
-
         [main.pad_configuration.pad_config_automatic_logout]
         ask = "Automatic logout"
         type = "boolean"
diff --git a/scripts/_variables b/scripts/_variables
index 70a9eb8..423391d 100644
--- a/scripts/_variables
+++ b/scripts/_variables
@@ -18,12 +18,11 @@ 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.5
-#ep_countable_version=0.0.7
+ep_countable_version=0.0.7
 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.7
 ep_subscript_and_superscript_version=0.1.2
 ep_table_of_contents_version=0.2.3
diff --git a/scripts/config b/scripts/config
index 98ab80c..ffbe98e 100644
--- a/scripts/config
+++ b/scripts/config
@@ -67,10 +67,6 @@ pad_config_alwaysshowchat="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_ALWAYS
 old_pad_config_show_markdown="$(get_config_value ep_markdown_default)"
 pad_config_show_markdown="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_SHOW_MARKDOWN:-$old_pad_config_show_markdown}"
 
-# Plugin option ep_page_view_default
-old_pad_config_pageview="$(get_config_value ep_page_view_default)"
-pad_config_pageview="${YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_PAGEVIEW:-$old_pad_config_pageview}"
-
 # Enable/disable ep_automatic_logut
 if grep -q "//.*\"automatic_logut_" $config_file
 then
@@ -149,7 +145,6 @@ show_config() {
 	ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_CHATANDUSERS=$pad_config_chatandusers"
 	ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_ALWAYSSHOWCHAT=$pad_config_alwaysshowchat"
 	ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_SHOW_MARKDOWN=$pad_config_show_markdown"
-	ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_PAGEVIEW=$pad_config_pageview"
 	ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_AUTOMATIC_LOGOUT=$pad_config_automatic_logout"
 	ynh_return "YNH_CONFIG_MAIN_PAD_CONFIGURATION_PAD_CONFIG_SKINNAME=$pad_config_skinname"
 
@@ -217,14 +212,6 @@ apply_config() {
 		restart_etherpad=1
 	fi
 
-	# Plugin option ep_page_view_default
-	if [ "$pad_config_pageview" != "$old_pad_config_pageview" ]
-	then
-		ynh_replace_string --match_string="\(\"ep_page_view_default\" *: \).*," --replace_string="\1$pad_config_pageview," --target_file="$config_file"
-		ynh_app_setting_set --app=$app --key=pad_config_pageview --value="$pad_config_pageview"
-		restart_etherpad=1
-	fi
-
     # Plugin option ep_automatic_logut
     if [ "$pad_config_automatic_logout" != "$old_pad_config_automatic_logout" ]
     then
diff --git a/scripts/install b/scripts/install
index b3532a4..bb397e6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -263,8 +263,6 @@ if [ $mypads -eq 1 ]; then
 	# Framapad - Groups and private pads for etherpad
 	npm install ep_mypads@${mypads_version} >> $install_log 2>&1
 fi
-# Framapad - Add support to do 'page view', with a toggle on/off option in Settings, also Page Breaks with Control Enter
-npm install ep_page_view@${ep_page_view_version} >> $install_log 2>&1
 # Framapad - Add support to do 'Spell checking'
 npm install ep_spellcheck@${ep_spellcheck_version} >> $install_log 2>&1
 # Framapad - Add support for Subscript and Superscript

From 2bcef82ae1c570a848d97182dae9b5f236e79695 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Mar 2021 15:27:05 +0100
Subject: [PATCH 05/23] Update check_process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index 2ff2c0f..cf589c4 100644
--- a/check_process
+++ b/check_process
@@ -70,7 +70,7 @@
 		useldap=0
 	; Checks
 		setup_root=1
-		upgrade=1	from_commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
+		upgrade=1	from_commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c
 ;; Test sans export
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
@@ -88,6 +88,6 @@
 Email=
 Notification=change
 ;;; Upgrade options
-	; commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
-		name= Fix nodejs & global update
+	; commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c
+		name= #113
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0&

From 60d9b3683a71b13bbf39d78170e306d1c5e51af4 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 21 Mar 2021 15:43:41 +0100
Subject: [PATCH 06/23] Update check_process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index 335844b..a908e89 100644
--- a/check_process
+++ b/check_process
@@ -69,7 +69,7 @@
 		useldap=0
 	; Checks
 		setup_root=1
-		upgrade=1	from_commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
+		upgrade=1	from_commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c
 ;; Test sans export
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
@@ -87,6 +87,6 @@
 Email=
 Notification=change
 ;;; Upgrade options
-	; commit=8bf300413ec3adcb416d168d2e9e98975dd9405b
-		name= Fix nodejs & global update
+	; commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c
+		name= #113
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0&

From 56ed40026c63570d53d28a8687ce7b14d0b12226 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 24 Mar 2021 19:51:54 +0100
Subject: [PATCH 07/23] 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 <junk.eg@free.fr>
Date: Fri, 2 Apr 2021 23:16:23 +0200
Subject: [PATCH 08/23] 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 <junk.eg@free.fr>
Date: Sat, 3 Apr 2021 15:14:52 +0200
Subject: [PATCH 09/23] 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 <junk.eg@free.fr>
Date: Tue, 13 Apr 2021 20:01:16 +0200
Subject: [PATCH 10/23] 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 <junk.eg@free.fr>
Date: Sun, 18 Apr 2021 15:48:14 +0200
Subject: [PATCH 11/23] 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 <junk.eg@free.fr>
Date: Fri, 23 Apr 2021 23:11:25 +0200
Subject: [PATCH 12/23] 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 <junk.eg@free.fr>
Date: Fri, 23 Apr 2021 23:23:44 +0200
Subject: [PATCH 13/23] 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 <junk.eg@free.fr>
Date: Fri, 23 Apr 2021 23:39:52 +0200
Subject: [PATCH 14/23] 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 <junk.eg@free.fr>
Date: Thu, 29 Apr 2021 19:33:12 +0200
Subject: [PATCH 15/23] 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 <junk.eg@free.fr>
Date: Sat, 1 May 2021 19:45:29 +0200
Subject: [PATCH 16/23] 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 <junk.eg@free.fr>
Date: Sat, 1 May 2021 20:01:32 +0200
Subject: [PATCH 17/23] 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 <junk.eg@free.fr>
Date: Sat, 1 May 2021 20:08:05 +0200
Subject: [PATCH 18/23] 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 <junk.eg@free.fr>
Date: Sun, 2 May 2021 16:14:37 +0200
Subject: [PATCH 19/23] 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 "</div>" | cut -d '-' -f 1)
 	# In order to add a link to mypads plugin.
-	sed -i "$mod_line s@div>@&\n\t<center><br><font size="5"><a href="./mypads/">Mypads</a></font></center>@" $final_path/src/templates/index.html
+	sed -i "$mod_line s@div>@&\n\t<center><br><font size="5"><a href="./mypads/">MyPads</a></font></center>@" $final_path/src/templates/index.html
 fi
 
 #=================================================

From 84fae0d0e5e50ec5d7e7a5055f059941c3bc1ceb Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 2 May 2021 16:28:36 +0200
Subject: [PATCH 20/23] 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 <junk.eg@free.fr>
Date: Sun, 2 May 2021 17:32:41 +0200
Subject: [PATCH 21/23] 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

From cbb580f9d53b26a93cc227b094a24703fc32de6a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 2 May 2021 21:47:39 +0200
Subject: [PATCH 22/23] Update check_process

---
 check_process | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_process b/check_process
index a908e89..5d974b2 100644
--- a/check_process
+++ b/check_process
@@ -1,4 +1,4 @@
-;; Test complet avec libreoffice et mypads
+;; Test complet avec LibreOffice et MyPads
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
@@ -40,7 +40,7 @@
 		change_url=1
         actions=1
         config_panel=1
-;; Test sans mypads
+;; Test sans MyPads
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/path"	(PATH)
@@ -56,7 +56,7 @@
 		setup_root=1
 		upgrade=1
 		backup_restore=1
-;; Test abiword
+;; Test Abiword
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		path="/"	(PATH)

From b6aa56e5c5fa4cd844e819e5d624c6b2094d27dc Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 2 May 2021 22:28:45 +0200
Subject: [PATCH 23/23] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 4455e05..4541af0 100644
--- a/scripts/install
+++ b/scripts/install
@@ -289,7 +289,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 "</div>" | cut -d '-' -f 1)
 	# In order to add a link to mypads plugin.
-	sed -i "$mod_line s@div>@&\n\t<center><br><font size="5"><a href="./mypads/">Mypads</a></font></center>@" $final_path/src/templates/index.html
+	sed -i "$mod_line s@div>@&\n\t<center><br><font size="5"><a href="./mypads/">MyPads</a></font></center>@" $final_path/src/templates/index.html
 fi
 
 #=================================================