mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 21:37:49 -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

18
cookbook/migrations/0142_alter_userpreference_search_style.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 3.2.5 on 2021-07-29 14:50
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0141_auto_20210713_1042'),
]
operations = [
migrations.AlterField(
model_name='userpreference',
name='search_style',
field=models.CharField(choices=[('SMALL', 'Small'), ('LARGE', 'Large'), ('NEW', 'New')], default='NEW', max_length=64),
),
]