mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-08 07:38:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/fulltext-search

Browse Source 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	requirements.txt
#	vue/src/apps/RecipeSearchView/RecipeSearchView.vue
#	vue/src/components/GenericMultiselect.vue
#	vue/src/locales/en.json
This commit is contained in:
vabene1111
2021-08-22 13:28:57 +02:00
parent 43dbb1d973 7b4387575c
commit 31cb9e283a
86 changed files with 7258 additions and 3337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
requirements.txt
View File

@@ -1,4 +1,4 @@
Django==3.2.5
Django==3.2.6
cryptography==3.4.7
django-annoying==0.10.6
django-autocomplete-light==3.8.2
@@ -9,18 +9,18 @@ django-filter==2.4.0
django-tables2==2.4.0
djangorestframework==3.12.4
drf-writable-nested==0.6.3
bleach==3.3.1
bleach==4.0.0
bleach-allowlist==1.0.3
gunicorn==20.1.0
lxml==4.6.3
Markdown==3.3.4
Pillow==8.3.1
psycopg2-binary==2.9.1
python-dotenv==0.18.0
python-dotenv==0.19.0
requests==2.26.0
simplejson==3.17.3
six==1.16.0
webdavclient3==3.14.5
webdavclient3==3.14.6
whitenoise==5.3.0
icalendar==4.0.7
pyyaml==5.4.1
@@ -31,13 +31,13 @@ Jinja2==3.0.1
django-webpack-loader==1.1.0
django-js-reverse==0.9.1
django-allauth==0.45.0
recipe-scrapers==13.3.4
recipe-scrapers==13.3.5
django-scopes==1.2.0
pytest==6.2.4
pytest-django==4.4.0
django-cors-headers==3.7.0
django-treebeard==4.5.1
django-cors-headers==3.8.0
django-storages==1.11.1
boto3==1.18.4
boto3==1.18.25
django-prometheus==2.1.0
django-hCaptcha==0.1.0