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
This commit is contained in:
vabene1111
2021-03-18 20:38:51 +01:00
137 changed files with 10564 additions and 6777 deletions

View File

@@ -1,10 +1,10 @@
bleach==3.3.0
bleach-whitelist==0.0.11
Django==3.1.6
bleach-allowlist==1.0.3
Django==3.1.7
django-annoying==0.10.6
django-autocomplete-light==3.8.1
django-autocomplete-light==3.8.2
django-cleanup==5.1.0
django-crispy-forms==1.11.0
django-crispy-forms==1.11.1
django-emoji-picker==0.0.6
django-filter==2.4.0
django-tables2==2.3.4
@@ -12,8 +12,8 @@ djangorestframework==3.12.2
drf-writable-nested==0.6.2
gunicorn==20.0.4
lxml==4.6.2
Markdown==3.3.3
Pillow==8.1.0
Markdown==3.3.4
Pillow==8.1.2
psycopg2-binary==2.8.6
python-dotenv==0.15.0
requests==2.25.1
@@ -26,9 +26,11 @@ pyyaml==5.4.1
uritemplate==3.0.1
beautifulsoup4==4.9.3
microdata==0.7.1
django-random-queryset==0.1.3
Jinja2==2.11.3
django-webpack-loader==0.7.0
django-js-reverse==0.9.1
django-allauth==0.44.0
recipe-scrapers==12.2.0
django-scopes==1.2.0
pytest==6.2.2
pytest-django==4.1.0