kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity
1,515 Commits 2 Branches 80 Tags
c57e5543699666dbde0206ce38e24efeedfa9ffa
Commit Graph

246 Commits

Author SHA1 Message Date
Bernd Bestel
d9e42331f9 Allow some HTML tags in API request body (needed at least for HTML editor fields) (fixes #1228) 2020-12-29 19:19:04 +01:00
Bernd Bestel
b6139a6991 Optimized filter_var checks 2020-12-28 22:14:59 +01:00
Marc Ole Bulling
7e8f460dad Added /system/time API call (#1223) 
* Inital structure for /system/time API call

* Parse arguments for offset

* Correctly parsing parameters

* Fixed implimentation, added to openapi.json

* Modified DOC

* Added Sqlite3 time to output

* Fixed error with negative offset

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-12-28 19:39:24 +01:00
Bernd Bestel
2e3c237648 Fixed zero decimals handling (fixes #1213) 2020-12-23 19:56:37 +01:00
Bernd Bestel
f0d99a5714 Fixed API key deletion was not possible (fixes #1203) 2020-12-21 16:20:12 +01:00
Bernd Bestel
2b13102299 Implemented Userfields for users (closes #1159) 2020-12-20 22:16:58 +01:00
Bernd Bestel
8f1ce607f7 Implemented user pictures (closes #1158) 2020-12-20 22:08:50 +01:00
Bernd Bestel
c9b5e14473 Make it possible to merge products (closes #243) 2020-12-20 20:58:22 +01:00
Bernd Bestel
b2f555400c Fixed database migration error handling 
(Error page was not shown properly)
 2020-12-20 16:52:13 +01:00
Bernd Bestel
df7653f4e5 Optimized barcode concatenation handling 2020-12-20 16:00:14 +01:00
Bernd Bestel
a5326aa95c Improve API stock action endpoint response (closes #769) 2020-12-20 14:43:07 +01:00
Bernd Bestel
b2d7003335 Performance optimizations 2020-12-20 10:44:19 +01:00
Bernd Bestel
268b8e87d7 Make it possible to hide chores/batteries (closes #1069) 2020-12-20 10:19:44 +01:00
Bernd Bestel
f5e0709913 Added columns for last price on shopping list (closes #410) 2020-12-19 17:55:49 +01:00
Bernd Bestel
7ef5bc6f77 Add some more columns (hidden by default) (references https://github.com/grocy/grocy/issues/1058#issuecomment-744059155) 2020-12-19 10:51:07 +01:00
Bernd Bestel
eb4a748da3 Consume opened products first (closes #1183) 2020-12-19 10:28:35 +01:00
Bernd Bestel
bb6ef5511d Fixed API equals/not equals filter comparison (fixes #1182) 2020-12-16 21:52:24 +01:00
Robert Resch
07ff28da39 Add row group customization (#1189) 
* Add row group customization

* fix rowGroup state loading

* activate rowGroup for all datatables

* add reset button

* reload page done on success callback

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-12-16 18:18:03 +01:00
Bernd Bestel
59aad1c180 Added REGEXP operator for API query filter (closes #1174) 2020-12-12 10:44:27 +01:00
Bernd Bestel
d3883ba93a Reorganized API exposed entities 2020-12-12 10:10:21 +01:00
Bernd Bestel
51a95814e0 Handle null in API filter (closes #1173) 2020-12-11 19:32:08 +01:00
Bernd Bestel
672c4d33bf Added basic RTL support (reference #984) 2020-12-11 18:06:32 +01:00
Bernd Bestel
48aa9fd138 Added an API endpoint to get the authenticated user (closes #1165) 2020-12-09 21:16:49 +01:00
Bernd Bestel
fda8411ab3 Support descending ordering in generic API filter (closes #1167) 2020-12-09 21:04:04 +01:00
Bernd Bestel
cf34df5e3f Squashed commit 
Fixed some localization strings
Reviewed/optimized product deletion handling
Add option to hide products from the stock overview page (closes #906)
Prefill default_due_days also on the inventory page (closes #591)
Added DataTables accent chinese-string plugin (closes #872)
Show costs and calories per recipe ingredient (closes #1072)
Fixed user permission saving (fixes #1099)
User permissions should not have an effect for demo mode (closes #972)
Handle QU conversion when consuming a substituation (child) product (fixes #1118)
Consume/open any child product when the parent product is not in stock (closes #899)
Added a retry camera barcode scanning button to product picker workflow (closes #736)
 2020-12-07 19:48:33 +01:00
Bernd Bestel
166748788b Added an include_sub_products parameter to the API endpoint /stock/products/{productId}/locations 2020-11-19 18:37:16 +01:00
Bernd Bestel
887526c727 Squashed commit 
Fixed number input min/max amount handling
Only (auto) save valid user inputs
More filters on the stock journal pages
Save the last price per used barcode and preselect that as a total price on purchase if not empty (closes #1131)
Don't apply conversions for only_check_single_unit_in_stock ingredients (fixes #1120)
Render shopping list userfields (closes #1052)
Fixed Focus when adding included recipes (closes #1019)
Order all base objects with NOCASE (closes #1086)
 2020-11-17 19:11:02 +01:00
Bernd Bestel
8733ae17e7 Forgot to save before last commit... 2020-11-16 22:30:51 +01:00
Bernd Bestel
512ef745da Don't expose uihelper views via the API / allow to get stock_log via generic entity interaction endpoints (no edit) 2020-11-16 22:18:37 +01:00
Bernd Bestel
7b4edf3147 Adapt shopping list add expired products for #851 2020-11-15 22:38:21 +01:00
Bernd Bestel
b393998601 Distinguish expiry/best before dates (closes #851) 2020-11-15 19:53:44 +01:00
Bernd Bestel
1d1642b464 Make the quick consume buttons on the stock overview page configurable per product (closes #613) 2020-11-15 09:57:45 +01:00
Bernd Bestel
d1846b76ff Fixed parent product selection (fixes #1128) 2020-11-15 09:12:14 +01:00
Bernd Bestel
62c9c285ba Document API changes in grocy.openapi.json (closes #969) 2020-11-14 21:26:16 +01:00
Bernd Bestel
62997d39bc Removde the /objects/{entity}/search API endpoint, added the new filter capabilities to /objects/{entity} (references #985) 2020-11-14 11:27:13 +01:00
Bernd Bestel
b0b3322266 Also relate the shopping list amount to QU stock 2020-11-13 17:30:57 +01:00
Bernd Bestel
c360cbec4c UI strings/tooltips/basic handling review/optimizations 2020-11-12 21:35:10 +01:00
Bernd Bestel
68eeb07e5f Test/review/rework (and hopefully finalized) new price handling 2020-11-10 18:11:33 +01:00
Bernd Bestel
33a6a28208 Also use the productamountpicker on the shopping list item page (refernces #1015) 2020-11-09 22:15:25 +01:00
Bernd Bestel
b6f4cfa851 Also use the productamountpicker for inventory (refernces #1015) 2020-11-09 21:51:55 +01:00
Bernd Bestel
8bd157ca9d Use producamountpicker "everywhere" (closes #1015) 2020-11-09 19:25:46 +01:00
Bernd Bestel
4c399392eb Fixed recipes page when there are no recipes 2020-11-08 21:44:39 +01:00
Bernd Bestel
0134535a5e Fix/workaround for undfined constant GROCY_LOCALE 2020-11-08 21:37:43 +01:00
kriddles
de85cb9e04 limit to normal recipes (#1111) 2020-10-31 16:25:33 +01:00
kriddles
9bbcdafab9 Add purchased date to inventory (#1102) 
* Add purchased date to inventory

* Clarify stock settings label

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-10-29 17:04:34 +01:00
Bernd Bestel
94214b867a More authentication refactoring to also provide "plugable" credentials handling (references #921, needed for #305) 2020-10-19 18:38:12 +02:00
Bernd Bestel
9f88dd3af3 Fixed login did not work 2020-10-19 17:19:13 +02:00
kriddles
f7a1634442 typo (#1062) 2020-10-18 13:57:10 +02:00
Bernd Bestel
5ed7a0ca53 Don't strip boolean values (references #996, fixes #1055) 2020-10-17 11:15:31 +02:00
kriddles
cd65195532 add purchased date to purchase (#1056) 2020-10-17 10:54:10 +02:00