Merge branch 'develop' into feature/vue3

# Conflicts:
#	cookbook/views/api.py
#	cookbook/views/views.py
#	requirements.txt
This commit is contained in:
vabene1111
2024-11-12 16:45:21 +01:00
20 changed files with 2797 additions and 1083 deletions

View File

@@ -13,12 +13,12 @@ django-oauth-toolkit==2.4.0
django-debug-toolbar==4.3.0
bleach==6.0.0
gunicorn==22.0.0
lxml==5.1.0
lxml==5.3.0
Markdown==3.5.1
Pillow==10.4.0
psycopg2-binary==2.9.9
python-dotenv==1.0.0
requests==2.32.0
requests==2.32.3
six==1.16.0
webdavclient3==3.14.6
whitenoise==6.7.0
@@ -35,7 +35,7 @@ django-allauth==0.61.1
recipe-scrapers==15.2.1
django-scopes==2.0.0
django-treebeard==4.7
django-cors-headers==4.3.1
django-cors-headers==4.6.0
django-storages==1.14.2
boto3==1.28.75
django-prometheus==2.2.0
@@ -46,6 +46,7 @@ pyppeteer==2.0.0
pytube==15.0.0
aiohttp==3.10.2
inflection==0.5.1
redis==5.2.0
django-vite==3.0.3
google-generativeai==0.5.3
@@ -58,5 +59,5 @@ pytest-html==4.1.1
pytest-asyncio==0.23.5
pytest-xdist==3.6.1
autopep8==2.0.4
flake8==6.1.0
flake8==7.1.1
yapf==0.40.2