vabene1111 53c715b6f6 Merge branch 'develop' into feature/allauth ...

# Conflicts:
#	requirements.txt

2021-01-28 12:07:30 +01:00

..

fixtures

cleanup and dependency updates + new nav

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

helper

made it possible to disable signup

2021-01-24 16:41:25 +01:00

locale

added pre commit hooks and some other workflow stuff

2021-01-14 00:00:26 +01:00

migrations

supermarket shopping list relation

2021-01-26 16:53:05 +01:00

provider

updated documentation

2021-01-22 21:58:39 +01:00

static

fixed no_amount ingredients showing units in ingredient list

2021-01-26 22:00:46 +01:00

templates

Merge branch 'develop' into feature/allauth

2021-01-28 12:07:30 +01:00

templatetags

shopping list and docs

2021-01-26 20:58:19 +01:00

tests

fixed tests

2021-01-21 20:58:20 +01:00

views

Merge branch 'develop' into feature/allauth

2021-01-28 12:07:30 +01:00

__init__.py

basic stuff

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

admin.py

wip supermarket categories

2021-01-25 21:58:24 +01:00

apps.py

basic stuff

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

filters.py

added unaccent filter for recipe search

2021-01-26 21:14:33 +01:00

forms.py

added ingredient merging to shopping list

2021-01-25 17:24:03 +01:00

models.py

added ordering of supermarket categories

2021-01-26 19:19:42 +01:00

serializer.py

added ordering of supermarket categories

2021-01-26 19:19:42 +01:00

tables.py

tables

2021-01-10 13:15:01 +01:00

urls.py

wip supermarket categories

2021-01-25 21:58:24 +01:00