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

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

303

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

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/import_response_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/offline_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/recipe_search_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/recipe_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/supermarket_view.js

File diff suppressed because one or more lines are too long

2

cookbook/static/vue/js/user_file_view.js

File diff suppressed because one or more lines are too long