kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-16 10:44:37 +00:00
Code Issues Projects Releases Wiki Activity
2,293 Commits 2 Branches 80 Tags
35a4b75432d27658fd93e58b5112960e28d90cec
Commit Graph

2293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernd Bestel
580f49e69f Update README.md 2021-08-27 20:30:09 +02:00
Bernd Bestel
22db124624 Optimized ReverseProxyAuthMiddleware error message 2021-08-22 12:55:09 +02:00
Bernd Bestel
e88294eb40 Strikethrough reverted changes 2021-08-21 22:16:44 +02:00
Bernd Bestel
ae3bacf8fe Fixed changelog typos 2021-08-21 22:12:41 +02:00
Bernd Bestel
90305ca8d7 Prepared next release v3.1.1 2021-08-21 20:24:18 +02:00
Bernd Bestel
3967b28481 Fixed stock overview dynamic < min. stock amount background handling 2021-08-21 20:20:16 +02:00
Bernd Bestel
2d67adedd7 Updated dependencies 2021-08-21 20:11:45 +02:00
Bernd Bestel
ef271c6247 Pulled translations from Transifex 2021-08-21 20:10:28 +02:00
Bernd Bestel
2c0b6368e1 Revert "Return numbers as numbers on all API endpoints" (14cd6ca3bf, fixes #1564) 2021-08-20 21:45:56 +02:00
Bernd Bestel
1d5ca5ed64 Fixed external barcode lookup (plugin) add product handling related to barcodes (fixes #1568) 2021-08-19 19:56:43 +02:00
Bernd Bestel
4d0c5502a1 Added changelog for #1584 2021-08-19 19:48:00 +02:00
David Mott
a0cf58b974 fix: make stockentry grocycodes consume the actual stock entry not the product in general (#1584) 
* fix: make stockentry grocycodes consume the actual stock entry not the product in general

if the stock_entry_id is in the request body use this instead of the stockentry grocycode
this may not be the correct way to interpret this but one of them has to win

* Undo formatting changes

* fix: add variable definition and reorder args used in ConsumeProduct

* Simplify

* Fix this also for transferring a product

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2021-08-19 19:44:39 +02:00
Bernd Bestel
61a58ddef0 Fixed Userfield value assignment handling (/objects/{entity} API endpoint) (fixes #1572) 2021-08-17 18:23:06 +02:00
Bernd Bestel
3608eec8fb Fixed FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS clear shopping list confirm message handling (fixes #1315) 2021-08-17 18:05:32 +02:00
Bernd Bestel
cebf7a3e54 Don't consider inactive products to be missing (fixes #1578) 2021-08-17 18:00:33 +02:00
Bernd Bestel
23be96b5d6 Restore the rest of "orderFixed" (DataTables rowgroup option) (again closes #1534) 2021-08-17 17:52:28 +02:00
Bernd Bestel
7f70f0ec07 Fixed chore/battery camera barcode scanning blur event handling (fixes #1585) 2021-08-17 17:48:45 +02:00
Bernd Bestel
8e552f1146 Added changelog for #1581 2021-08-15 10:46:37 +02:00
David Mott
95cb9ffb90 fix: confirm grocycode is of PRODUCT type in GetProductIdFromBarcode (#1581) 
* fix: confirm grocycode is of PRODUCT type in GetProductIdFromBarcode

* Fixed formatting

* Don't output the given input (for security reasons)

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2021-08-15 10:45:05 +02:00
Bernd Bestel
d23f730a0b Added changelog for #1559 2021-08-06 20:20:00 +02:00
Kris
b539c93319 Hide elements when printing (#1559) 
* Hide elements when printing

* Hide elements when printing

* Also hide the title menu collapse button

* Added a print button

All print-optimized pages have that

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2021-08-06 20:18:43 +02:00
Kris
eecb321086 Change PHP Dependency from >= to ^ (#1566) 
* Change PHP Dependency from >= to ^

* Remove name, description, license
 2021-08-06 15:49:14 +02:00
Bernd Bestel
1891bc6f32 Restore fixed order for grouped column (fixes #1534) 2021-08-04 17:41:20 +02:00
Daniel Tihanyi
10c1ccd6e4 Extend REQUIRED_PHP_EXTENSIONS check about core extensions (#1540) 
* Extend Grocy REQUIRED_PHP_EXTENSIONS

After installing Grocy on FreeBSD, even with all extensions installed that are listed in REQUIRED_PHP_EXTENSIONS, Grocy still couldn't start. The added 3 PHP Extensions are also needed to run Grocy.

* Added note about core extensions

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2021-08-04 17:25:24 +02:00
Bernd Bestel
12af9a944b Added changelog for #1561 2021-08-04 17:08:38 +02:00
Akosh Pinter
1fafd32aaf Possible fix for the chore & battery dropdown clearing issue - #1560 (#1561) 
* Possible fix for the chore & battery dropdown clearing issue - #1560

* Revert formatting changes - #1560

Co-authored-by: Akos Pinter <akos.pinter@mhp.com>
 2021-08-04 17:06:40 +02:00
Bernd Bestel
9f9b9d864e Added changelog for #1557 2021-08-04 16:37:08 +02:00
Lars van Erp
a79247a30c Fixed the bug where grocy would return "Not a grocycode" all the time (#1557) 2021-08-04 16:35:26 +02:00
Bernd Bestel
53e405c4f8 Fixed migration when having unsupported parent/child product nesting levels (fixes #1542) 2021-07-25 20:22:10 +02:00
Bernd Bestel
cf382bb47f Also note how to apply database migrations in "How to update" section 
References #1548 and all the other same questions arising after each release multiple times
 2021-07-25 13:03:19 +02:00
Bernd Bestel
8225215e39 Fixed that the calendar iCal export was broken when having "Track date only" chores (fixes #1547) 2021-07-24 10:24:21 +02:00
Bernd Bestel
f47ca963ab Fixed duplicate barcode migration error (fixes #1546) 2021-07-23 16:37:45 +02:00
Bernd Bestel
d871ed7b53 Updated README.md 2021-07-17 20:17:02 +02:00
Bernd Bestel
3e31450532 Typo 2021-07-17 00:26:26 +02:00
Bernd Bestel
5478bec2c7 Optimized "auto decimal separator for price inputs" (references #1345) 2021-07-17 00:21:48 +02:00
Bernd Bestel
edfa404ed6 Squashed commit 
Always execute migration 9999 (can be used to fix things manually)
Optimized meal plan navigation / date range filtering
Prepared next release
Pulled translations from Transifex
Various code optimizations
v3.1.0 		2021-07-16 17:32:08 +02:00
Bernd Bestel
2d1d5d46f6 Updated screenshots 2021-07-15 21:04:52 +02:00
Bernd Bestel
45fe6a6362 Updated create_release_package.bat 2021-07-15 20:58:01 +02:00
Bernd Bestel
23f697f812 Pulled translations from Transifex 2021-07-15 20:53:12 +02:00
Bernd Bestel
263181baa0 Updated dependencies 2021-07-15 20:48:27 +02:00
Bernd Bestel
9132e222fe Upgraded bwip-js 2021-07-15 20:34:22 +02:00
Bernd Bestel
2bc108fe3e Only init meal plan menu entry when feature flag is enabled 2021-07-15 20:19:04 +02:00
Bernd Bestel
02d0121f4d Fixed meal plan note adding 2021-07-15 20:11:49 +02:00
Bernd Bestel
b5acb4c49b Settings menu order == sidebar menu order 2021-07-15 20:09:33 +02:00
Bernd Bestel
cd05a95a0f Fix meal plan section title in (some) foreign languages 2021-07-15 20:07:31 +02:00
Bernd Bestel
2d2700cacb Implemented meal plan sections (closes #370) 2021-07-15 17:54:48 +02:00
Bernd Bestel
1bacd8e13d Typo / added missing changelog 2021-07-14 18:15:02 +02:00
Bernd Bestel
f6986fac18 Fixed cost/calories calculation for nested recipes (references #1264) 2021-07-14 16:27:03 +02:00
Bernd Bestel
8b6f882edc Fixed missing FEATURE_FLAG_SHOPPINGLIST handling on /stockoverview, /mealplan and /stockentries pages (references #322) 2021-07-13 21:24:08 +02:00
Bernd Bestel
91d8eaeb74 Squashed commit 
Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
 2021-07-13 19:29:23 +02:00