From 57637786a3e9d8c7ea1e6ce88dfa737d76d5f794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 13 Aug 2023 22:32:03 +0200 Subject: [PATCH] Testing (#67) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Small fixes * 1.7.0 (#4) * Upgrde to v.1.7.0 * Set requirements to 3.8.1 * Update README.md * Upgrade to 1.7.1 (#6) * Add limitations * Avoid to buid frontend bundle * Remove PostegrSQL warning * Update README.md Add you should reload service for changes in config to be registered. * Add restart systemd tuto * Change version * Finding an available port * Upgrade to version 1.7.2 (#12) * Patch (#17) * Cleaning up * Update manifest.json * Cleaning up * Secure config file * Remove yarn * Update change_url * Update change_url * Revert "Remove yarn" This reverts commit a8cabf0c0addf8f9c4569b27ae04512db5c93df0. * Update change_url * Update systemd.service * Update systemd.service * Cleaning up * Fix * fix badges * Upgrade to version 1.8.0 (#21) * Upgrade to version 1.8.0 * Upgrade to 1.8.0 * Upgrade to 1.8.0 * Upgrade to version 1.8.1 * [autopatch] Update issue and PR templates (#25) Co-authored-by: Yunohost-Bot <> * Add templates * Upgrade to 1.8.2 * Update check_process * Add templates * Auto-update README * Set new requirements (#28) * Fix * Simplify config * Auto-update README Co-authored-by: Yunohost-Bot <> * Update manifest.json * Auto-update README * 1.9.0 (#31) * 1.9.0 * Update manifest.json * Auto-update README * Systemd hardening (#33) * Update systemd.service * Update app.src * Update manifest.json * 1.9.1 (#34) * Upgrade to 1.9.1 * 1.9.2 (#36) * Remove replace_string * Fix (#39) * Update manifest.json * Auto-update README * Update config.json.example * Update config.json.example * 1.9.3 * Auto-update README * 1.9.4 (#42) * 1.9.4 * Auto-update README Co-authored-by: yunohost-bot * Auto-update README * Update manifest.json * Update _common.sh * set relative path for --keep opt * Update manifest.json * Auto-update README * 1.9.5 * Auto-update README * 1.9.6 * Auto-update README * Add more security as default (#47) * Add more security as default * Auto-update README * Update config.json.example * Update change_url Co-authored-by: yunohost-bot * Update manifest.json * Auto-update README * Update install * Fix * Add allow free url to config panel * Add FreeURL authentication * Update config.json.example * Fix * remove yarn cache * Auto-update README * 1.9.7 * Auto-update README * Update change_url * Update systemd.service * Update systemd.service * Update install * FIx * Update manifest.json * Auto-update README * Update manifest.json * Version 2 (#58) * v2 * fix * Auto-update README * Update manifest.toml * fix * Update install * Update upgrade * Update change_url * Update install * fix * Auto-update README * Fix * Auto-update README * Fix * fix * Update manifest.toml * fix * fix * Auto-update README * Update tests.toml --------- Co-authored-by: yunohost-bot * cleaning * 1.9.8 * Auto-update README * Update config_panel.toml * Build (#63) * Update install * cleaning * Update manifest.toml * Update manifest.toml * Auto-update README * cleaning * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Create DESCRIPTION_fr.md * Auto-update README * Update DESCRIPTION.md * Auto-update README * fix config_panel (#68) * Upgrade to v1.9.9 * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * fix config_panel --------- Co-authored-by: yunohost-bot Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> * Auto-update README --------- Co-authored-by: Eauchat <34686393+eauchat@users.noreply.github.com> Co-authored-by: Alexandre Aubin Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: yunohost-bot Co-authored-by: yalh76 Co-authored-by: lapineige --- README.md | 4 ++-- README_fr.md | 20 ++++++++++---------- config_panel.toml | 10 +++++----- doc/DESCRIPTION.md | 3 +-- doc/DESCRIPTION_fr.md | 11 +++++++++++ manifest.toml | 12 ++++++------ scripts/install | 2 +- scripts/upgrade | 2 +- 8 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/README.md b/README.md index 49163e3..26883f4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview HedgeDoc (formerly known as CodiMD) is an open-source, web-based, self-hosted, collaborative markdown editor. - You can use it to easily collaborate on notes, graphs and even presentations in real-time. All you need to do is to share your note-link to your co-workers and they’re ready to go. ### Features @@ -29,7 +28,8 @@ You can use it to easily collaborate on notes, graphs and even presentations in - Easy to use permission system - Low system requirements -**Shipped version:** 1.9.8~ynh2 + +**Shipped version:** 1.9.9~ynh1 **Demo:** https://demo.hedgedoc.org/ diff --git a/README_fr.md b/README_fr.md index f45dc84..ab2d284 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,20 +16,20 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -HedgeDoc (formerly known as CodiMD) is an open-source, web-based, self-hosted, collaborative markdown editor. +HedgeDoc (anciennement connu sous le nom de CodiMD) est un éditeur open source, basé sur le Web, auto-hébergé et collaboratif. +Vous pouvez l'utiliser pour collaborer facilement sur des notes, des graphiques et même des présentations en temps réel. Tout ce que vous avez à faire est de partager votre lien de note avec vos collègues et ils sont prêts à partir. -You can use it to easily collaborate on notes, graphs and even presentations in real-time. All you need to do is to share your note-link to your co-workers and they’re ready to go. +### Caractéristiques -### Features +- Collaboration en temps réel +- Graphiques et diagrammes +- Révisions +- Mode présentation +- Système d'autorisation facile à utiliser +- Faible configuration système requise -- Real-time collaboration -- Graphs & diagrams -- Revisions -- Presentation mode -- Easy to use permission system -- Low system requirements -**Version incluse :** 1.9.8~ynh2 +**Version incluse :** 1.9.9~ynh1 **Démo :** https://demo.hedgedoc.org/ diff --git a/config_panel.toml b/config_panel.toml index 3c374e5..535c889 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -13,7 +13,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Set to allow anonymous usage (default is true)." - bind = "allow_anonymous:__INSTALL_DIR__/config.json" + bind = "allowAnonymous:__INSTALL_DIR__/config.json" [main.config.allow_anonymous_edits] ask = "Allow anonymous edits" @@ -21,7 +21,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Allow users to select freely permission, allowing guests to edit existing notes." - bind = "allow_anonymous_edits:__INSTALL_DIR__/config.json" + bind = "allowAnonymousEdits:__INSTALL_DIR__/config.json" [main.config.allow_email_registration] @@ -30,7 +30,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Set to allow registration of new accounts using an email address. If set to false, you can still create accounts using the command line." - bind = "allow_email_registration:__INSTALL_DIR__/config.json" + bind = "allowEmailRegister:__INSTALL_DIR__/config.json" [main.config.allow_free_url] ask = "Allow new note creation" @@ -38,7 +38,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Set to allow new note creation by accessing a nonexistent note URL. This is the behavior familiar from Etherpad." - bind = "allow_free_url:__INSTALL_DIR__/config.json" + bind = "allowFreeURL:__INSTALL_DIR__/config.json" [main.config.require_free_url_authentication] ask = "Require FreeURL authentication" @@ -46,7 +46,7 @@ services = ["__APP__"] yes = "true" no = "false" help = "Set to require authentication for FreeURL mode style note creation." - bind = "require_free_url_authentication:__INSTALL_DIR__/config.json" + bind = "requireFreeURLAuthentication:__INSTALL_DIR__/config.json" diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 98d04c5..f90c88a 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,5 +1,4 @@ HedgeDoc (formerly known as CodiMD) is an open-source, web-based, self-hosted, collaborative markdown editor. - You can use it to easily collaborate on notes, graphs and even presentations in real-time. All you need to do is to share your note-link to your co-workers and they’re ready to go. ### Features @@ -9,4 +8,4 @@ You can use it to easily collaborate on notes, graphs and even presentations in - Revisions - Presentation mode - Easy to use permission system -- Low system requirements \ No newline at end of file +- Low system requirements diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..974588d --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,11 @@ +HedgeDoc (anciennement connu sous le nom de CodiMD) est un éditeur open source, basé sur le Web, auto-hébergé et collaboratif. +Vous pouvez l'utiliser pour collaborer facilement sur des notes, des graphiques et même des présentations en temps réel. Tout ce que vous avez à faire est de partager votre lien de note avec vos collègues et ils sont prêts à partir. + +### Caractéristiques + +- Collaboration en temps réel +- Graphiques et diagrammes +- Révisions +- Mode présentation +- Système d'autorisation facile à utiliser +- Faible configuration système requise diff --git a/manifest.toml b/manifest.toml index 750997c..bc6630c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "HedgeDoc" description.en = "Collaborative editor to work on notes written in Markdown" description.fr = "Éditeur collaboratif pour travailler sur des notes en Markdown" -version = "1.9.8~ynh2" +version = "1.9.9~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ admindoc = "https://docs.hedgedoc.org/" code = "https://github.com/hedgedoc/hedgedoc" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -35,8 +35,8 @@ ram.runtime = "50M" default = "/hedgedoc" [install.init_main_permission] - help.en = "If enabled, HedgeDoc will be accessible by people who do not have an account. This can be changed later via the webadmin." - help.fr = "Si cette case est cochée, HedgeDoc sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." + help.en = "Set to visitors, HedgeDoc will be accessible by people who do not have an account. This can be changed later via the webadmin." + help.fr = "Défini sur visiteurs, HedgeDoc sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." type = "group" default = "visitors" @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/hedgedoc/hedgedoc/releases/download/1.9.8/hedgedoc-1.9.8.tar.gz" - sha256 = "dca402c47804b7b2ac0a2bcf715b8e570a9e617c87c150f5ff2a2b35b764c349" + url = "https://github.com/hedgedoc/hedgedoc/releases/download/1.9.9/hedgedoc-1.9.9.tar.gz" + sha256 = "1769d30e60458040475a6d74f53952101962c40c390765e19e6ff6f3fe70c008" autoupdate.strategy = "latest_github_tag" [resources.ports] diff --git a/scripts/install b/scripts/install index 8f60b36..9fe7c03 100644 --- a/scripts/install +++ b/scripts/install @@ -64,7 +64,7 @@ yunohost service add $app --description="Collaborative Markdown editor" --log="/ #============================================== # INSTALL HEDGEDOC #============================================== -ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=20 +ynh_script_progression --message="Building HedgeDoc... (this will take some time and resources!)" --weight=10 pushd "$install_dir" ynh_use_nodejs diff --git a/scripts/upgrade b/scripts/upgrade index 986d06a..0a3c74e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -88,7 +88,7 @@ yunohost service add $app --description="Collaborative Markdown editor" --log="/ if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=20 + ynh_script_progression --message="Building $app... (this will take some time and resources!)" --weight=10 pushd "$install_dir" ynh_secure_remove /usr/local/share/.cache/yarn