|
|
3cf0395a18
|
lots of small fixes
|
2022-04-22 19:26:49 +02:00 |
|
|
|
2ddb0c719a
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/src/apps/RecipeEditView/RecipeEditView.vue
# vue/src/utils/openapi/api.ts
|
2022-04-22 16:41:13 +02:00 |
|
|
|
d9dd0a594e
|
show recipe and allow delete in ingredient editor
|
2022-04-17 23:25:22 +02:00 |
|
|
|
d50fb69ce9
|
fixed errro message in meal plan when adding notes with add to shopping
|
2022-04-17 15:48:18 +02:00 |
|
|
|
7befa4a084
|
added basic ingredient editor
|
2022-04-14 13:01:27 +02:00 |
|
|
|
528ada7d32
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/package.json
|
2022-04-04 19:16:20 +02:00 |
|
|
|
b7e6e7b1b0
|
fixed s3 check
|
2022-04-04 19:15:11 +02:00 |
|
|
|
60bb3fd4aa
|
Merge pull request #1633 from smilerz/recipe_as_food
allow marking recipe as food
|
2022-04-04 19:06:10 +02:00 |
|
|
|
b6e5425bd3
|
Get image from S3-Storage if configured
|
2022-04-02 11:35:35 +02:00 |
|
|
|
486d197854
|
allow marking recipe as food
|
2022-03-06 23:12:59 -06:00 |
|
|
|
bdccdf0893
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# cookbook/helper/recipe_url_import.py
|
2022-03-04 14:33:59 +01:00 |
|
|
|
55539c83c9
|
fixed supermarket category creation
|
2022-03-01 16:26:36 +01:00 |
|
|
|
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 |
|
|
|
abeeac838b
|
fix serializer using food name instead of supermarket name
|
2022-02-23 14:31:43 -06:00 |
|
|
|
081edfd2d6
|
fix errors on Tandoor recipe import
|
2022-02-22 16:33:09 -06:00 |
|
|
|
e52054e732
|
retain original text when parsing ingredients
|
2022-02-21 09:47:27 -06:00 |
|
|
|
e04d672750
|
import with image working
|
2022-02-21 15:59:30 +01:00 |
|
|
|
c8fc67fa2b
|
changed source import to match field structure of recipe model
first imports working
|
2022-02-19 17:54:00 +01:00 |
|
|
|
e081d823ed
|
fix book share permission
|
2022-02-18 17:52:32 +01:00 |
|
|
|
6b5a099ba0
|
removed case insensitive get_or_create for units
|
2022-02-17 12:49:41 -06:00 |
|
|
|
f1fa5e32bf
|
fix case insensitive get_or_create
|
2022-02-17 10:50:38 -06:00 |
|
|
|
1b7f97dc64
|
case insensitive get_or_create
|
2022-02-17 10:23:31 -06:00 |
|
|
|
4c9ddee55c
|
restrict get_or_create to name & space
|
2022-02-16 10:50:01 -06:00 |
|
|
|
924ffc473b
|
fix recipe sharing
|
2022-02-08 14:59:54 -06:00 |
|
|
|
0e258a49fb
|
reload book recipes when adding filter
|
2022-02-08 12:30:11 -06:00 |
|
|
|
dc71260baa
|
Merge branch 'additional_fixes' into feature/custom_filters
|
2022-02-08 09:05:07 -06:00 |
|
|
|
88b3ba1427
|
various fixes
|
2022-02-08 08:13:16 -06:00 |
|
|
|
93b7e5790d
|
merge clashing commits
|
2022-02-07 18:11:38 -06:00 |
|
|
|
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 |
|
|
|
d6af318c21
|
tests for single food reset inherit and additional inheritted fields
|
2022-02-07 09:16:48 -06:00 |
|
|
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +01:00 |
|
|
|
6ef25b604b
|
add food substitutions
|
2022-02-03 15:04:46 -06:00 |
|
|
|
dcad389010
|
food edit modal - reset children inheritance
|
2022-02-03 12:15:04 -06:00 |
|
|
|
fcb8e520b7
|
WIP
|
2022-02-03 12:11:32 -06:00 |
|
|
|
890e9e7242
|
created CustomFilter model and api
|
2022-02-03 12:09:14 -06:00 |
|
|
|
a3fa01d8d3
|
Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress
|
2022-02-03 15:59:18 +01:00 |
|
|
|
e2f8f29ec8
|
refactor list_from_recipe as class RecipeShoppingEditor
|
2022-01-29 10:28:01 -06:00 |
|
|
|
a0892470e1
|
Merge branch 'feature/export-progress' into develop
|
2022-01-28 15:41:49 +01:00 |
|
|
|
4a48019885
|
fix duplicate shopping entries when using old list
|
2022-01-26 14:47:33 -06:00 |
|
|
|
47823132f0
|
add ignore_shopping && additional help
|
2022-01-26 12:57:29 -06:00 |
|
|
|
2e2080d8d1
|
fix Recipe Counts on food/keyword/unit serializer
|
2022-01-25 16:48:30 -06:00 |
|
|
|
ae14dde13d
|
propperly fixed setting
|
2022-01-25 18:33:12 +01:00 |
|
|
|
c90e5d72af
|
shopping list ux optimization, left handed mode
|
2022-01-21 00:13:36 +01:00 |
|
|
|
c20e982fb1
|
Fix typos
|
2022-01-20 00:50:41 +01:00 |
|
|
|
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 |
|
|
|
61a253675c
|
fixed default import / export
|
2022-01-19 16:08:03 +01:00 |
|
|
|
530b1a8986
|
fix sort by new
|
2022-01-19 08:39:40 -06:00 |
|
|
|
3ea96d4102
|
basics
|
2022-01-18 21:09:08 +01:00 |
|
|
|
532d32c194
|
fixed shopping user save setting would not work
|
2022-01-17 22:41:38 +01:00 |
|
|
|
90b6f9ad06
|
fixed sub recipe issue
|
2022-01-17 19:54:16 +01:00 |
|
