vabene1111 a870ff9325 Merge branch 'beta' into develop ...

# Conflicts:
#	cookbook/static/vue/js/checklist_view.js
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/cookbook_view.js
#	cookbook/static/vue/js/edit_internal_recipe.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/meal_plan_view.js
#	cookbook/static/vue/js/model_list_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
#	cookbook/templates/sw.js

2021-10-06 20:14:35 +02:00

..

fixtures

cleanup and dependency updates + new nav

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

helper

a better fix

2021-10-04 16:18:21 -05:00

integration

converted ingredient parser to class and added automation beta hint

2021-09-16 17:52:11 +02:00

locale

compiled translations

2021-10-06 20:10:41 +02:00

management/commands

hierarchical keyword filtering in recipe search

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

migrations

added search defaults mimicing old search behavior

2021-09-29 09:04:46 +02:00

provider

hierarchical keyword filtering in recipe search

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

static

Merge branch 'beta' into develop

2021-10-06 20:14:35 +02:00

templates

Merge branch 'beta' into develop

2021-10-06 20:14:35 +02:00

templatetags

Squashed commit of the following:

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

tests

make node_sort_order an .env variable

2021-09-28 11:39:15 -05:00

views

Merge branch 'develop' into draggable_pill_update

2021-10-01 07:53:35 +00:00

__init__.py

basic stuff

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

admin.py

Merge pull request #920 from smilerz/sort_tree

2021-10-01 07:48:47 +00:00

apps.py

moved fix tree to apps ready hook and wrapped in catch for non existing models

2021-10-01 15:58:16 +02:00

filters.py

WIP

2021-09-05 11:17:28 -05:00

forms.py

search presets

2021-09-30 13:46:49 +02:00

managers.py

minor cleanup

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

models.py

moved fix tree to apps ready hook and wrapped in catch for non existing models

2021-10-01 15:58:16 +02:00

schemas.py

filter by rating

2021-09-09 15:23:46 -05:00

serializer.py

cached facet results

2021-09-26 16:44:12 -05:00

signals.py

foundation for user configurable search paramaters

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

tables.py

WIP

2021-09-05 11:17:28 -05:00

urls.py

stubbed out new shopping list

2021-09-30 14:56:59 -05:00