Merge branch 'feature/keywords-rework' into feature/fulltext-search

Browse Source

# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/models.py
#	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/templates/sw.js
#	cookbook/views/api.py
#	cookbook/views/views.py
#	vue/src/locales/en.json
#	vue/webpack-stats.json
#	vue/yarn.lock

...

This commit is contained in:

vabene1111

2021-06-30 15:06:03 +02:00

parent a6d7105587 28b67a2ba5

commit 5c0bdce37d

183 changed files with 32502 additions and 13884 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

8

cookbook/static/vue/js/chunk-vendors.js

File diff suppressed because one or more lines are too long