Kaibu aeb38cd2e9 Merge branch 'develop-weblate' into develop ...

# Conflicts:
#	cookbook/locale/de/LC_MESSAGES/django.po
#	cookbook/locale/hu_HU/LC_MESSAGES/django.po
#	vue/src/locales/de.json

2022-03-06 20:45:35 +01:00

..

fixtures

cleanup and dependency updates + new nav

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

helper

Merge pull request #1623 from gloriousDan/develop

2022-03-04 14:28:34 +01:00

integration

More localization of recipe search and view

2022-02-28 21:19:00 +01:00

locale

Merge branch 'develop-weblate' into develop

2022-03-06 20:45:35 +01:00

management/commands

Fix typos

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

migrations

small change to be able to retain large texts

2022-02-25 16:19:49 +01:00

provider

fixed nextcloud import first item

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

static

Merge branch 'develop' into feature/custom_filters

2022-02-07 18:56:19 +01:00

templates

Added a few more strings to be localized and fixed one ui alignment

2022-02-27 22:40:03 +01:00

templatetags

fixed markdown issue

2022-01-07 11:13:13 +01:00

tests

retain original text when parsing ingredients

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

views

Merge pull request #1564 from smilerz/retain_original_ingredient_text

2022-02-25 16:17:44 +01:00

__init__.py

…

admin.py

basics

2022-01-18 21:09:08 +01: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

fix recipe search in export form (converted to change safe genericAPI)

2022-02-23 17:24:06 -06:00

managers.py

minor cleanup

2022-02-15 06:42:57 -06:00

models.py

small change to be able to retain large texts

2022-02-25 16:19:49 +01:00

schemas.py

Fix after rebase

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

serializer.py

fixed supermarket category creation

2022-03-01 16:26:36 +01: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

Merge branch 'develop' into feature/custom_filters

2022-02-07 18:56:19 +01:00