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 diff --git a/CHANGELOG.md b/CHANGELOG.md index ba78c12..fe4cc93 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/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 #### Changed diff --git a/README.md b/README.md index 4d91716..14cb7a5 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 @@ -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 32ef35a..412c8cb 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 @@ -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 diff --git a/check_process b/check_process index 91c1924..3b4de7c 100644 --- a/check_process +++ b/check_process @@ -66,7 +66,7 @@ useldap=0 ; Checks setup_root=1 - upgrade=1 from_commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c + upgrade=1 from_commit=b7815983353a5409d473618f21107b4c621b9858 ;; Test sans export ; Manifest domain="domain.tld" @@ -84,6 +84,6 @@ Email= Notification=change ;;; Upgrade options - ; commit=978e77403a6d8e9512ec1f5203e9834e945c2d8c - name= #113 + ; commit=b7815983353a5409d473618f21107b4c621b9858 + name= #159 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=password&language=en&is_public=1&abiword=0& diff --git a/conf/app.src b/conf/app.src index 86caea3..e224fe6 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=3b51eb0259764669dedfb4d13cdbe8d4a2dea37735fe32941aac39b5def9f99b SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true 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 diff --git a/manifest.json b/manifest.json index eb0bb41..6617cf9 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,13 @@ "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", "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", diff --git a/scripts/_common.sh b/scripts/_common.sh index 3805ec3..8144f6b 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,19 +18,18 @@ nodejs_version=14 mypads_version=1.7.22 # Plugin versions -ep_align_version=0.3.43 -ep_author_hover_version=0.3.29 -ep_comments_page_version=0.1.84 +ep_align_version=0.3.49 +ep_author_hover_version=0.3.35 +ep_comments_page_version=0.1.98 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_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_delete_empty_pads_version=0.0.8 +ep_font_color_version=0.0.60 +ep_headings2_version=0.2.42 +ep_markdown_version=0.1.49 +ep_spellcheck_version=0.0.42 +ep_subscript_and_superscript_version=0.2.43 +ep_table_of_contents_version=0.3.39 +ep_font_size_version=0.4.41 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 8f16630..04529d0 100644 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH admin=$YNH_APP_ARG_ADMIN -password=$YNH_APP_ARG_PASSWORD +password="$YNH_APP_ARG_PASSWORD" language=$YNH_APP_ARG_LANGUAGE is_public=$YNH_APP_ARG_IS_PUBLIC export=$YNH_APP_ARG_EXPORT @@ -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 @@ -345,9 +345,6 @@ fi echo "$Informations You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. -You can configure this app easily by using the experimental config-panel feature $admin_panel/config-panel. -You can also find some specific actions for this app by using the experimental action feature $admin_panel/actions. - If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh" > mail_to_send ynh_send_readme_to_admin --app_message="mail_to_send" --recipients="$admin" --type=install diff --git a/scripts/upgrade b/scripts/upgrade index 87dfd3d..8abbd9a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -501,9 +501,6 @@ fi echo "$Informations You can also find a config file for Etherpad at this path /var/www/etherpad_mypads/settings.json. -You can configure this app easily by using the experimental config-panel feature $admin_panel/config-panel. -You can also find some specific actions for this app by using the experimental action feature $admin_panel/actions. - If you are facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/etherpad_mypads_ynh ---