kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-31 10:46:36 +00:00
Code Issues Projects Releases Wiki Activity
1,325 Commits 2 Branches 80 Tags
ed2239c1f688859f65826c067b950c5a7eae568c
Commit Graph

1325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernd Bestel
5c101e6750 Use phpfmt to format .php files 2020-08-30 22:52:35 +02:00
Bernd Bestel
2f00d673a7 Also format .blade.php files by default VSCode formatting rules 2020-08-30 22:08:17 +02:00
Bernd Bestel
9cea0c77cd Applied VSCode JS formatting settings 2020-08-30 12:18:16 +02:00
Bernd Bestel
e0e3212f13 Added VSCode JS formatting settings 2020-08-30 12:16:23 +02:00
Bernd Bestel
747660d909 Return API exceptions with proper content type 2020-08-29 19:29:24 +02:00
Bernd Bestel
e93f58916e Forgot some entries in permission_hierarchy... 2020-08-29 19:24:19 +02:00
fipwmaqzufheoxq92ebc
17094f56eb Run database-Migrations in right order (#973) 2020-08-29 19:15:02 +02:00
Bernd Bestel
0f499c69d9 Fixed .pot file syntax error 2020-08-29 18:34:05 +02:00
Bernd Bestel
86300b7025 Refined permissions by existing feature structure (closes #971, references #960) 2020-08-29 18:31:28 +02:00
Bernd Bestel
a8395cb748 Fixed undefined constants warning on the 404 error page 2020-08-29 17:12:31 +02:00
Bernd Bestel
22384aaa2e Error page style improvements 2020-08-29 16:58:06 +02:00
Bernd Bestel
3b0d29bed0 Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
Bernd Bestel
2c966c77fd Added an EditorConfig file 2020-08-29 16:10:05 +02:00
kriddles
22ca427ca9 Include location and shopping_location_id when opening products (#965) 2020-08-29 12:26:36 +02:00
Bernd Bestel
32cd928460 Added changelog for #960 2020-08-29 12:22:53 +02:00
fipwmaqzufheoxq92ebc
b7d1b21f1d [WIP] Implemented basic permissions (#960) 
* Add permissions to Database & add "User"-classes

* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.

* Add some permissions.

* Add permission localization

* Add error handling.

* Error pages: only redirect on 404

* ExceptionController: return JSON-Response on api-routes

* Rename PRODUCT_ADD to PRODUCT_PURCHASE

* Move translation to new file

* Fix checkboxes stay selected on reload.

* Remove configurable User-implementation

* Remove MASTER_DATA_READ

* Disable buttons the user isn't allowed to use.

* Add default permissions for new users

* When migration to permissions, everyone starts as ADMIN

* Permission-Localization: add to transifex & LocalizationService

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-08-29 12:05:32 +02:00
Bernd Bestel
f28697e5b4 Added a "Clear filter" button on the stock overview page (closes #879) 2020-08-25 20:20:51 +02:00
Bernd Bestel
0417b73cb5 Show if a consume booking was spoiled on the stock journal page (closes #953) 2020-08-25 19:51:54 +02:00
Bernd Bestel
71a6cbef2d First try on stock overview page: Make filter row more compact 2020-08-25 19:45:54 +02:00
Bernd Bestel
471a8665d0 Remove the new help icons where not needed and translate help text 2020-08-25 19:28:44 +02:00
Bernd Bestel
4058925f40 Handle edited stock entries in GetProductPriceHistory (fixes #913) 2020-08-25 19:09:47 +02:00
Bernd Bestel
0b98504371 Don't hide the product row on the stock overview page if there are still child products in stock 2020-08-25 18:15:34 +02:00
Bernd Bestel
4db373b272 Fixed parent product amount aggregation (fixes #878) 2020-08-25 18:13:26 +02:00
Bernd Bestel
3b564294e3 Allow decimal amounts in general for the shopping list 2020-08-24 20:25:50 +02:00
Bernd Bestel
ece880ea44 Don't round up missing amounts and allow decimal numbers (fixes #758) 2020-08-24 20:16:21 +02:00
Bernd Bestel
9d04d81744 Use correct amount for the success popup on the consume page (fixes #766) 2020-08-24 19:06:33 +02:00
Bernd Bestel
5c62377ba6 Don't trigger row select event on first column (fixes #791) 2020-08-24 18:42:32 +02:00
Bernd Bestel
a569048a3a Validate form after changing the QU on the recipe ingredient edit page (fixes #907) 2020-08-24 18:32:50 +02:00
Bernd Bestel
95ca6f6354 Display "Track date only"-chores as all-day events on the calendar (fixes #941) 2020-08-24 18:27:40 +02:00
Bernd Bestel
c8c540970d Added missing localization string 2020-08-24 18:16:49 +02:00
Bernd Bestel
fa32258553 Only reload "Disable stock fulfillment checking for this ingredient" by the products default when creating a recipe ingredient (fixes #910) 2020-08-24 18:16:32 +02:00
Bernd Bestel
4d38614671 Reload recipe page after add/edit an ingredient (fixes #803) 2020-08-24 18:02:46 +02:00
Bernd Bestel
2c151fb4de Do an exact search for product group and location filters on the stock overview pages (fixes #778) 2020-08-24 17:57:43 +02:00
Bernd Bestel
e039db22f5 Don't prefill for empty prices when editing a stock entry (fixes #961) 2020-08-24 17:42:41 +02:00
Bernd Bestel
a6db08943c Streamline naming 2020-08-22 19:09:36 +02:00
Bernd Bestel
e3ff16c66a Downgrade animate.css, upgrade to v4 needs customizations 2020-08-22 18:25:59 +02:00
Bernd Bestel
fdb419fe55 Fixed errors while populating demo data 2020-08-22 17:59:42 +02:00
Bernd Bestel
0a3e85dab4 Make sure that the view products_last_purchased always returns a row per product, also for not in stock items (references #801) 
Otherwise there are errors when getting product details for currently not in stock items...
 2020-08-22 17:50:08 +02:00
Bernd Bestel
939b98e470 Make sure that the views products_average_price and products_oldest_stock_unit_price always returns a row per product, also for not in stock items (references #801) 
Otherwise there are errors when getting product details for currently not in stock items...
 2020-08-22 10:06:37 +02:00
Bernd Bestel
ffec1134a3 Added changelog for #959 2020-08-22 10:05:10 +02:00
fipwmaqzufheoxq92ebc
923e027a4b Some bug fixes. (#959) 
* Fixes #956. Return 404 for missing objects in GenericEntityApiController.php

* Fixes #936 and #943. Include Products that expire today in /stock/volatile and "Expiring soon"-sum on stockoverview

* Fixes #881. Remove items of deleted shopping lists.

* Fixes #875. Prevent infinite nested recipes.

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-08-22 09:58:25 +02:00
Bernd Bestel
cf9bb87f6e Upgraded to Quagga2 (again) (closes #799, also references #844) 2020-08-19 20:04:17 +02:00
Bernd Bestel
04bbad2167 Added changelog for #844 2020-08-19 19:56:24 +02:00
Andre Monteiro
b8cd5cd0b5 Additional configuration options for Quagga2 (#844) 2020-08-19 19:52:04 +02:00
Bernd Bestel
2cd3779d82 Added changelog for #855 2020-08-19 19:49:32 +02:00
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
Bernd Bestel
31c412a28c Typo 2020-08-19 19:31:52 +02:00
Bernd Bestel
41359137dc Added changelog for #921 2020-08-19 19:29:39 +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
5b475d9307 Added changelog for #876 2020-08-18 19:46:38 +02:00