104 Commits

Author SHA1 Message Date
Michał Przybyś
f8c6e81dcb
Fix grocy/grocy#834 (#855)
* Fix grocy/grocy#834

* stock_missing_products_including_opened didn't take the opened amount in HAVING clauses

* Resolved merge conflicts

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:46:25 +02:00
fipwmaqzufheoxq92ebc
d60d981fd1
Refactor Authentication and add proxy-authentication (#921)
* Refactor Authentication-Middlewares

* Add Proxy-Authentication

* Disable "Logout" & "Manage Users" when using ProxyAuth

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-19 19:23:13 +02:00
Bernd Bestel
1390c65864
Show optionally an icon on the stock overview page if the product is already on the shopping list (closes #708) 2020-04-13 18:47:41 +02:00
Bernd Bestel
f36d9c46ed
Make Quagga2 setting "numOfWorkers" adjustable (closes #713) 2020-04-13 16:14:43 +02:00
Mik-
f66a4c9631
Camera barcode scanner enhancements (#675)
* Disable torch button, if not supported

* Allow toggling torch

* Don't exceed the screen width with camera window

* Disable torch button, if not supported

* Allow toggling torch

* Don't exceed the screen width with camera window

* Allow toggling torch

* Disable torch button, if not supported

* Allow toggling torch

* Don't exceed the screen width with camera window

* Allow toggling torch

* Allow toggling torch

* Don't exceed the screen width with camera window

* Remove toggling of torch, as it's not working
and add resize of video to fit in viewport hieght

* Add feature to always turn on the torch in camera scanner.

* Fix feature flag name

Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
2020-03-29 14:25:04 +02:00
Bernd Bestel
7b737590ea
Added changelog for #657 2020-03-25 20:32:37 +01:00
Mik-
f3b504b7de
Optionally use number pad input in best-before-date fields on mobile Chrome (#657)
* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Use more precise name for number pad option

* Update localization/de/strings.po

Co-Authored-By: Bernd Bestel <bernd@berrnd.de>

* Fix merge conflict

* Fix merge conflict try 2

Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-25 20:26:54 +01:00
Bernd Bestel
8be14768df
Added new config.php setting for subdirectory base path (closes #568) 2020-03-06 20:41:00 +01:00
Bernd Bestel
aa787e765e
Changelog, small changes and added missing localization strings for #556 2020-02-10 18:24:15 +01:00
kriddles
c5f38689fa
Include product_group in recipe ingredient list (#556)
* Include product_group in recipe ingredient list

* Delete 0098.sql

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-02-10 18:04:57 +01:00
Bernd Bestel
0359003e09
Little changes for #551 2020-02-09 15:36:03 +01:00
Marc Ole Bulling
a0ab5c5e94 Add option to disable automatic switching to compact shoppinglist view on mobile devices (#551) 2020-02-09 15:25:54 +01:00
Bernd Bestel
23efe0c87a
Added an option to hide the calendar on the shopping list (closes #531) 2020-02-01 12:55:12 +01:00
Bernd Bestel
71a57c9dcb
Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
Bernd Bestel
c7bcb9984a
Implemented "Scan mode" 2020-01-26 15:35:01 +01:00
Bernd Bestel
0ef9b2fdb7
Added a new setting to be able to start the meal plan on a different weekday (closes #429) 2020-01-25 20:01:40 +01:00
Bernd Bestel
d4bec3bd10
Added a "keep screen on" option using NoSleep.js (closes #427) 2020-01-05 10:03:02 +01:00
Bernd Bestel
a8cf5ae9ab
Handle demo mode via a setting instead of checking the existence of a file (closes #484) 2020-01-05 09:11:11 +01:00
Bernd Bestel
700db9ae00
Added a new sub feature flag FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS 2019-10-05 13:10:56 +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
75f8ecfad2
Updated the changelog and config-dist.php for #383) 2019-09-25 13:11:20 +02:00
Bernd Bestel
d8360993cc
Internal change that the demo instances (stable and pre-release) can be served through a single instance for all localizations (references #241) 2019-09-21 15:07:29 +02:00
Bernd Bestel
a4d479d047
Also consider opened products for minimum stock amounts (optionally, but by default) (closes #353) 2019-09-19 18:11:03 +02:00
Bernd Bestel
cbf1d1ca40
Implemented stock sub-feature-flags (closes #314) 2019-09-19 17:46:52 +02:00
Bernd Bestel
5e9a7fb7ca
Implemented browser barcode scanning (closes #102) 2019-09-19 12:48:02 +02:00
Bernd Bestel
ce12202c86
Make it configurable if calendars shows week numbers or not (closes #333) 2019-09-18 18:30:25 +02:00
Niels Tholenaar
e3f53aaebd Added possible values to entry page config setting 2019-07-10 17:14:25 +02:00
Niels
94e2ec5e15
Merge branch 'master' into master 2019-07-10 15:11:36 +02:00
Bernd Bestel
914dde4609
Added a new config.php setting CALENDAR_FIRST_DAY_OF_WEEK to be able to change the first day of a week used for calendar views (closes #256) 2019-07-06 20:19:21 +02:00
Bernd Bestel
09b23847b5
Added a new config.php setting DISABLE_AUTH to be able to disable authentication / the login screen (closes #246) 2019-07-06 18:29:18 +02:00
Niels Tholenaar
86f5667039 Allow possibility to choose custom homepage 2019-06-22 16:02:52 +02:00
Bernd Bestel
0eb974bd92
Make it possible to customize the default amount for purchase/consume (closes #215) 2019-05-04 13:19:34 +02:00
Bernd Bestel
4c2cf4944d
Added a feature flag to also be able to hide all stock related UI elements and routes (closes #228) 2019-05-03 20:03:04 +02:00
Bernd Bestel
c1674d33b4
Make "next X days" configurable (closes #175) 2019-04-20 15:30:45 +02:00
Bernd Bestel
5ba55823c9
Clarify that the CURRENCY setting should be the ISO 4217 code of the currency (to work with the JS toLocaleString function) 2019-03-09 16:04:03 +01:00
Rico
54a23019b8
FIX: Typo in config-dist.php 2019-03-03 14:47:38 +01:00
Bernd Bestel
32e878afc9
Added feature flags to disable/hide parts not needed (closes #157)
grocy was initally about stock management, so this is always enabled, the rest can be disabled
2019-03-01 19:33:33 +01:00
Bernd Bestel
bdcd176f81
Make config.php settings also available as environment variables (closes #118) 2018-12-23 16:45:16 +01:00
Bernd Bestel
306d0f7da6
Add "one click shopping list to stock workflow" (closes #110) 2018-11-21 19:08:36 +01:00
Bernd Bestel
f7f90238f2
Show optionally a clock in the header (closes #109) 2018-11-20 19:23:48 +01:00
Bernd Bestel
04c93d937e
Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
ba2d32be60
Fixes for auto night mode (references #71) 2018-09-30 19:31:03 +02:00
Bernd Bestel
8b815fce93
Finalize auto night mode feature (references #71) 2018-09-30 18:02:59 +02:00
Bernd Bestel
f1c78659be
Optimize user settings 2018-09-30 17:14:04 +02:00
Talmai Oliveira
be326a5211 Grocy docker patch (#78)
* typo corrections

* more typos

* initial work towards dockerized version of grocy

* placeholder for future README

* fully working dockerized grocy

* updated final size of docker images
2018-09-30 09:31:16 +02:00
Bernd Bestel
8d41dcc650
Use current commit hash as version "number" when MODE is prerelease 2018-09-25 08:55:25 +02:00
Bernd Bestel
c64eb27ca1
Add something for product price tracking (references #22) 2018-07-26 20:27:38 +02:00
Bernd Bestel
7f8540ff4e
Replace the single user (defined in /data/config.php) with a multi user management thing 2018-07-24 19:31:43 +02:00
Bernd Bestel
37d1377f99
Fixed the rest of the broken stuff after the dependency upgrade party 2018-07-12 19:12:31 +02:00
Bernd Bestel
0954b5a741
Add option to not use URL rewriting 2018-06-15 20:50:40 +02:00