From 5d5cfb15488f701675d5e0aba28c368227614fa5 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Sun, 22 Sep 2019 09:47:58 +0200 Subject: [PATCH] Prepared next release --- changelog/47_2.4.0_2019-05-10.md | 2 +- .../{52_UNRELEASED_2019-xx-xx.md => 52_2.5.0_2019-09-22.md} | 3 ++- version.json | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) rename changelog/{52_UNRELEASED_2019-xx-xx.md => 52_2.5.0_2019-09-22.md} (97%) diff --git a/changelog/47_2.4.0_2019-05-10.md b/changelog/47_2.4.0_2019-05-10.md index 432110dd..e0cd68b6 100644 --- a/changelog/47_2.4.0_2019-05-10.md +++ b/changelog/47_2.4.0_2019-05-10.md @@ -21,7 +21,7 @@ - Recipe improvements - It's now possible to enter a "variable amount" (e. g. if a recipe needs "1 - 2 cups"), the original amount is still used for stock fulfillment checking (if enabled for that recipe ingredient) - New translations: (thanks all the translators) - - Swedish (demo available at https://sv_se.demo.grocy.info) + - Swedish (demo available at https://sv.demo.grocy.info) - Polish (demo available at https://pl.demo.grocy.info) - Internal improvement: Localizations are now handled via gettext, both on server and client side - Mainly to properly handle languages with more than 2 plural forms diff --git a/changelog/52_UNRELEASED_2019-xx-xx.md b/changelog/52_2.5.0_2019-09-22.md similarity index 97% rename from changelog/52_UNRELEASED_2019-xx-xx.md rename to changelog/52_2.5.0_2019-09-22.md index 7d05032b..d9346cac 100644 --- a/changelog/52_UNRELEASED_2019-xx-xx.md +++ b/changelog/52_2.5.0_2019-09-22.md @@ -8,6 +8,7 @@ - Implemented using [QuaggaJS](https://github.com/serratus/quaggaJS) - camera stream processing happens totally offline / client-side - Please note due to browser security restrictions, this only works when serving grocy via a secure connection (`https://`) - There is also a `config.php` setting `DISABLE_BROWSER_BARCODE_CAMERA_SCANNING` to disable this, if you don't need it at all (defaults to `false`) +- I you have problems that barcocdes are not recognized properly, there is a little "barcode scanner testing page" at [/barcodescannertesting](https://demo.grocy.info/barcodescannertesting) - => Quick video demo: https://www.youtube.com/watch?v=Y5YH6IJFnfc ### Stock improvements/fixes @@ -37,7 +38,7 @@ - `FEATURE_FLAG_STOCK_PRODUCT_OPENED_TRACKING` to disable product opened tracking - Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling (nothing was broken, but the success popups may not displayed the correct amount that was posted) - Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases -- When going to the product edit page, after saving the product, it will now return to the page you were coming from +- When going to the product edit page, after saving the product, it will now always return to the previous page ### Shopping list improvements - Shopping lists now have a notes field (HTML/WYSIWYG editor, just to save some notes per shopping list) diff --git a/version.json b/version.json index 685ae57f..e30ee8cf 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "Version": "2.4.4", - "ReleaseDate": "2019-07-07" + "Version": "2.5.0", + "ReleaseDate": "2019-09-22" }