Commit Graph

851 Commits

Author SHA1 Message Date
66c0cc070a removed old shopping list 2022-04-23 14:43:03 +02:00
e2ab3a0efb fixed ingredient parser length issues 2022-04-23 14:15:06 +02:00
e0b7d1a8f0 added support for unit/amount at end of ingredient 2022-04-23 13:53:04 +02:00
012a1a7915 ingredient parser produces expected results again 2022-04-23 13:03:15 +02:00
2af36a3db4 Merge branch 'develop' of github.com:ndbeals/tandoor_recipes into develop 2022-04-23 00:11:08 -04:00
8df3009cb2 Update image upload handler to be content-type aware
Update handle_image: made filetype required and not optional
Updated handle_image usage to reflect changes
2022-04-23 00:11:04 -04:00
b4ebd98ee8 ingredient editor paginatio 2022-04-23 02:28:26 +02:00
9b132e71f2 screw up ingredient parser 2022-04-23 01:21:13 +02:00
9adc1f7266 small fixes and tests 2022-04-22 22:27:17 +02:00
1740913a14 improve experience when importing multiple recipes 2022-04-22 20:19:39 +02:00
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
45a86a22e3 recipe switcher and navbar fixes
also added left_hand to global preferences
2022-04-18 14:13:23 +02:00
f0d59a8c9c added ability to open ingredient editor from food/unit list 2022-04-17 22:43:33 +02:00
3159868ba4 moved generic multiselect create function into component 2022-04-14 14:08:16 +02:00
7befa4a084 added basic ingredient editor 2022-04-14 13:01:27 +02:00
48e9f3f8a9 added cookmate importer 2022-04-04 22:49:50 +02:00
85aad42529 added mela recipes importer 2022-04-04 21:09:47 +02:00
e901c6708c Merge branch 'develop' into feature/importer_to_vue 2022-03-15 13:02:10 +01:00
4cf8b72e3f removed OT from sle 2022-03-15 12:50:41 +01:00
96bd66f9e6 fixed telegram bot 2022-03-15 11:48:12 +01:00
5627161c5e Merge branch 'develop' into feature/importer_to_vue 2022-03-10 15:27:11 +01:00
53518f4c47 Fixed typos and grammatical issues. 2022-03-08 12:12:20 -08:00
22ca482458 super very basics of manual mapping page working 2022-03-05 16:02:42 +01:00
2565ab30a4 lots of improvements and bookmarklet import working again 2022-03-05 15:16:58 +01:00
6d8fe3c162 wip 2022-03-04 15:54:11 +01: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
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
c8dcca8630 fix recipe search in export form (converted to change safe genericAPI) 2022-02-23 17:24:06 -06:00
a7d66fa850 export recipes from saved filter 2022-02-22 15:18:39 -06:00
52c16ab7dd all types bascially working (lacking bookmark) 2022-02-22 17:00:30 +01: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
89348f69f1 basics of new import page 2022-02-19 16:55:17 +01:00
55b035eaaa first boilerplate for new import view 2022-02-19 09:34:42 +01:00
e081d823ed fix book share permission 2022-02-18 17:52:32 +01:00
d6fa02cc9e Merge branch 'develop' into feature/custom_filters 2022-02-18 17:25:15 +01:00
7e5019eed3 fixed share write permission for meal plan 2022-02-17 14:57:28 +01:00
4e8bbefc17 minor cleanup 2022-02-15 06:42:57 -06:00
19708dbc64 paste list of ingredients 2022-02-14 17:28:16 -06:00
8fa00b50b1 added update_at filter 2022-02-14 15:13:34 -06:00
bf54680178 more recipe search tests 2022-02-13 13:53:07 -06:00
baa2aa51da more recipe search tests 2022-02-09 16:18:45 -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
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
969df37e28 fixed sharing and added additional tests 2022-02-07 15:43:06 +01:00
39ca3ac1ad no system page for non superuser 2022-02-07 13:08:18 +01:00
6ef25b604b add food substitutions 2022-02-03 15:04:46 -06:00