kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-21 04:43:32 +00:00
Code Issues Projects Releases Wiki Activity
1,176 Commits 2 Branches 80 Tags
4a030b7ffce274187a44f79f173f8213f13e6ad3
Commit Graph

454 Commits

Author SHA1 Message Date
Bernd Bestel
c266b53ff1 Added an ugly hack to prevent including the same component JS file multiple times 2020-02-10 20:21:52 +01:00
Bernd Bestel
a32206834b Make product card recipe ingredient indentation dynamic (references #556) 2020-02-10 19:30:49 +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
472c083bca Little changes, changelog and added missing localization strings for #555 2020-02-09 21:16:47 +01:00
kriddles
7be2d94cf7 View base servings on recipecard (#555) 2020-02-09 21:08:11 +01:00
Bernd Bestel
0359003e09 Little changes for #551 2020-02-09 15:36:03 +01:00
Bernd Bestel
a5277224f5 Reworked recipe card (fixes #543) 2020-02-04 19:48:00 +01:00
Bernd Bestel
fcfe62f4d3 Further optimize spacing to waste less space 2020-02-03 21:45:15 +01:00
Bernd Bestel
171d6af5e1 We don't need that switch-button, a native Boostrap button is enough and less disturbing 2020-02-03 21:21:42 +01:00
Bernd Bestel
b9e32a9795 Fixed contextual time ago display was missing (references #513) 2020-02-02 17:55:35 +01:00
Bernd Bestel
9e519e0841 Annotate variable ingredient amounts (closes #530) 2020-02-02 17:26:32 +01:00
Bernd Bestel
ba1272ced8 Made the navbar a little smaller 2020-02-02 17:16:02 +01:00
Bernd Bestel
3ca6982c39 Don't show and use scan mode in embedded mode (dialogs) 2020-02-02 13:13:18 +01:00
Bernd Bestel
890663bf63 Fixed the "Shopping list to stock workflow" with disabled FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING (fixes #537) 2020-02-02 13:01:31 +01:00
Bernd Bestel
5effa0c103 Fixed recipeposform edit when "Only check if a single unit is in stock" is set (again closes #535) 2020-02-02 12:33:48 +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
683ea0984c Further optimized shopping list compact view (references #453) 2020-02-01 12:35:06 +01:00
Bernd Bestel
55c5501d96 Optimized recipeposform input ordering (closes #533) 2020-02-01 08:59:37 +01:00
Bernd Bestel
b8c6ac6905 Fixed location_id handling when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #532) 2020-01-31 21:27:51 +01:00
Bernd Bestel
72e18ed0a4 Show the shopping list notes field in compact view (references #453) 2020-01-31 17:58:47 +01:00
Bernd Bestel
6d4a15d372 Improve shopping list compact view (references #453) 2020-01-31 17:52:03 +01:00
Bernd Bestel
8d490351d0 Replaced jQuery UI by Animate.css (better, faster, lighter) 2020-01-28 19:27:18 +01:00
kriddles
6f549bdf3a Battery fix (#519) 
* bugfix variable name

* Typo: curent->current
 2020-01-28 08:44:25 +01:00
Bernd Bestel
a64b35e9d4 Made the sidebar menu items a little smaller 2020-01-27 22:34:48 +01:00
Bernd Bestel
0c0604c693 Properly space/divide userentities in the newly arranged sidebar 2020-01-27 20:22:49 +01:00
Bernd Bestel
4c1c971f6d Rename /stockedit and /stockdetail to match the "naming conventions" (references #421) 2020-01-27 19:19:09 +01:00
Bernd Bestel
05aceb72ae Squashed commit 
- Only refresh contextual number/datetime info/formatting where needed (closes #513)
- Also refresh correlated stock journal entries on undo (closes #471)
- Prefill "New amount" with the current stock amount on the inventory page (closes #434)
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421)
- Load initial values of the /stockedit form server side to improve loading performance (references #421)
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421)
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453)
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
 2020-01-27 19:00:49 +01:00
Bernd Bestel
2764bb680c Changed some localization strings 2020-01-26 20:13:15 +01:00
Bernd Bestel
71a57c9dcb Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
Bernd Bestel
bad19721db Make the scan mode switch-buttons a little bigger 2020-01-26 15:44:09 +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
e111d07f4e Added the ability to directly add products to the meal plan (closes #450) 2020-01-25 11:51:00 +01:00
Bernd Bestel
061f4da041 Don't try to switch twice to shopping list compact mode on mobile (references #453) 2020-01-25 08:49:17 +01:00
Bernd Bestel
3cbeea7d95 Added an option to filter for only undone items on the shopping list (closes #452) 2020-01-24 22:26:36 +01:00
Bernd Bestel
ad54253d72 Added a compact view for shopping list (for mobile shopping) (closes #453) 2020-01-24 22:05:08 +01:00
Bernd Bestel
fd5a72264d Meal plan recipe and notes also fit into one table (references #477) 2020-01-23 21:57:47 +01:00
Bernd Bestel
8d7f985b59 Make it possible to add notes to meal plan (days) (closes #477) 2020-01-23 20:59:19 +01:00
Bernd Bestel
594dc0858b Make sure that Grocy.CurrentUrlRelative is set without the query string (fixes #509) 2020-01-23 20:12:38 +01:00
Bernd Bestel
99d4b05a3c Make purchased date on /stockedit editable / Dirty workaround for 2 datetimepickers on the same page (references #506) 2020-01-23 18:58:05 +01:00
kriddles
ef9f28d154 421 (#507) 
* refactor to be stock/entry/{entryId}

* Allow recipeform add productworkflow

* on document ready stockdetail filter based on ProductPicker

* openDate fixes for undo

* RefreshStockDetailRow refresh location-id
 2020-01-22 21:08:49 +01:00
Bernd Bestel
6f035fd64d Allow decimal numbers for the kcal field (closes #492) 2020-01-21 21:31:42 +01:00
Bernd Bestel
0816359867 Some refinements for #501 2020-01-21 20:45:34 +01:00
kriddles
3a36bdaf45 recipes can create products (#501) 2020-01-21 20:20:26 +01:00
Bernd Bestel
f543a3a472 Fixed and optimized some things related to #421 (& some more cleanup) 2020-01-21 17:30:09 +01:00
kriddles
2a608c41e9 Stock detail updates (#493) 
* Fix spelling

* stockdetail refresh with location name

* Stock updates

* change stock_row_id to id

* fix stockdetail refresh rows after clicking undo

* fix stockdetail consume spoiled
 2020-01-17 17:54:34 +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
0be672aa48 Fixed that when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS was set to false, the shopping list appeared empty after some actions (fixes #428) 2020-01-03 13:35:48 +01:00
kriddles
36e8484046 Recipe form updates (#476) 
* recipePosForm - hide when embeded productcard

* recipeposform: remove prefillByName for productPicker

* recipeform add data-product-id

* recipeposform cleanup extra clicks

* recipeform: bootbox the recipe pos edit button

* recipeform: bootbox the recipe pos add button

* recipeposform postMessage back

* recipeform reload if IngredientsChanged

* Fix page reload for new recipes (URL = /recipe/new)

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2019-12-21 12:36:02 +01:00