Commit Graph

254 Commits

Author SHA1 Message Date
vabene1111
d50fb69ce9 fixed errro message in meal plan when adding notes with add to shopping 2022-04-17 15:48:18 +02:00
vabene1111
7befa4a084 added basic ingredient editor 2022-04-14 13:01:27 +02:00
vabene1111
b7e6e7b1b0 fixed s3 check 2022-04-04 19:15:11 +02:00
vabene1111
60bb3fd4aa
Merge pull request #1633 from smilerz/recipe_as_food
allow marking recipe as food
2022-04-04 19:06:10 +02:00
Volker Kettenbach
b6e5425bd3
Get image from S3-Storage if configured 2022-04-02 11:35:35 +02:00
smilerz
486d197854
allow marking recipe as food 2022-03-06 23:12:59 -06:00
vabene1111
55539c83c9 fixed supermarket category creation 2022-03-01 16:26:36 +01:00
vabene1111
fc6268b7ff
Merge pull request #1564 from smilerz/retain_original_ingredient_text
retain original text when parsing ingredients
2022-02-25 16:17:44 +01:00
smilerz
abeeac838b
fix serializer using food name instead of supermarket name 2022-02-23 14:31:43 -06:00
smilerz
081edfd2d6
fix errors on Tandoor recipe import 2022-02-22 16:33:09 -06:00
smilerz
e52054e732
retain original text when parsing ingredients 2022-02-21 09:47:27 -06:00
vabene1111
e081d823ed fix book share permission 2022-02-18 17:52:32 +01:00
smilerz
6b5a099ba0
removed case insensitive get_or_create for units 2022-02-17 12:49:41 -06:00
smilerz
f1fa5e32bf
fix case insensitive get_or_create 2022-02-17 10:50:38 -06:00
smilerz
1b7f97dc64
case insensitive get_or_create 2022-02-17 10:23:31 -06:00
smilerz
4c9ddee55c
restrict get_or_create to name & space 2022-02-16 10:50:01 -06:00
smilerz
924ffc473b
fix recipe sharing 2022-02-08 14:59:54 -06:00
smilerz
0e258a49fb
reload book recipes when adding filter 2022-02-08 12:30:11 -06:00
smilerz
dc71260baa
Merge branch 'additional_fixes' into feature/custom_filters 2022-02-08 09:05:07 -06:00
smilerz
88b3ba1427
various fixes 2022-02-08 08:13:16 -06:00
smilerz
93b7e5790d
merge clashing commits 2022-02-07 18:11:38 -06:00
vabene1111
4c5994ee7f Merge branch 'develop' into feature/custom_filters
# Conflicts:
#	cookbook/serializer.py
#	cookbook/views/api.py
#	vue/src/utils/openapi/api.ts
2022-02-07 18:56:19 +01:00
smilerz
d6af318c21
tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -06:00
vabene1111
969df37e28 fixed sharing and added additional tests 2022-02-07 15:43:06 +01:00
Chris Scoggins
6ef25b604b
add food substitutions 2022-02-03 15:04:46 -06:00
Chris Scoggins
dcad389010
food edit modal - reset children inheritance 2022-02-03 12:15:04 -06:00
Chris Scoggins
fcb8e520b7
WIP 2022-02-03 12:11:32 -06:00
Chris Scoggins
890e9e7242
created CustomFilter model and api 2022-02-03 12:09:14 -06:00
vabene1111
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
Chris Scoggins
e2f8f29ec8
refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
vabene1111
a0892470e1
Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
Chris Scoggins
4a48019885
fix duplicate shopping entries when using old list 2022-01-26 14:47:33 -06:00
Chris Scoggins
47823132f0
add ignore_shopping && additional help 2022-01-26 12:57:29 -06:00
Chris Scoggins
2e2080d8d1
fix Recipe Counts on food/keyword/unit serializer 2022-01-25 16:48:30 -06:00
vabene1111
ae14dde13d propperly fixed setting 2022-01-25 18:33:12 +01:00
Kaibu
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
Sebastian Weber
c20e982fb1
Fix typos 2022-01-20 00:50:41 +01:00
vabene1111
890817ef6d
Merge pull request #1374 from smilerz/patch-updated-search
fix sort by new and show recent recipes
2022-01-19 17:01:46 +01:00
vabene1111
61a253675c fixed default import / export 2022-01-19 16:08:03 +01:00
smilerz
530b1a8986 fix sort by new 2022-01-19 08:39:40 -06:00
vabene1111
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
vabene1111
532d32c194 fixed shopping user save setting would not work 2022-01-17 22:41:38 +01:00
vabene1111
90b6f9ad06 fixed sub recipe issue 2022-01-17 19:54:16 +01:00
vabene1111
306f90aa98 recipe editor decimal fixes 2022-01-17 16:27:10 +01:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
smilerz
6d9a90c6ba fix onhand_users 2022-01-13 16:49:10 -06:00
smilerz
e313481fc8 WIP 2022-01-13 16:00:59 -06:00
smilerz
f9b04a3f1e bug fix 2022-01-11 08:33:42 -06:00
smilerz
f7cb067b52 construct values in queryset instead of serializer methods 2022-01-11 07:24:59 -06:00
Tiago Rascazzi
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00