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

Merge branch 'develop' into feature/vue3

Browse Source 
# Conflicts:
#	recipes/settings.py
This commit is contained in:
vabene1111
2024-02-28 17:25:14 +01:00
parent f9efe44e1d a02e9e806c
commit 6a7c3b472a
3 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cookbook/migrations/0214_delete_shopping_model.py
View File

@@ -1,18 +0,0 @@
# Generated by Django 4.2.10 on 2024-02-19 20:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
(
"cookbook",
"0213_remove_property_property_unique_import_food_per_space_and_more",
),
]
operations = [
migrations.DeleteModel(
name="ShoppingList",
),
]

16
cookbook/migrations/0216_delete_shoppinglist.py Normal file
View File

@@ -0,0 +1,16 @@
# Generated by Django 4.2.10 on 2024-02-28 16:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0215_connectorconfig'),
]
operations = [
migrations.DeleteModel(
name='ShoppingList',
),
]

32
recipes/settings.py
View File

@@ -105,34 +105,10 @@ MESSAGE_TAGS = {messages.ERROR: 'danger'}
# Application definition
INSTALLED_APPS = [
'dal',
'dal_select2',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.sites',
'django.contrib.staticfiles',
'django.contrib.postgres',
'oauth2_provider',
'django_prometheus',
'django_tables2',
'corsheaders',
'crispy_forms',
'crispy_bootstrap4',
'rest_framework',
'rest_framework.authtoken',
'django_cleanup.apps.CleanupConfig',
'webpack_loader',
'django_vite',
'django_js_reverse',
'hcaptcha',
'allauth',
'allauth.account',
'allauth.socialaccount',
'cookbook.apps.CookbookConfig',
'treebeard',
'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages',
'django.contrib.sites', 'django.contrib.staticfiles', 'django.contrib.postgres', 'oauth2_provider', 'django_prometheus', 'django_tables2', 'corsheaders', 'crispy_forms',
'crispy_bootstrap4', 'rest_framework', 'rest_framework.authtoken', 'django_cleanup.apps.CleanupConfig', 'webpack_loader', 'django_vite', 'django_js_reverse', 'hcaptcha', 'allauth',
'allauth.account', 'allauth.socialaccount', 'cookbook.apps.CookbookConfig', 'treebeard',
]
PLUGINS_DIRECTORY = os.path.join(BASE_DIR, 'recipes', 'plugins')