From ae3aa9e1992d9cf16a166473ecf97ed492cb6610 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:17:16 +0200 Subject: [PATCH] Testing (#63) * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Update config-dist.php * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README --------- Co-authored-by: Tagada <36127788+Tagadda@users.noreply.github.com> Co-authored-by: yunohost-bot --- README.md | 2 +- README_fr.md | 2 +- conf/config-dist.php | 14 ++++++++++---- manifest.toml | 7 +++---- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c341061..2d4a037 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in grocy is a web-based self-hosted groceries & household management solution for your home. -**Shipped version:** 4.0.1~ynh1 +**Shipped version:** 4.0.2~ynh1 **Demo:** https://en.demo.grocy.info/stockoverview diff --git a/README_fr.md b/README_fr.md index 18c621a..40b8904 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po grocy is a web-based self-hosted groceries & household management solution for your home. -**Version incluse :** 4.0.1~ynh1 +**Version incluse :** 4.0.2~ynh1 **Démo :** https://en.demo.grocy.info/stockoverview diff --git a/conf/config-dist.php b/conf/config-dist.php index 3a99aa0..3355c57 100644 --- a/conf/config-dist.php +++ b/conf/config-dist.php @@ -14,8 +14,9 @@ // The settings defined here below // Either "production", "dev", "demo" or "prerelease" -// When not "production", authentication will be disabled and -// demo data will be populated during database migrations +// When not "production", the application will work in a demo mode which means +// authentication is disabled and some demo data will be generated during the database schema migration +// (pass the query parameter "nodemodata", e.g. https://grocy.example.com/?nodemodata to skip that) Setting('MODE', 'production'); // The directory name of one of the available localization folders @@ -41,7 +42,11 @@ Setting('MEAL_PLAN_FIRST_DAY_OF_WEEK', ''); // ISO 4217 code of the currency ("USD", "EUR", "GBP", etc.) Setting('CURRENCY', 'EUR'); -// When running grocy in a subdirectory, this should be set to the relative path, otherwise empty +// Your preferred unit for energy +// E.g. "kcal" or "kJ" or something else (doesn't really matter, it's only used to display energy values) +Setting('ENERGY_UNIT', 'kcal'); + +// When running Grocy in a subdirectory, this should be set to the relative path, otherwise empty // It needs to be set to the part (of the URL) AFTER the document root, // if URL rewriting is disabled, including index.php // Example with URL Rewriting support: @@ -100,7 +105,7 @@ Setting('GROCYCODE_TYPE', '1D'); // Label printer settings -Setting('LABEL_PRINTER_WEBHOOK', ''); // The URI that grocy will POST to when asked to print a label +Setting('LABEL_PRINTER_WEBHOOK', ''); // The URI that Grocy will POST to when asked to print a label Setting('LABEL_PRINTER_RUN_SERVER', true); // Whether the webhook will be called server- or client-side Setting('LABEL_PRINTER_PARAMS', ['font_family' => 'Source Sans Pro (Regular)']); // Additional parameters supplied to the webhook Setting('LABEL_PRINTER_HOOK_JSON', false); // TRUE to use JSON or FALSE to use normal POST request variables @@ -140,6 +145,7 @@ Setting('FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING', true); Setting('FEATURE_FLAG_STOCK_PRODUCT_FREEZING', true); Setting('FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_FIELD_NUMBER_PAD', true); // Activate the number pad in due date fields on (supported) mobile browsers Setting('FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS', true); +Setting('FEATURE_FLAG_RECIPES_MEALPLAN', true); Setting('FEATURE_FLAG_CHORES_ASSIGNMENTS', true); Setting('FEATURE_FLAG_THERMAL_PRINTER', false); diff --git a/manifest.toml b/manifest.toml index 0479dc6..d8e5160 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grocy" description.en = "Web-based groceries & household management solution for your home" description.fr = "Solution Web de gestion d'épicerie et de gestion de la maison" -version = "4.0.1~ynh1" +version = "4.0.2~ynh1" maintainers = ["eric_G"] @@ -27,7 +27,6 @@ ram.runtime = "50M" [install] [install.domain] type = "domain" - full_domain = true [install.language] ask.en = "Choose the application language" @@ -42,8 +41,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/grocy/grocy/releases/download/v4.0.1/grocy_4.0.1.zip" - sha256 = "1deb09382eef102b591c4500b68e4027829dbb21d71ae8637b692daa5ec33a09" + url = "https://github.com/grocy/grocy/releases/download/v4.0.2/grocy_4.0.2.zip" + sha256 = "6615df64a99f83c952cc4006223ecb3087ef6871b5158e63fbf3a93824f19b77" in_subdir = false autoupdate.strategy = "latest_github_release" autoupdate.asset = "grocy_.*.zip"