From b95b25e6f708a489d8f50bdfd9ac09ce4c94f70c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 8 Aug 2021 21:22:51 +0200 Subject: [PATCH 1/7] Fix linter warnings --- manifest.json | 2 +- scripts/upgrade | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 421be56..9161e71 100644 --- a/manifest.json +++ b/manifest.json @@ -22,7 +22,7 @@ "email": "win10@tutanota.com" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade b/scripts/upgrade index 8e70bb2..c34acf7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) From 6056eecee8542c8c2e2899e29d3cf3fbcd031533 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 8 Aug 2021 23:40:28 +0200 Subject: [PATCH 2/7] Update manifest.json --- manifest.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 9161e71..c62f31b 100644 --- a/manifest.json +++ b/manifest.json @@ -3,17 +3,15 @@ "id": "concrete5", "packaging_format": 1, "description": { - "en": "Create a modern Website", - "fr": "Créer un site web moderne avec un CMS moderne" + "en": "Open Source Content Management System for Teams", + "fr": "Système de gestion de contenu Open Source pour les équipes" }, "version": "8.5.2~ynh2", "url": "www.concrete5.org", "upstream": { "license": "MIT", "website": "https://www.concrete5.org/", - "demo": "https://demo.example.com", "admindoc": "https://documentation.concrete5.org/", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/concrete5/concrete5" }, "license": "MIT", @@ -66,10 +64,6 @@ { "name": "password", "type": "password", - "ask": { - "en": "Set the administrator password", - "fr": "Définissez le mot de passe administrateur" - }, "example": "Choose a password" }, { From e16b914abaed48e50d487365f725c34916d50951 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 8 Aug 2021 21:40:35 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 5 ++--- README_fr.md | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bcf2158..7a426ef 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Create a modern Website +Open Source Content Management System for Teams **Shipped version:** 8.5.2~ynh2 -**Demo:** https://demo.example.com + ## Disclaimers / important information @@ -29,7 +29,6 @@ Create a modern Website ## Documentation and resources * Official app website: https://www.concrete5.org/ -* Official user documentation: https://yunohost.org/apps * Official admin documentation: https://documentation.concrete5.org/ * Upstream app code repository: https://github.com/concrete5/concrete5 * YunoHost documentation for this app: https://yunohost.org/app_concrete5 diff --git a/README_fr.md b/README_fr.md index 3eaa019..f0aeeb4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,11 +11,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Créer un site web moderne avec un CMS moderne +Système de gestion de contenu Open Source pour les équipes **Version incluse :** 8.5.2~ynh2 -**Démo :** https://demo.example.com + ## Avertissements / informations importantes @@ -25,7 +25,6 @@ Créer un site web moderne avec un CMS moderne ## Documentations et ressources * Site officiel de l'app : https://www.concrete5.org/ -* Documentation officielle utilisateur : https://yunohost.org/apps * Documentation officielle de l'admin : https://documentation.concrete5.org/ * Dépôt de code officiel de l'app : https://github.com/concrete5/concrete5 * Documentation YunoHost pour cette app : https://yunohost.org/app_concrete5 From 7e3c659adcbbfddd150a5f277bdbb6f99798e58d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 9 Aug 2021 10:59:19 +0200 Subject: [PATCH 4/7] 8.5.5 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index c258c04..4cfb909 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/concrete5/concrete5/archive/8.5.2.tar.gz -SOURCE_SUM=60c290faba9ecece8bc61bbec485e0bd1697af58f9e6f247eceb2241bfa2f75a +SOURCE_URL=https://github.com/concrete5/concrete5/archive/8.5.5.tar.gz +SOURCE_SUM=e1cf84110f625e3ac27c227eb697c59694eb6fdaa12e8ce92c7b3fb79c5b09f4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c62f31b..d0f0699 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Content Management System for Teams", "fr": "Système de gestion de contenu Open Source pour les équipes" }, - "version": "8.5.2~ynh2", + "version": "8.5.5~ynh1", "url": "www.concrete5.org", "upstream": { "license": "MIT", From b5866869f90d11227a1cb2ca5442f391980bebe0 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 9 Aug 2021 08:59:28 +0000 Subject: [PATCH 5/7] 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 7a426ef..c83fbfa 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Open Source Content Management System for Teams -**Shipped version:** 8.5.2~ynh2 +**Shipped version:** 8.5.5~ynh1 diff --git a/README_fr.md b/README_fr.md index f0aeeb4..4ca76b1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Système de gestion de contenu Open Source pour les équipes -**Version incluse :** 8.5.2~ynh2 +**Version incluse :** 8.5.5~ynh1 From faec801726409e9918b7067e47cd7aedecf4328e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 14 Aug 2021 16:57:27 +0200 Subject: [PATCH 6/7] Fix check upgrade --- check_process | 1 - 1 file changed, 1 deletion(-) diff --git a/check_process b/check_process index 93410ea..d3d2f83 100644 --- a/check_process +++ b/check_process @@ -27,4 +27,3 @@ Notification=none ;;; Upgrade options ; commit=7c7c41cbc261757781e420004186012b5f455f67 name=8.5.2~ynh1 - manifest_arg=domain=DOMAIN&path=PATH&admin_name=USER&language=fr_FR&is_public=1&admin_pass=1Strong-Password&website_title=666& From f13d08323da5bf5314f17042c3d345c4dd245d1d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 14 Aug 2021 21:28:04 +0200 Subject: [PATCH 7/7] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index d3d2f83..e31584a 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,7 @@ setup_public=1 upgrade=1 # 8.5.2~ynh1 - upgrade=1 from_commit=7c7c41cbc261757781e420004186012b5f455f67 + # upgrade=1 from_commit=7c7c41cbc261757781e420004186012b5f455f67 backup_restore=1 multi_instance=1 port_already_use=0