Commit Graph

776 Commits

Author SHA1 Message Date
Bernd Bestel e9f2edea75 Optimize the initial state of the barcode scanner start button if the input element is disabled and make sure it does nothing, if the button is enabled however but the input element is disabled 2019-09-27 17:24:44 +02:00
Bernd Bestel 1b9a3c7f57 Fix that the barcode scanner start button overlaps everything 2019-09-27 17:03:50 +02:00
Bernd Bestel 2636456461 Show the journal of the product/chore/battery cards in a dialog 2019-09-27 16:54:40 +02:00
Bernd Bestel 81f6b58fe4 Added a button to jump to the journal on the product/chore/battery card 2019-09-27 14:19:06 +02:00
Bernd Bestel 9ba4585143 Reduce console.log spam 2019-09-27 14:08:24 +02:00
Bernd Bestel 4aa575e0e8 Display just "unlimited" on the product card for the average shelf life if it is > 200 years 2019-09-27 14:04:44 +02:00
Bernd Bestel 765f908966 Make it possible to provide the purchase price also as a total price (closes #390) 2019-09-27 13:50:16 +02:00
Bernd Bestel 9527305311 Userobjects list page print optimizations (closes #396) 2019-09-27 13:23:10 +02:00
Bernd Bestel 9d52f82bc2 Updated changelog for pull request #397 2019-09-27 08:35:15 +02:00
DeeeeLAN 6522aca30e Fixed navigation menu and full screen recipe smooth scrolling on iOS (#397)
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation

* fixed recipe ingredient layout issue in safari

* fixed navigation menu and full screen recipe smooth scrolling on iOS
2019-09-27 08:33:08 +02:00
Bernd Bestel e59a35c6d1 Also refresh the parent product on sub product actions on the stock overview page (closes #394) 2019-09-27 08:30:08 +02:00
Bernd Bestel cc2bf68f31 Fixed row highlighting after product actions on the stock overview page 2019-09-27 08:12:37 +02:00
Bernd Bestel 654d00dd67 Again corrections for #384) 2019-09-26 20:56:19 +02:00
Bernd Bestel cf2e6f1039 Added a sub feature flag to disable chore assignments when not needed 2019-09-26 17:20:25 +02:00
Bernd Bestel cf3217ada4 Fixed expired products count on stock overview page (fixes #392) 2019-09-26 16:42:59 +02:00
Bernd Bestel 21503c26d2 Use properly formatted numbers "everywhere" (partly references #389) 2019-09-26 15:25:30 +02:00
Bernd Bestel 7369603d78 Added missing localization string 2019-09-26 14:55:31 +02:00
Bernd Bestel 41e93d2c50 Little night mode improvements 2019-09-26 14:13:30 +02:00
Bernd Bestel b39866bda2 Immediately refresh the QU conversion hint on key presses on the product edit page 2019-09-26 13:59:41 +02:00
Bernd Bestel b8f9d09afc Don't remove products from stock overview on consuming all and the product has a min. stock amount & show it again on undo 2019-09-26 13:55:42 +02:00
Bernd Bestel a2b6d9ae39 Various small UI refinements 2019-09-26 13:14:24 +02:00
Bernd Bestel 45d3c25b21 Again optimizations for #384 2019-09-26 13:13:49 +02:00
Bernd Bestel 2809cc1454 Typo... 2019-09-26 12:45:35 +02:00
Bernd Bestel 02f30d141e Reviewed/optimized last changes (references #384) 2019-09-26 12:43:00 +02:00
DeeeeLAN c5927a10f3 fixed recipe ingredient layout issue in safari (#387)
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation

* fixed recipe ingredient layout issue in safari
2019-09-26 11:42:30 +02:00
Bernd Bestel 828ab8eba0 Allow accumulating min. stock amounts on parent product level (closes #384) 2019-09-26 10:36:49 +02:00
Bernd Bestel 75f8ecfad2 Updated the changelog and config-dist.php for #383) 2019-09-25 13:11:20 +02:00
Lewis Juggins fd14083443 Support meal plan as default page (#383)
* Support meal plan as default page

* Update SystemController.php
2019-09-25 13:08:41 +02:00
Bernd Bestel 04808eaa66 Include the server timezone in iCal calendar export (closes #379) 2019-09-25 09:52:32 +02:00
Bernd Bestel 53f0893f55 Fix unit conversion handling (factor of destination qu is always 1) (fixes #382) 2019-09-25 09:32:06 +02:00
Bernd Bestel 2eb3d8fe47 Updated changelog for #378 / #380 2019-09-25 09:16:43 +02:00
DeeeeLAN c0d79b1518 Fixed #378 (#380)
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation
2019-09-25 09:00:36 +02:00
Bernd Bestel 5351828e79 Reuse existing shopping list items when adding products from the stock overview page (closes #375) 2019-09-24 18:27:50 +02:00
Bernd Bestel b0c7958891 Updated the changelog for #376 2019-09-24 15:53:48 +02:00
Marc Ole Bulling f444d3e095 Fixed API call AddProductToShoppingList (#376)
$productId->id was undefined, therefore all items added to the shopping list with the API call had a null entry for "product_id"
2019-09-24 15:50:35 +02:00
Bernd Bestel d8be254ff3 Link /barcodescannertesting page in settings menu 2019-09-24 10:43:10 +02:00
Bernd Bestel 49b26bd375 Return a Cache-Control header for files served via the API 2019-09-24 10:38:41 +02:00
Bernd Bestel 50e829f270 Hide the recipe interaction buttons when displayed as a fullscreen card (as the dialogs would be behind the fullscreen card) 2019-09-24 10:28:42 +02:00
Bernd Bestel 3b29110500 Never show close buttons in modal dialogs, this is not needed 2019-09-24 10:24:47 +02:00
Bernd Bestel e727a38071 Improved the responsiveness of the "Create or assign product" dialog 2019-09-24 10:19:23 +02:00
Bernd Bestel 099ac7e75a Use exact matches for product barcode lookups (closes #366) 2019-09-24 09:52:05 +02:00
Bernd Bestel 53c56cc1cb Include meal plan recipes in the calendar (closes #368) 2019-09-24 09:40:56 +02:00
Bernd Bestel 2a9f927a13 Improved responsiveness of /mealplan and /calendar (closes #372 and closes #373) 2019-09-24 09:21:57 +02:00
Bernd Bestel 6bb9d2c51d Some little changes for pull request #369 (also references #367) 2019-09-24 08:35:30 +02:00
Bernd Bestel ca719072c9 Merge branch 'master' of https://github.com/grocy/grocy 2019-09-24 08:14:07 +02:00
kriddles 66f61ec1ad public mealplan: add fullscreen recipe in popup (#369) 2019-09-24 08:13:42 +02:00
Bernd Bestel cc500c50ff Fixed some types in the last changelog 2019-09-24 08:08:52 +02:00
Bernd Bestel eef844d42e Optimized dropdown caret position a little bit 2019-09-23 20:19:53 +02:00
Bernd Bestel e92843a9bf Added new demo strings 2019-09-23 13:21:02 +02:00
Bernd Bestel 66571f662f Hotfix (will be included in v2.5.0 release): Don't break image loading when php-gd extension is not installed v2.5.0 2019-09-22 14:48:50 +02:00