smilerz
ec6a10ca0a
ensure time is always a number
2021-04-16 09:02:02 -05:00
smilerz
3cf949bf8d
added ability to create custom scrapers
2021-04-16 09:02:02 -05:00
smilerz
0a62225797
removed old json importer
2021-04-16 09:02:02 -05:00
smilerz
a54f4e1367
updated import from source to use text scraper
2021-04-16 09:02:02 -05:00
smilerz
bf3c30a8fb
remove old html_import function
2021-04-16 09:02:02 -05:00
smilerz
f811f5996e
wrapper for recipe_scrapers to parse text input
2021-04-16 09:02:02 -05:00
smilerz
c8a4861df8
redirect to import url for processing
2021-04-16 09:02:02 -05:00
smilerz
f80c44bca3
bookmarklet passing data to form
2021-04-16 09:02:02 -05:00
smilerz
6a2c27749f
updated links to import recipes
2021-04-16 09:02:02 -05:00
smilerz
1188ed9227
cosmetic cleanup
2021-04-16 09:02:02 -05:00
smilerz
cb708e7e47
added image import
2021-04-16 09:02:02 -05:00
smilerz
40a2f7ff90
combined json import and source import
2021-04-16 09:02:01 -05:00
smilerz
4015517c0a
more fix from super ugly merge
2021-04-16 09:02:01 -05:00
smilerz
7c8d41753c
more cleanup from ugly merge
2021-04-16 09:02:01 -05:00
smilerz
90670613c5
fixed ugly merge
2021-04-16 09:02:01 -05:00
smilerz
44dee16e0a
manually parse json
2021-04-16 09:02:01 -05:00
smilerz
3a48d0e580
commit merge from Patralos/recipes
2021-04-16 09:02:01 -05:00
smilerz
83fce6461a
import raw json/html
2021-04-16 09:02:01 -05:00
smilerz
f0d37244b6
refactored json parser to create functions for each sub parser
2021-04-16 09:02:01 -05:00
smilerz
8d02cad7d9
resolved deprecation warnings introduced in django 3.2
2021-04-12 14:12:04 -05:00
vabene1111
a5b92f5672
fixed template render issues
2021-04-04 11:16:48 +02:00
smilerz
45dba6fad2
fix json direct import when wrapped in @graph
2021-03-19 13:23:55 -05:00
vabene1111
58fc26904b
fixed url importer stuff
2021-03-19 10:05:17 +01:00
vabene1111
f04a51c1ad
fixed empty units/foods (again)
2021-03-19 00:19:29 +01:00
vabene1111
55920501b8
small tweaks
2021-03-18 20:48:28 +01:00
vabene1111
cc3e00e75f
Merge branch 'develop' into url_import_recipes
...
# Conflicts:
# cookbook/helper/recipe_url_import.py
# cookbook/tests/api/test_api_keyword.py
# cookbook/tests/other/test_edits_recipe.py
# cookbook/views/api.py
# requirements.txt
2021-03-18 20:38:51 +01:00
vabene1111
48c90c483a
merged PR 474 adding manual json import
2021-03-18 12:36:00 +01:00
vabene1111
6a25428b3c
fixed shopping list share permission
2021-03-18 11:04:55 +01:00
vabene1111
ba4c3b95e5
removed deprecated functions/packages
2021-03-10 18:17:31 +01:00
smilerz
eed6e9d3a5
catch index error
2021-03-04 15:30:20 -06:00
smilerz
f4af7ffb0b
except do it right this time
2021-03-04 15:03:33 -06:00
smilerz
3b072d5dd9
check for scrape.schema before using it
2021-03-04 14:59:56 -06:00
smilerz
bfaed434cc
refactored url_import to use recipe-scraper
2021-03-03 21:08:34 -06:00
vabene1111
c99c944130
fixed normal django test running with scopes
2021-02-25 22:19:51 +01:00
vabene1111
29ab6cfb2d
Merge branch 'develop' into feature/spaces
...
# Conflicts:
# cookbook/views/data.py
# cookbook/views/views.py
2021-02-25 15:59:32 +01:00
vabene1111
24b5cdff85
Merge pull request #459 from smilerz/fix-456
...
Fix 456
2021-02-25 08:14:55 +01:00
smilerz
21740522bc
fixed URL import when ingredient is a string
2021-02-24 20:13:06 -06:00
smilerz
cc62b088fd
fix URL import when recipeYield is a list
2021-02-24 17:52:40 -06:00
vabene1111
46fb02376e
recipe share basics
2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e
updated migrations + setup process update
2021-02-21 15:34:35 +01:00
vabene1111
846c660811
usr signup and more
2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f
forms
2021-02-20 23:42:44 +01:00
vabene1111
d7675d4b80
ingredients and helpers
2021-02-20 21:26:16 +01:00
vabene1111
e2b1115b3b
fixed servings blank
2021-02-20 18:50:28 +01:00
vabene1111
96c963795e
more spaces work
2021-02-20 18:47:14 +01:00
vabene1111
ad163509b4
updated edit and added space find methods
2021-02-19 18:09:42 +01:00
vabene1111
fb58d35029
space stuff partially working
2021-02-19 15:50:55 +01:00
vabene1111
777f4518be
servings default to 1 on import
2021-02-15 15:16:15 +01:00
Aaron
87d6ca0200
Fix ingredient parsing for fractions using '/'
...
Even though ingredients like '1 1/2 something' already worked fine and got converted to 1.5 something
I just came across a recipe using '1/2' as the whole amount without any whole number before that.
Apparently I overlooked that case before so I now also fixed that.
2021-02-14 18:43:38 +01:00
vabene1111
79da8db889
added paprika import
2021-02-08 13:47:06 +01:00
