vabene1111 28b67a2ba5 Merge branch 'develop' into feature/keywords-rework ...

# 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
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json

2021-06-30 14:57:33 +02:00

..

fixtures

cleanup and dependency updates + new nav

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

helper

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

integration

lots of importer adjustments

2021-06-17 13:38:57 +02:00

locale

Translated using Weblate (German)

2021-06-24 15:49:37 +00:00

management/commands

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

migrations

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

provider

delete model check fixes + sync log

2021-03-17 00:27:53 +01:00

static

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

templates

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

templatetags

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

tests

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

views

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

__init__.py

basic stuff

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

admin.py

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

apps.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

filters.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

forms.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

managers.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

models.py

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

schemas.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

serializer.py

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00

signals.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

tables.py

Squashed commit of the following:

2021-06-09 20:41:40 -05:00

urls.py

Merge branch 'develop' into feature/keywords-rework

2021-06-30 14:57:33 +02:00