From bdd46191f29e70343916fbcc8ae4a80076c1b51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:00:36 +0200 Subject: [PATCH 1/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a62de8b..409a840 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "http://etherpad.org/doc/v1.8.18" code = "https://github.com/ether/etherpad-lite" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = false From 13554ce686a5006245c27e53bbe499e0cb32168f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 15:58:09 +0200 Subject: [PATCH 2/9] Cleaning --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 2 +- doc/POST_INSTALL.md | 4 ++-- doc/POST_INSTALL_fr.md | 3 +++ manifest.toml | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 doc/POST_INSTALL_fr.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md index b5a7637..9a80ecc 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,4 +1,4 @@ -You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__/admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`. +You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`. You can also find a configuration file for Etherpad at this path `__INSTALL_DIR__/settings.json`. *Skin Builder* (accessible at this address `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`. diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index fa3d812..3e62731 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,3 +1,3 @@ -Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__/admin` et pour MyPads par `domain.tld/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`. +Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__admin` et pour MyPads par `__DOMAIN____PATH__/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`. *Skin Builder* (accessible à cette adresse `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`. diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index dfb933b..11d381d 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,3 +1,3 @@ You can access two different admin panels: -- for Etherpad by accessing https://__DOMAIN____PATH__/admin -- for MyPads (if installed) by accessing https://__DOMAIN____PATH__/mypads/?/admin +- for Etherpad by accessing https://__DOMAIN____PATH__admin +- for MyPads (if installed) by accessing https://__DOMAIN____PATH__mypads/?/admin diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..1840905 --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1,3 @@ +Vous pouvez accéder à deux panneaux d'administration différents : +- pour Etherpad en accédant à https://__DOMAIN____PATH__admin +- pour MyPads (si installé) en accédant à https://__DOMAIN____PATH__mypads/?/admin diff --git a/manifest.toml b/manifest.toml index 409a840..056af57 100644 --- a/manifest.toml +++ b/manifest.toml @@ -92,11 +92,11 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - + api.show_tile = false admin.url = "/admin" admin.auth_header = false - api.show_tile = false admin.allowed = ["admins"] + admin.show_tile = false [resources.apt] packages = "mariadb-server" From 2c312ba38fa61a4b36c23964f9651a8f4a12c201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:26:46 +0200 Subject: [PATCH 3/9] fix --- manifest.toml | 6 +++--- scripts/_common.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index 056af57..285c1ec 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.8.18~ynh3" +version = "1.9.0~ynh1" maintainers = [] @@ -80,8 +80,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/1.8.18.tar.gz" - sha256 = "67ccc0bac94e146b26fbddcf8330e0f543a4ff82213c420a376644614a7ff2c4" + url = "https://github.com/ether/etherpad-lite/archive/1.9.0.tar.gz" + sha256 = "552ada23d880a875238ba5f411ac873913d059ef6c82a087f9c021b849dcaa6b" autoupdate.strategy = "latest_github_tag" [resources.system_user] diff --git a/scripts/_common.sh b/scripts/_common.sh index b3861a7..1875ecf 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # NodeJS version -nodejs_version=14 +nodejs_version=16 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. From c7fb0269f04e75707e3bc6cffd1f4c8b8bc032a6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 20 Jun 2023 15:26:51 +0000 Subject: [PATCH 4/9] 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 6c120c8..9130e7b 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Shipped version:** 1.8.18~ynh3 +**Shipped version:** 1.9.0~ynh1 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 5b51c1d..d3082a2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.8.18~ynh3 +**Version incluse :** 1.9.0~ynh1 **Démo :** https://video.etherpad.com From 5f2a8f1a1f7ef9f925eac03f69c0f3f4b76c1061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:27:25 +0200 Subject: [PATCH 5/9] Update tests.toml --- tests.toml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests.toml b/tests.toml index 1d984ce..049b456 100644 --- a/tests.toml +++ b/tests.toml @@ -18,20 +18,20 @@ test_format = 1.0 # This is an additional test suite -[without_mypads] - args.export = "libreoffice" - args.mypads = 0 - args.useldap = 0 - only = ["install.root"] +#[without_mypads] +# args.export = "libreoffice" +# args.mypads = 0 +# args.useldap = 0 +# only = ["install.root"] -[with_abiword] - args.export = "abiword" - args.mypads = 1 - args.useldap = 1 - only = ["install.root"] +#[with_abiword] +# args.export = "abiword" +# args.mypads = 1 +# args.useldap = 1 +# only = ["install.root"] -[without_export] - args.export = "none" - args.mypads = 1 - args.useldap = 0 - only = ["install.root"] +#[without_export] +# args.export = "none" +# args.mypads = 1 +# args.useldap = 0 +# only = ["install.root"] From 9b689817418c3f1c0343377e863c627c6c87096f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:29:52 +0200 Subject: [PATCH 6/9] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 285c1ec..e87229a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ code = "https://github.com/ether/etherpad-lite" [integration] yunohost = ">= 11.1.21" -architectures = "all" +architectures = ["arm64", "amd64"] multi_instance = true ldap = false sso = false From 70e468e5d6e76c188d3688ec7e07fac5d1ac289d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:30:51 +0200 Subject: [PATCH 7/9] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index e87229a..da4038b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,7 +13,7 @@ maintainers = [] license = "Apache-2.0" website = "http://etherpad.org" demo = "https://video.etherpad.com" -admindoc = "http://etherpad.org/doc/v1.8.18" +admindoc = "http://etherpad.org/doc/v1.9.0" code = "https://github.com/ether/etherpad-lite" [integration] @@ -45,7 +45,7 @@ ram.runtime = "50M" ask.fr = "Choisissez la langue" type = "string" choices = ["ca", "de", "en", "es", "fr", "gl", "hu", "it", "nl", "pt"] - default = "en" + default = "fr" [install.admin] type = "user" From c2af51bbd3149595d226fadf8226b56cf10b843a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 20 Jun 2023 17:58:41 +0200 Subject: [PATCH 8/9] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1875ecf..b3861a7 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # NodeJS version -nodejs_version=16 +nodejs_version=14 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. From 59875922ba0cf4ab9d40103a7a9781aba785b8d4 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 20 Jun 2023 15:58:46 +0000 Subject: [PATCH 9/9] 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 9130e7b..1c2b833 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ This version of Etherpad is preconfigured with a collection of plugins: ## Documentation and resources * Official app website: -* Official admin documentation: +* Official admin documentation: * Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index d3082a2..e94d1b4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -46,7 +46,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: ## Documentations et ressources * Site officiel de l’app : -* Documentation officielle de l’admin : +* Documentation officielle de l’admin : * Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug :