vabene1111 31cb9e283a Merge branch 'develop' into feature/fulltext-search ...

# 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

2021-08-22 13:28:57 +02:00

..

fixtures

cleanup and dependency updates + new nav

2019-11-19 19:59:53 +01:00

helper

minor cleanup

2021-08-13 11:23:47 -05:00

integration

fixed url_import

2021-08-14 07:55:22 -05:00

locale

Translated using Weblate (Chinese (Simplified))

2021-08-20 19:28:16 +00:00

management/commands

hierarchical keyword filtering in recipe search

2021-08-13 09:58:02 -05:00

migrations

Merge branch 'develop' into feature/fulltext-search

2021-08-22 13:28:57 +02:00

provider

hierarchical keyword filtering in recipe search

2021-08-13 09:58:02 -05:00

static

Merge branch 'develop' into feature/fulltext-search

2021-08-22 13:28:57 +02:00

templates

Merge branch 'develop' into feature/fulltext-search

2021-08-22 13:28:57 +02:00

templatetags

Squashed commit of the following:

2021-07-29 16:38:26 -05:00

tests

review feedback incorporated

2021-08-16 09:31:02 -05:00

views

Merge branch 'develop' into feature/fulltext-search

2021-08-22 13:28:57 +02:00

__init__.py

basic stuff

2018-01-31 23:40:16 +01:00

admin.py

keyword update, tests sqlite and PG

2021-07-30 14:00:09 -05:00

apps.py

updated to handle sqlite

2021-07-29 16:38:23 -05:00

filters.py

hierarchical keyword filtering in recipe search

2021-08-13 09:58:02 -05:00

forms.py

Squashed commit of the following:

2021-07-29 16:38:26 -05:00

managers.py

minor cleanup

2021-08-13 11:23:47 -05:00

models.py

Merge branch 'develop' into feature/fulltext-search

2021-08-22 13:28:57 +02:00

schemas.py

minor cleanup

2021-08-13 11:23:47 -05:00

serializer.py

Merge branch 'develop' into feature/fulltext-search

2021-08-22 13:28:57 +02:00

signals.py

foundation for user configurable search paramaters

2021-07-29 16:38:24 -05:00

tables.py

Squashed commit of the following:

2021-07-29 16:38:26 -05:00

urls.py

Squashed commit of the following:

2021-07-29 16:38:26 -05:00