github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-28 07:39:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,548 Commits 2 Branches 81 Tags 29 MiB
release
Commit Graph

885 Commits

Author SHA1 Message Date
Bernd Bestel
58eda2f152
Upgraded iframe-resizer package 2024-12-23 17:11:35 +01:00
Bernd Bestel
7b7293e108
Updated footer 2024-12-23 16:43:31 +01:00
Bernd Bestel
11ea8f3716
Fixed shopping list print view table/list sorting (fixes #2602) 2024-11-08 16:40:30 +01:00
Bernd Bestel
2bc58e083d
Fixed recipe edit button on recipes page gallery view (fixes #2541) 2024-08-24 20:01:01 +02:00
Bernd Bestel
1323fff3e2
Add table options also to userobjects view (closes #2573) 2024-08-24 19:42:41 +02:00
Bernd Bestel
4f6075d8c5
Fixed product barcode scanning on the recipe ingredient edit page (fixes #2572) 2024-08-24 18:22:39 +02:00
Bernd Bestel
5a2600209f
Fixed recipe shopping list button feature flag relation (fixes #2552) 2024-07-13 13:41:18 +02:00
Bernd Bestel
8ac8000f30
Updated dependencies 2024-05-10 17:45:29 +02:00
Bernd Bestel
2047d38c6e
Updated about page 2024-04-14 19:24:32 +02:00
Bernd Bestel
402d98757e
Optimized iframe-resizer handling 2024-03-15 18:39:31 +01:00
TheDodger
7f1dfd0496
Align settings (wrench) menu entries (#2492) 
* Made settings menu (wrench) entries aligned by changing the icons to fixed width

* If, then take care of all those kind of menus

---------

Co-authored-by: Manuel Worschech <mw@abot.xyz>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2024-03-10 18:57:10 +01:00
TheDodger
477f333466
Add userfields to battery charge cycle tracking (#2490) 
Co-authored-by: Manuel Worschech <mw@abot.xyz>
 2024-03-10 18:12:02 +01:00
Bernd Bestel
e01e0f3abe
Revamped iframe modal handling (references #2480 and #2421) 2024-02-25 10:40:11 +01:00
Bernd Bestel
8ba3305a21
Default any add-to-shopping-list-actions to the default shopping list (closes #2472) 2024-02-24 20:15:23 +01:00
Bernd Bestel
40d1a9c3d0
Show the number of items per shopping list in the shopping lists dropdown (closes #2467) 2024-02-12 20:36:33 +01:00
Bernd Bestel
f2f9a16e59
Fixed stock entry page consume amount handling (fixes #2397) 2024-02-09 16:29:19 +01:00
Bernd Bestel
4659f51551
Fixed user create handling in embedded mode (closes grocy/grocy-desktop#51) 2024-01-15 17:10:36 +01:00
Bernd Bestel
33d5ec44d2
Again more iframe dialog handling optimizations (references #2421) 2024-01-13 20:27:35 +01:00
Bernd Bestel
efae5fea5b
Don't lazy load iframes (fixes #2421) 2024-01-10 21:52:54 +01:00
Torqu3Wr3nch
151bd7f025
Fix blank/missing items in spending report (#2432) 
* Fixes blank/missing items in spending report

Use left (outer) join when connecting product to optional product group

* Properly display ungrouped items in table and chart

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2024-01-09 18:36:09 +01:00
geoffwright240
6b69487bc5
Added 'category' filter to tasks view. (#2412) 
* Added 'category' filter to tasks view.

* Remove extraneous css attributes.

* Applied code style rules

* Use correct column

* Task categories are not something that is translated...

* Added "Uncategorized" as additional filter option

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2023-12-25 08:47:21 +01:00
Bernd Bestel
3c35a69c32
Optimized created API key table highlighting (closes #2403) 2023-12-11 22:03:00 +01:00
Bernd Bestel
c9bc10820d
Fixed typo in localization string 2023-12-01 19:26:29 +01:00
Bernd Bestel
80d7284d72
Implemented calendar category colors (closes #2368) 2023-11-04 14:11:02 +01:00
Chris Thorn
f36ad805b3
Optimize sidebar icon spacing (#2344) 
* Update default.blade.php

Add `fa-fw` class to all side navigation icons to make them all fixed width

* Do this also for userentities

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2023-09-19 18:07:30 +02:00
Bernd Bestel
f6bdb6e836
Added new Userfield type "Number (currency)" (closes #2276) 2023-09-01 17:48:46 +02:00
Bernd Bestel
dedbee3181
Allow user editing in embedded (+ disabled authentication) mode (closes grocy/grocy-desktop#47) 2023-08-19 08:48:52 +02:00
Bernd Bestel
3a2929c016
stockreports/spendings: Support grouping by store (closes #2308) 2023-08-14 18:12:40 +02:00
Bernd Bestel
106f25cc6b
Fixed stock entry open button amount on /stockentries (fixes #2303) 2023-08-13 08:27:02 +02:00
Bernd Bestel
787d5f11e0
Fixed dynamic manifest didn't work with enabled authentication 2023-08-09 21:00:35 +02:00
Bernd Bestel
b74fbddd94
Use a dynamic (title / URL) manifest 2023-08-01 17:12:35 +02:00
Bernd Bestel
de4c6e8b60
Renamed third party packages directories 2023-06-03 17:36:01 +02:00
Bernd Bestel
70bb014c9f
Removed pre-release special version handling 2023-05-24 20:32:48 +02:00
Bernd Bestel
8c79cc4f8e
Fixed new API key modal 2023-05-23 21:22:54 +02:00
Bernd Bestel
89c6d6683a
Remove unused frontend package on /manageapikeys 2023-05-23 20:34:24 +02:00
Bernd Bestel
d0e0102752
API keys can now have a description 2023-05-23 20:31:51 +02:00
Bernd Bestel
08c1efa0ad
Unified product-/chore-/battery-card modal handling 2023-05-23 17:32:54 +02:00
Bernd Bestel
2c0a71078f
Fixed productcard opened amount display 2023-05-22 21:53:15 +02:00
Bernd Bestel
02fe3f2119
Show to amount of "Label per unit" stock entry labels (closes #2241) 2023-05-22 21:23:19 +02:00
Bernd Bestel
04f362b723
Added a product context menu on /stockjournal (the same as on /stockoverview) (closes #2239) 2023-05-21 18:40:59 +02:00
Bernd Bestel
979c67b44c
Various JS optimizations 2023-05-21 18:01:47 +02:00
Bernd Bestel
825321593b
Optimized content spacing with collapsed sidebar 2023-05-21 17:33:40 +02:00
Bernd Bestel
99db10a490
Fixed <select> style 2023-05-21 14:47:37 +02:00
Bernd Bestel
b53cdd4c42
Use minified files of packages (where available) 2023-05-21 14:29:19 +02:00
Bernd Bestel
89761ac141
Fixed syntax error 2023-05-21 14:12:43 +02:00
Bernd Bestel
f427849e89
Load all frontend packages conditionally 2023-05-21 10:56:38 +02:00
Bernd Bestel
d16d976d0b
Simplified viewjs / active page handling 2023-05-20 18:20:30 +02:00
Bernd Bestel
ddf0ff0aef
Various small layout adjustments 2023-05-20 11:03:13 +02:00
Bernd Bestel
fb57d9ef13
Fixed frontend translation with numbered arguments did not work (after upgrading gettext-translator) 2023-05-20 09:58:33 +02:00
Bernd Bestel
c43fe24e47
Changed font 2023-05-20 09:31:03 +02:00
Bernd Bestel
ecb9f53bb4
Declare logo width 2023-05-19 20:59:03 +02:00
Bernd Bestel
5f65f2abd0
New logo 2023-05-19 18:08:26 +02:00
Bernd Bestel
49daed6c2b
Upgraded some frontend dependencies 2023-05-19 17:23:32 +02:00
Bernd Bestel
628e779902
Moved sidebar / menu layout into own (customized) component 2023-05-19 15:12:11 +02:00
Bernd Bestel
99546815f9
Remove unneeded meta tags 2023-05-19 14:19:14 +02:00
Bernd Bestel
d03175f75a
Added a separate QU for displaying prices (closes #2225) 2023-05-18 13:37:13 +02:00
Bernd Bestel
9cdb0908d6
Make it possible to hide locations/stores/QUs/product_groups/task_categories (closes #2222) 2023-05-13 14:24:52 +02:00
Bernd Bestel
84bd74a1bc
Show the product card also on /products (closes #2185) 2023-04-13 20:36:21 +02:00
Bernd Bestel
16011b91c6
Added a filter option to only show currently out-of-stock products on /products (closes #2192) 2023-04-13 20:28:28 +02:00
Bernd Bestel
71d44edb8c
Optimized week recipe handling in mealplan (fixes #2168) 2023-04-01 22:04:30 +02:00
Travis Raup
340832c361
Feature: Stock Purchase Metrics (#2135) 
* Feature: Stock Purchase Metrics

* chart update

* Refactor to chartjs

* More suggestion edits

- locale in javascript
- global translations
- commit migrations sql file

* Rename 0215.sql to 0216.sql

Fixed merge conflict

* Fixed merge conflict

* Applied code style

* Added missing demo data translations

* Removed unused package "canvasjs"

* Don't include daterangepicker globally when only needed on a single page / fixed view section imports

* Rename this to "Spendings" / name it more generically "Stock reports"

* Reuse the existing product_price_history view

* Final cleanup

* Whitespace fix

---------

Co-authored-by: Travis Raup <travis.raup@platform.sh>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2023-04-01 17:05:41 +02:00
Bernd Bestel
98469248eb
Optimized tracking button handling on /choresoverview (closes #2186) 2023-03-31 20:12:06 +02:00
Bernd Bestel
c9c0baefeb
Optimized datetime Userfields handling (fixes #2108) 2023-02-06 20:36:26 +01:00
Bernd Bestel
d9667b4534
Removed type conversions where no longer needed 
PHP 8.1 PDO SQLite now returns native data types
 2023-02-06 20:22:10 +01:00
Bernd Bestel
d8d3c3ef0b
Split the quick consume and open amount product option (closes #2127) 2023-02-05 20:37:39 +01:00
Bernd Bestel
b64d726c42
Added a new config option for energy unit display (closes #2109) 2023-02-05 15:55:45 +01:00
Webysther Sperandio
902cb20710
Add Sub feature flag FEATURE_FLAG_RECIPES_MEALPLAN (#2118) 
* Update routes.php

Added sub feature FEATURE_FLAG_RECIPES_MEALPLAN

* Update default.blade.php

Added sub feature flag FEATURE_FLAG_RECIPES_MEALPLAN

* Update SystemController.php

Added Sub feature flags FEATURE_FLAG_RECIPES_MEALPLAN

* Update config-dist.php

Sub feature flags FEATURE_FLAG_RECIPES_MEALPLAN

* Update routes.php

TYPO

* Code formatting / structure

---------

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2023-02-05 15:06:59 +01:00
Bernd Bestel
a5788511e3
Optimized productform sticky footer spacing (fixes #2104) 2023-01-11 16:25:06 +01:00
Bernd Bestel
4e56dee6f0
Finalized "Auto reprint stock entry label" (closes #2092) 2023-01-05 20:12:15 +01:00
Bernd Bestel
83fa02d8ad
Added an option to reprint stock entry labels when editing them (closes #2092) 2023-01-05 18:15:21 +01:00
Bernd Bestel
daf5ad33c7
Show recipe ingredients/preparation side by side in fullscreen mode (closes #2051) 2023-01-05 17:44:07 +01:00
Bernd Bestel
c0fbc4adaf
Fixed /stockoverview value column sort format (fixes #2088) 2023-01-01 20:33:08 +01:00
Bernd Bestel
76500c57bd
Optimize recipe ingredient costs/calories calculation when only_check_single_unit_in_stock is used (closes #780) 2022-12-26 19:48:26 +01:00
Bernd Bestel
3f2ad17460
Make it possible to add recipes from /recipes to the meal plan (closes #2003) 2022-12-26 14:25:33 +01:00
Bernd Bestel
0585e80c70
Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +01:00
Bernd Bestel
0229d187ae
Removed qu_factor_purchase_to_stock (migrated existing factors to normal product specific QU conversions) 2022-12-25 19:48:22 +01:00
Bernd Bestel
dea6f3f820
Replace also the unit when displaying a recipe ingredient with a variable amount (closes #2080) 2022-12-24 13:06:27 +01:00
Bernd Bestel
2ebb9b2cd9
Show product group Userfields on the shopping list (closes #2069) 2022-12-18 20:56:02 +01:00
Bernd Bestel
38a4ad8ec4
Upgraded to PHP 8.1 2022-12-10 15:19:11 +01:00
Bernd Bestel
8175b1bcfe
Simplified product specific QU display/edit and added more demo QU conversions 2022-12-04 20:25:33 +01:00
Bernd Bestel
c1dea5c254
Optimized /quantityunitconversionsresolved view 2022-12-04 19:52:48 +01:00
Bernd Bestel
50fac692ad
Added a dialog to show product related resolved QU conversions (references #2056 and #1360) 2022-12-04 19:02:15 +01:00
Bernd Bestel
6affa01f81
Added a "Clear done items" button to the shopping list (closes #1999) 2022-11-19 19:45:00 +01:00
Bernd Bestel
6036786153
Fix/Workaround for DataTables ColReorder bug with data-order attributes (fixes #2019) 2022-11-12 18:10:32 +01:00
Bernd Bestel
2b2dd0568b
Move back again to original tempusdominus-bootstrap-4 package (references #143 and #2036) 2022-11-12 17:25:09 +01:00
Bernd Bestel
3f60a2b5fa
Move back again to own forked tempusdominus-bootstrap-4 package (fixes #2036, references #143) 2022-11-10 11:42:28 +01:00
Bernd Bestel
24c9247663
Make it possible to edit a user without necessarily updating the users password (closes #1942) 2022-08-27 14:54:52 +02:00
Bernd Bestel
d883474f03
Fixed LABEL_PRINTER_HOOK_JSON check was missing when running label printer WebHooks client side (fixes #1978) 2022-08-25 18:46:49 +02:00
Bernd Bestel
721a0ce417
Move back to original tempusdominus-bootstrap-4 package (references #143) 2022-07-19 16:40:12 +02:00
Bernd Bestel
8cb9157c73
Fixed shopping list item form product barcode scan handling (fixes #1940) 2022-07-12 19:00:40 +02:00
Bernd Bestel
9498dd9c67
Improve /purchase tab order handling (closes #1915) 2022-06-11 12:48:20 +02:00
Bernd Bestel
48e9467a99
Fixed that rescheduling of "Track date only"-chores for today was not possible (fixes #1908) 2022-06-05 23:48:52 +02:00
Bernd Bestel
27582611c1
Split user setting stock_decimal_places_prices into separate settings for input/display (closes #1893) 2022-06-04 14:09:35 +02:00
Bernd Bestel
c4388a6f8f
Fixed product edit page stock journal button link (fixes #1867) 2022-04-21 19:34:08 +02:00
Rosemary Orchard
5e30e89737
Add support for "Move on Open" (#1863) 
* Add functionality to move a product when it is opened

* Update the API to support this (and some other new fields)

* Remove console, update move on open when either the default or the consume location change

* Fix conflict from fridge

* Ignore .DS_STORE from macOS

* Fix the migration conflict

* Fix the default location not appending properly

* Revert changes no longer needed

* Fix the checkbox disable logic, and call the function on page load

* Simplify the transfer to use the existing function (which also adds logs)

* Only move it if it's moving

* Code formatting / naming

* Clarify help text (it's not always about one unit, but about the corresponding amount opened)

* Handle splitted stock entries + optimized/unified product property checks

* Added UI feedback on auto moving

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2022-04-18 18:25:08 +02:00
Bernd Bestel
c0a727fcfc
Fixed recipe ingredient stock fulfillment icon for nested recipes (fixes #1851) 2022-04-09 22:07:56 +02:00
Bernd Bestel
150cfba455
Don't show invisible columns in table options 2022-04-07 19:46:13 +02:00
Bernd Bestel
632db0d8d1
Fixed new user settings naming 2022-04-07 19:25:27 +02:00
Bernd Bestel
6ecf94073d
Automatically create/update/delete inverse QU conversions (closes #1844) 2022-04-06 22:21:21 +02:00
Bernd Bestel
cab34df2d6
Related the price on /inventory to the selected QU instead of QU stock (closes #1346) 2022-04-06 21:27:47 +02:00