vabene1111 3aedbfbdc3 Merge branch 'develop' into feature/meal-planning ...

# Conflicts:
#	requirements.txt

2020-06-04 13:12:52 +02:00

..

fixtures

cleanup and dependency updates + new nav

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

helper

fixed permissions comments, books

2020-04-27 16:50:05 +02:00

locale

fixed path + added language option dutch (nl)

2020-06-04 09:57:28 +02:00

migrations

dynamic meal types

2020-06-02 11:46:16 +02:00

provider

added 'webdav_root' option

2020-04-13 13:19:03 +02:00

static

Merge branch 'develop' into feature/meal-planning

2020-06-04 13:12:52 +02:00

templates

Merge branch 'develop' into feature/meal-planning

2020-06-04 13:12:52 +02:00

templatetags

display log info

2020-05-02 21:44:12 +02:00

tests

api permission tests

2020-04-27 17:57:43 +02:00

views

Merge branch 'develop' into feature/meal-planning

2020-06-04 13:12:52 +02:00

__init__.py

basic stuff

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

admin.py

dynamic meal types

2020-06-02 11:46:16 +02:00

apps.py

basic stuff

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

filters.py

added ability to link recipes to ingredients

2020-03-17 18:44:11 +01:00

forms.py

dynamic meal types

2020-06-02 11:46:16 +02:00

models.py

dynamic meal types

2020-06-02 11:46:16 +02:00

serializer.py

nothing working yet

2020-06-02 14:33:27 +02:00

tables.py

fixed recipe table image

2020-06-01 22:51:33 +02:00

urls.py

Merge branch 'develop' into feature/meal-planning

2020-06-04 13:12:52 +02:00