vabene1111 2ddb0c719a Merge branch 'develop' into feature/importer_to_vue ...

# Conflicts:
#	vue/src/apps/RecipeEditView/RecipeEditView.vue
#	vue/src/utils/openapi/api.ts

2022-04-22 16:41:13 +02:00

..

fixtures

cleanup and dependency updates + new nav

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

helper

import servings text

2022-04-04 23:21:13 +02:00

integration

Merge branch 'develop' into feature/importer_to_vue

2022-04-22 16:41:13 +02:00

locale

Translated using Weblate (Swedish)

2022-04-17 00:32:01 +00:00

management/commands

Fix typos

2022-01-20 00:50:41 +01:00

migrations

wip

2022-03-04 15:54:11 +01:00

provider

fixed nextcloud import first item

2022-02-27 11:27:23 +01:00

static

recipe switcher and navbar fixes

2022-04-18 14:13:23 +02:00

templates

Merge branch 'develop' into feature/importer_to_vue

2022-04-22 16:41:13 +02:00

templatetags

lots of improvements and bookmarklet import working again

2022-03-05 15:16:58 +01:00

tests

retain original text when parsing ingredients

2022-02-21 09:47:27 -06:00

views

Merge branch 'develop' into feature/importer_to_vue

2022-04-22 16:41:13 +02:00

__init__.py

basic stuff

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

admin.py

fixed vue cli pwa version and admin comment search

2022-03-28 22:56:45 +02:00

apps.py

add category context menu

2022-01-05 15:20:10 -06:00

filters.py

WIP

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

forms.py

Merge branch 'develop' into feature/importer_to_vue

2022-04-22 16:41:13 +02:00

managers.py

Add swedish support in frontend ui and in search

2022-04-09 16:51:16 +02:00

models.py

Merge branch 'develop' into feature/importer_to_vue

2022-03-04 14:33:59 +01:00

schemas.py

Fix after rebase

2021-12-28 12:03:32 -06:00

serializer.py

Merge branch 'develop' into feature/importer_to_vue

2022-04-22 16:41:13 +02:00

signals.py

more recipe search tests

2022-02-13 13:53:07 -06:00

tables.py

WIP

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

urls.py

added basic ingredient editor

2022-04-14 13:01:27 +02:00