From 27448f6d506e9c0c1804221968ccc16428a5abf7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 4 Apr 2023 18:51:56 +0200 Subject: [PATCH 1/6] source autoupdate: force version format because upstream doesnt have proper versioning ... --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 999211b..47bb915 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,8 +41,8 @@ ram.runtime = "50M" [resources.sources.main] url = "https://github.com/Indexhibit/indexhibit/archive/fb0ac9e0771745c2c555a0c2fb25b32930592d17.tar.gz" sha256 = "4520cfa7e1636211f75f1977c05619d8f8926ea4557152bf9bf35a39044b9150" - autoupdate.upstream = "https://github.com/Indexhibit/indexhibit" autoupdate.strategy = "latest_github_commit" + autoupdate.force_version = "2.1.%Y.%m.%d" [resources.system_user] From 36bdf34717813f801b7568ed8ea761f2d48fe092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 May 2023 09:04:30 +0200 Subject: [PATCH 2/6] fix --- doc/DESCRIPTION_fr.md | 2 ++ doc/POST_INSTALL._fr.md | 10 ++++++++++ manifest.toml | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md create mode 100644 doc/POST_INSTALL._fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..c02b778 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1,2 @@ +Indexhibit est un système de gestion de contenu (CMS) pionnier et influent basé sur le Web, fondé en 2006 par Jeffery Vaska et Daniel Eatock, qui est principalement utilisé pour créer des portfolios en ligne (image, texte et vidéo). +Il s'adresse aux créateurs indépendants d'esprit, universitaires, chercheurs, étudiants, collectionneurs, etc., qui souhaitent apprendre et gérer la présentation visuelle de leurs œuvres, à leur manière, selon leurs propres capacités. \ No newline at end of file diff --git a/doc/POST_INSTALL._fr.md b/doc/POST_INSTALL._fr.md new file mode 100644 index 0000000..e8c6d4e --- /dev/null +++ b/doc/POST_INSTALL._fr.md @@ -0,0 +1,10 @@ +Post-installation : `http://__DOMAIN____PATH__/ndxzstudio/install.php` pour terminer l'installation. + +Terminez le processus d'enregistrement à partir de la page de configuration affichée +Détails de la base de données MySQL à saisir lors du processus d'inscription : + +Connexion à la base de données : __BD_USER__ +Nom de la base de données : __BD_NAME__ +Mot de passe de la base de données : __BD_PWD__ + +Zone d'administration : `http://__DOMAIN____PATH__/ndxz-studio` \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 47bb915..26486bc 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Indexhibit" description.en = "Archetypal portfolio CMS for everybody" description.fr = "CMS de portfolio archétypal pour tout le monde" -version = "2.1.6~ynh1" +version = "2.1.6~ynh2" maintainers = [ "eric_G" ] @@ -16,7 +16,7 @@ admindoc = "https://forum.indexhibit.org/tutorials/getting-started/installation/ code = "https://github.com/Indexhibit/indexhibit" [integration] -yunohost = ">= 11.1.15" +yunohost = ">= 11.1.19" architectures = "all" multi_instance = true ldap = false @@ -39,8 +39,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/Indexhibit/indexhibit/archive/fb0ac9e0771745c2c555a0c2fb25b32930592d17.tar.gz" - sha256 = "4520cfa7e1636211f75f1977c05619d8f8926ea4557152bf9bf35a39044b9150" + url = "https://github.com/Indexhibit/indexhibit/archive/533900856ae0887a054f26f207d3ba466a986ab1.tar.gz" + sha256 = "1022cb6594fe20dc9945c8425faff955715008c086a709ffb475abe671cb9589" autoupdate.strategy = "latest_github_commit" autoupdate.force_version = "2.1.%Y.%m.%d" From e44dbadca42a6732db371b9d7bf2fe0d5f489f42 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 12 May 2023 07:04:34 +0000 Subject: [PATCH 3/6] Auto-update README --- README.md | 2 +- README_fr.md | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ff1e7bd..a7bd0dd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Indexhibit is a pioneering, influential, web-based content management system (CM It is intended for independent-minded creators, academics, researchers, students, collectors, et al., who wish to learn how and manage the visual display of their works, on their own terms, according to their own abilities. -**Shipped version:** 2.1.6~ynh1 +**Shipped version:** 2.1.6~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 4b32412..a4523ad 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,11 +16,10 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Indexhibit is a pioneering, influential, web-based content management system (CMS), founded in 2006 by Jeffery Vaska and Daniel Eatock, which is used primarily to create online portfolios (image, text and video). -It is intended for independent-minded creators, academics, researchers, students, collectors, et al., who wish to learn how and manage the visual display of their works, on their own terms, according to their own abilities. +Indexhibit est un système de gestion de contenu (CMS) pionnier et influent basé sur le Web, fondé en 2006 par Jeffery Vaska et Daniel Eatock, qui est principalement utilisé pour créer des portfolios en ligne (image, texte et vidéo). +Il s'adresse aux créateurs indépendants d'esprit, universitaires, chercheurs, étudiants, collectionneurs, etc., qui souhaitent apprendre et gérer la présentation visuelle de leurs œuvres, à leur manière, selon leurs propres capacités. - -**Version incluse :** 2.1.6~ynh1 +**Version incluse :** 2.1.6~ynh2 ## Captures d’écran From 6d6153f554892de941a4d9e37f46234bd172b9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 May 2023 09:11:59 +0200 Subject: [PATCH 4/6] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e7970c8..38cb105 100755 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -mkdir $install_dir/files/dimgs +#mkdir $install_dir/files/dimgs chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From dcdeafd2f129ee59e672ca84156dbaff7640f949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 May 2023 09:20:03 +0200 Subject: [PATCH 5/6] fix --- doc/POST_INSTALL._fr.md | 6 +++--- doc/POST_INSTALL.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/POST_INSTALL._fr.md b/doc/POST_INSTALL._fr.md index e8c6d4e..02c53eb 100644 --- a/doc/POST_INSTALL._fr.md +++ b/doc/POST_INSTALL._fr.md @@ -3,8 +3,8 @@ Post-installation : `http://__DOMAIN____PATH__/ndxzstudio/install.php` pour ter Terminez le processus d'enregistrement à partir de la page de configuration affichée Détails de la base de données MySQL à saisir lors du processus d'inscription : -Connexion à la base de données : __BD_USER__ -Nom de la base de données : __BD_NAME__ -Mot de passe de la base de données : __BD_PWD__ +Connexion à la base de données : __DB_USER__ +Nom de la base de données : __DB_NAME__ +Mot de passe de la base de données : __DB_PWD__ Zone d'administration : `http://__DOMAIN____PATH__/ndxz-studio` \ No newline at end of file diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 0070c2f..7c7285d 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -3,9 +3,9 @@ Post install: `http://__DOMAIN____PATH__/ndxzstudio/install.php` to finish the i Complete the registration process from the setup page displayed Details for MySQL database to be enterted while registration process: -Database login: __BD_USER__ -Database name: __BD_NAME__ -Database password: __BD_PWD__ +Database login: __DB_USER__ +Database name: __DB_NAME__ +Database password: __DB_PWD__ Admin area: `http://__DOMAIN____PATH__/ndxz-studio` From 55cd3e0f9e26b31ed2746b7c9420b8a1ff894a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 May 2023 09:35:45 +0200 Subject: [PATCH 6/6] Update install --- scripts/install | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/install b/scripts/install index 38cb105..7064700 100755 --- a/scripts/install +++ b/scripts/install @@ -17,8 +17,6 @@ ynh_script_progression --message="Setting up source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#mkdir $install_dir/files/dimgs - chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"