|
|
256b7b1543
|
Merge branch 'develop' into feature/unit-conversion
# Conflicts:
# cookbook/helper/recipe_url_import.py
|
2023-05-26 16:11:11 +02:00 |
|
|
|
aeb944b281
|
dont show properties if no reference amout is given
|
2023-05-26 15:32:55 +02:00 |
|
|
|
3302dacdc3
|
properties structure imporioved
|
2023-05-25 16:13:16 +02:00 |
|
|
|
4c69a0b721
|
fixed json import missing source url attribute
|
2023-05-24 20:32:47 +02:00 |
|
|
|
2a5cba0178
|
improvements to property calculation
|
2023-05-07 00:30:32 +02:00 |
|
|
|
9a77089c6d
|
improved unit conversion and tests
|
2023-05-06 23:57:45 +02:00 |
|
|
|
19f5da77b2
|
cleanup migrations, remove pint to speed up base conversion and calculate properties on converted ingredients
|
2023-05-06 22:21:27 +02:00 |
|
|
|
2cc7278865
|
extremly innefficent WIP
|
2023-05-06 20:54:36 +02:00 |
|
|
|
60f31608b9
|
added recipe properties
|
2023-05-06 19:14:25 +02:00 |
|
|
|
86fd0dcab1
|
made the open data importer its own component
|
2023-05-05 16:33:30 +02:00 |
|
|
|
12da77f037
|
beser response and stuff
|
2023-05-04 17:12:49 +02:00 |
|
|
|
071926aada
|
improved importer merging behavior
|
2023-05-04 15:29:06 +02:00 |
|
|
|
33d048e623
|
improve importer
|
2023-05-04 08:43:36 +02:00 |
|
|
|
274fce5236
|
fixed importer
|
2023-05-02 16:27:03 +02:00 |
|
|
|
1046065f46
|
fixed load bulk
|
2023-05-01 22:36:39 +02:00 |
|
|
|
60243ad901
|
load bulk
|
2023-05-01 13:39:09 +02:00 |
|
|
|
d62c49eb2f
|
not yet fully working food import
|
2023-05-01 13:29:14 +02:00 |
|
|
|
1bb6eb7141
|
import open data content
|
2023-04-30 22:30:56 +02:00 |
|
|
|
89e3e85d1e
|
Merge branch 'develop' into feature/unit-conversion
# Conflicts:
# requirements.txt
|
2023-04-30 21:51:56 +02:00 |
|
|
|
595de0c5a1
|
fixed pytests
|
2023-04-22 17:56:01 -05:00 |
|
|
|
7d9fcac0c7
|
basic food property viewer in recipe view
|
2023-04-11 16:48:38 +02:00 |
|
|
|
9db5e45c26
|
added keyword automation to url import
|
2023-04-05 15:46:10 -05:00 |
|
|
|
2a6fc723d0
|
first food property UI prototype
|
2023-04-04 13:13:51 +02:00 |
|
|
|
25c914606e
|
improved converters and helpers
|
2023-04-02 10:54:57 +02:00 |
|
|
|
44cb2d9807
|
improved tests and limited conversion to existing units
|
2023-04-02 10:05:28 +02:00 |
|
|
|
7e350b2f90
|
improved property calculator
|
2023-03-25 07:59:07 +01:00 |
|
|
|
6d5592c1be
|
basic food property calculation
|
2023-03-25 07:46:06 +01:00 |
|
|
|
9241638686
|
Merge branch 'develop' into feature/unit-conversion
|
2023-03-25 06:23:56 +01:00 |
|
|
|
84a1c560cc
|
Merge pull request #2270 from MarcusWolschon/features/upstream/1552_Import_Recipes_from_Cookidoo
#1552 import recipes from cookidoo
|
2023-03-25 05:51:18 +01:00 |
|
|
|
cb518a0cca
|
many more unit conversions
|
2023-03-16 17:07:46 +01:00 |
|
|
|
6efe4ab08d
|
base unit conversions
|
2023-03-15 17:30:23 +01:00 |
|
|
|
b10be8d321
|
playing around with pint
|
2023-02-26 11:56:48 +01:00 |
|
|
|
8a648a5e41
|
unit conversion cleanups
|
2023-02-26 09:12:16 +01:00 |
|
|
|
2781730778
|
fixed mess
|
2023-02-19 21:09:06 +01:00 |
|
|
|
985e98c699
|
fixed shopping list meal plan logic
|
2023-02-19 17:05:39 +01:00 |
|
|
|
c08c1d30ad
|
fixed review shopping before save, improved meal plan edit modal independece
|
2023-02-18 21:55:17 +01:00 |
|
|
|
5dad6b8b17
|
enable cross tandoor importing
|
2023-02-16 17:32:43 +01:00 |
|
|
|
3c527fd112
|
allow infiinit sharing as space setting
|
2023-02-12 18:16:43 +01:00 |
|
|
|
9846c4df18
|
added support for rezeptsuite.de imports
|
2023-02-11 17:51:44 +01:00 |
|
|
|
820c9b704f
|
improved servings parser
|
2023-02-11 09:04:05 +01:00 |
|
|
|
bce44866c2
|
add translations, go back to using scraper.instructions()
|
2023-01-30 16:49:38 +01:00 |
|
|
|
dfa0794281
|
Merge pull request #2272 from MarcusWolschon/features/upstream/ingredients_special_cases
handle 2 more special cases in ingredients
|
2023-01-27 15:14:47 +01:00 |
|
|
|
b4c26682c7
|
simplify
|
2023-01-17 15:20:59 +01:00 |
|
|
|
3b9d221258
|
fixed importer loading empty ingredients
|
2023-01-16 20:41:29 +01:00 |
|
|
|
c690bc18a0
|
Fix CodeQL issue with regular expression
|
2023-01-15 14:27:55 +01:00 |
|
|
|
394f24c29f
|
handle special cases in ingredients
|
2023-01-15 13:50:06 +01:00 |
|
|
|
f43ef3ad59
|
another typo
|
2023-01-15 13:04:29 +01:00 |
|
|
|
4c71c5b088
|
fix typo
|
2023-01-15 13:03:51 +01:00 |
|
|
|
54d0b70f01
|
#1552 use instructions_list() instead of instructions() and move Thermomix-Handling to clean_instruction_string()
|
2023-01-15 12:55:03 +01:00 |
|
|
|
5a0f07a6b2
|
handle steps
|
2023-01-13 22:21:31 +01:00 |
|
