585 Commits

Author SHA1 Message Date
Bernd Bestel
482a520062
Slightly modified new recipe stock fulfillment API endpoints (references #289) 2019-07-06 15:28:49 +02:00
Bernd Bestel
ddef58e2a9
Merge pull request #289 from Aerex/add-resolved-recipes-endpoint
Add requirement fulfillment recipes endpoint
2019-07-06 15:02:20 +02:00
Bernd Bestel
d34c7b0a87
Created the changelog for the next version 2019-07-06 14:56:56 +02:00
Bernd Bestel
b76e51ba41
Fixed nested recipes costs calculation (fixes #299) 2019-07-06 14:48:46 +02:00
Bernd Bestel
67cfd0ba5f
Remove the internal meal plan recipe when removing a meal plan entry (fixes #298) 2019-07-06 13:57:49 +02:00
Bernd Bestel
3fcede0b7c
Fix that "Track date only" cannot be tracked <> today (fixes #300) 2019-07-06 13:32:40 +02:00
Bernd Bestel
0c0e8c6957
Fixed the consume success message on stock overview page (fixes #302) 2019-07-06 13:13:38 +02:00
Aerex
a01a80578c Merge branch 'master' into add-resolved-recipes-endpoint 2019-06-20 23:40:55 -05:00
grocy
7a51fb77b0 feat: Added recipes/requirements route
- feat: Added requirements route to allow clients to access the requirements fulfilments of recipes
2019-06-20 23:11:57 -05:00
Bernd Bestel
511c95070e
Minor typos... 2019-06-09 09:34:21 +02:00
Bernd Bestel
eec6270cb7
Prepared next release v2.4.2 2019-06-09 09:30:18 +02:00
Bernd Bestel
7c7c5db28c
Fixed that a entered barcode on the product edit page was only saved when "adding" it to the barcodes list by pressing TAB (closes #269) 2019-06-09 09:21:56 +02:00
Bernd Bestel
6b98fa85d3
Improved meal plan entry reference when deleting an entry (references #255) 2019-06-09 09:10:29 +02:00
Bernd Bestel
825be63b93
Fixed single quotes problem in all pickers (fixes #264) 2019-06-09 09:06:44 +02:00
Bernd Bestel
a56f8be19e
Fixed page reloads with unsaved form data and "Auto reload on external changes" enabled (fixes #265) 2019-06-09 08:58:46 +02:00
Bernd Bestel
f736c4de44
Added changelog with current changes 2019-06-08 17:03:17 +02:00
Bernd Bestel
56217804b7
Always include en_GB localizations regardless of completion (because there aren't real translations needed, fixes #276) 2019-06-08 16:56:37 +02:00
Bernd Bestel
43710b5062
Properly show the API error when it failed to undo a stock booking (fixes #267) 2019-06-08 16:53:31 +02:00
Bernd Bestel
b1adaa24cf
Fix session problem on 32 bit systems when using "stay logged in permanently" (fixes #278) 2019-06-08 16:47:45 +02:00
Bernd Bestel
9e7d62b62d
Make sure to hide all tooltips before removing an element (fixes #260) 2019-06-08 16:39:35 +02:00
Bernd Bestel
9f2481a6a8
Fixed an issue when a plural translation is empty/null (can be the case for quantity units, fixes #259) 2019-06-08 16:32:23 +02:00
Bernd Bestel
2b77bc6ae6
Fixed deleting meal plan entries did not work (fixes #255) 2019-06-08 16:30:45 +02:00
Bernd Bestel
91116ee768
Make sure user settings variable is populated always (fixes #277) 2019-06-08 15:54:56 +02:00
Bernd Bestel
167e57ef3f
Merge pull request #272 from BlizzWave/patch-23
Update grocy_night_mode.css
2019-05-30 19:42:05 +02:00
Marius Boro
3321bcd683
Update grocy_night_mode.css
Fixed unreadable text
2019-05-30 14:32:27 +02:00
Bernd Bestel
41b8b5d11e
Prepared new release v2.4.1 2019-05-16 22:25:46 +02:00
Bernd Bestel
0a4ea6861a
Fixed quotes were not escaped properly for contains search in dropdowns (fixes #249) 2019-05-16 22:20:01 +02:00
Bernd Bestel
8f9c3c66f7
Don't load userfieldsform.js when not needed 2019-05-16 22:14:04 +02:00
Bernd Bestel
d412b81eae
Hotfix (will be included in v2.4.0 release): Fixed a potential problem when the plural form of a translation (e. g. plural forms for user defined quantity units) is NULL 2019-05-10 21:22:53 +02:00
Bernd Bestel
55e5fd7bf1
Prepared next release v2.4.0 2019-05-10 21:08:42 +02:00
Bernd Bestel
1787690795
Added missing translations string 2019-05-10 21:04:28 +02:00
Bernd Bestel
3eb8b5f381
Pulled translations from Transifex 2019-05-10 21:01:58 +02:00
Bernd Bestel
d8cefeffb7
Added missing translations strings 2019-05-10 20:57:49 +02:00
Bernd Bestel
5da50d1e1e
Updated dependencies 2019-05-10 20:56:03 +02:00
Bernd Bestel
de89fee5bb
Fixed wrong amount was displayed in popup after consume 2019-05-10 20:43:57 +02:00
Bernd Bestel
338c6c0a9d
Added a new userfield type "preset-list" (closes #239) 2019-05-07 21:24:59 +02:00
Bernd Bestel
8504eb9b38
Finished first version of meal planning (for now closes #146) 2019-05-07 19:48:14 +02:00
Bernd Bestel
3f53919ddd
Also allow placeholders for plural translations (references #161) 2019-05-07 19:42:35 +02:00
Bernd Bestel
57233dba1a
Added first basic version of meal planning (references #146) 2019-05-06 19:38:47 +02:00
Bernd Bestel
e240260f9f
Unify translations strings which include an amount + quantity unit (references #161) 2019-05-05 14:31:27 +02:00
Bernd Bestel
dd148a8fc3
Use named arguments for all gettext strings which have more than 1 argument (again closes #161) 2019-05-05 14:13:50 +02:00
Bernd Bestel
153ac61867
Fix deleting user have not worked (fixes #237) 2019-05-04 23:10:01 +02:00
Bernd Bestel
9ef55f1f01
Make it possible to track a chore execution without the time part, only the day 2019-05-04 16:13:05 +02:00
Bernd Bestel
98fcd767b3
Fixed chore edit form - period type hint did not work (references #151) 2019-05-04 15:40:26 +02:00
Bernd Bestel
fe8bb43996
Fixed userfields did not load (references #176) 2019-05-04 15:21:50 +02:00
Bernd Bestel
328d96ed60
Only show plural forms text field on quantity unit edit page when the current language has more than 2 plural forms to prevent confusion (references #161) 2019-05-04 15:15:03 +02:00
Bernd Bestel
970e5edfa3
Fixed an issue with translations string without an placeholder (references #161) 2019-05-04 15:13:01 +02:00
Bernd Bestel
12ba99f649
Added "variable amount" for recipe ingredients (closes #181) 2019-05-04 14:50:15 +02:00
Bernd Bestel
314e434fd1
Updated translations 2019-05-04 13:43:14 +02:00
Bernd Bestel
29f69c92e9
Update OpenAPI object schemas and added more examples (closes #218) 2019-05-04 13:33:44 +02:00