From 2f92afdcc4ddb41ca30009846cd4224a945d265c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:00:37 +0200 Subject: [PATCH 1/7] cleaning --- doc/POST_INSTALL_fr.md | 8 ++++++++ scripts/upgrade | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 doc/POST_INSTALL_fr.md diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..7600187 --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1,8 @@ +Connectez-vous maintenant à Joplin + - URL : https://__DOMAIN____PATH__ + - E-mail : __ADMIN_MAIL__ + - Mot de passe : __ADMIN_PASS__ + +Ensuite, vous pouvez modifier le mot de passe par défaut sur cette page : https://__DOMAIN____PATH__/admin/users + +Téléchargez ensuite l'une de ces applications Joplin et configurez la synchronisation avec votre serveur : https://joplinapp.org/help/install/ \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 6290422..d5d5715 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,7 +49,6 @@ pushd $install_dir/packages/server ynh_secure_remove .yarn/berry popd - #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= From 469d2bc083705088881df84df3a22fcb949ab5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:03:50 +0200 Subject: [PATCH 2/7] 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 c661840..862e7c0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=18 +nodejs_version=22 #================================================= # PERSONAL HELPERS From c45c2c102ef8f7e6af281ce03f273899d429ae7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:22:08 +0200 Subject: [PATCH 3/7] cleaning --- conf/systemd.service | 1 - doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 541af5e..559ff9c 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,6 @@ Group=__APP__ Environment="__YNH_NODE_LOAD_PATH__" EnvironmentFile=__INSTALL_DIR__/.env - WorkingDirectory=__INSTALL_DIR__/ ExecStart=/usr/bin/yarn __INSTALL_DIR__/packages/server start diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 9a219a3..75c76a2 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. \ No newline at end of file +Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 0d51b1f..3321ebf 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -Joplin est une application gratuite et open source de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown. \ No newline at end of file +Joplin server est une application de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown. \ No newline at end of file From c4016b63fb2a820754e89ec32540066933b02335 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Jun 2024 07:22:13 +0000 Subject: [PATCH 4/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e935ead..51d1a30 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ It shall NOT be edited by hand. ## Overview -Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. +Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. **Shipped version:** 3.0.9~ynh1 diff --git a/README_es.md b/README_es.md index ac3eea0..d61b23d 100644 --- a/README_es.md +++ b/README_es.md @@ -16,7 +16,7 @@ No se debe editar a mano. ## Descripción general -Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. +Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. **Versión actual:** 3.0.9~ynh1 diff --git a/README_eu.md b/README_eu.md index 159e55c..661e9e8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -16,7 +16,7 @@ EZ editatu eskuz. ## Aurreikuspena -Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. +Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. **Paketatutako bertsioa:** 3.0.9~ynh1 diff --git a/README_fr.md b/README_fr.md index 14991dc..4fc01e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Il NE doit PAS être modifié à la main. ## Vue d’ensemble -Joplin est une application gratuite et open source de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown. +Joplin server est une application de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown. **Version incluse :** 3.0.9~ynh1 diff --git a/README_gl.md b/README_gl.md index 3fc0f56..04161a9 100644 --- a/README_gl.md +++ b/README_gl.md @@ -16,7 +16,7 @@ NON debe editarse manualmente. ## Vista xeral -Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. +Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. **Versión proporcionada:** 3.0.9~ynh1 diff --git a/README_zh_Hans.md b/README_zh_Hans.md index aa9f333..b9116c2 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -16,7 +16,7 @@ ## 概况 -Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. +Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. **分发版本：** 3.0.9~ynh1 From ade606b455b85747d43704f075eb461a361b92e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:36:05 +0200 Subject: [PATCH 5/7] 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 862e7c0..38a471e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=22 +nodejs_version=20 #================================================= # PERSONAL HELPERS From 7623d2ee73b0342667acefda02fca4e714b7a40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 17 Jun 2024 21:59:47 +0200 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 40b20af..0bf6dfe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Joplin" description.en = "Note taking and to-do application with synchronisation capabilities" description.fr = "Application de prise de notes et de tâches avec capacités de synchronisation" -version = "3.0.9~ynh1" +version = "3.0.9~ynh2" maintainers = ["eric_G"] @@ -67,6 +67,7 @@ ram.runtime = "280M" [resources.apt] packages = "postgresql, postgresql-client, python3-bcrypt, rsync" + extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" extras.yarn.packages = "yarn" From cb73421b6099a991d028910b333cf713cfa6a819 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 17 Jun 2024 19:59:51 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 51d1a30..2167c52 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Shipped version:** 3.0.9~ynh1 +**Shipped version:** 3.0.9~ynh2 ## Screenshots diff --git a/README_es.md b/README_es.md index d61b23d..0a1483c 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Versión actual:** 3.0.9~ynh1 +**Versión actual:** 3.0.9~ynh2 ## Capturas diff --git a/README_eu.md b/README_eu.md index 661e9e8..ef8cab6 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Paketatutako bertsioa:** 3.0.9~ynh1 +**Paketatutako bertsioa:** 3.0.9~ynh2 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 4fc01e4..5fecbad 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Joplin server est une application de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown. -**Version incluse :** 3.0.9~ynh1 +**Version incluse :** 3.0.9~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 04161a9..7a22a71 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Versión proporcionada:** 3.0.9~ynh1 +**Versión proporcionada:** 3.0.9~ynh2 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index b9116c2..17850e8 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Joplin server is a note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**分发版本：** 3.0.9~ynh1 +**分发版本：** 3.0.9~ynh2 ## 截图