vabene1111 29ab6cfb2d Merge branch 'develop' into feature/spaces ...

# Conflicts:
#	cookbook/views/data.py
#	cookbook/views/views.py

2021-02-25 15:59:32 +01:00

..

__init__.py

made it possible to disable signup

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

AllAuthCustomAdapter.py

allauth working and integrated

2021-01-28 13:40:07 +01:00

dal.py

ingredients and helpers

2021-02-20 21:26:16 +01:00

ingredient_parser.py

Fix ingredient parsing for fractions using '/'

2021-02-14 18:43:38 +01:00

mdx_attributes.py

helper/ingredient_parser

2021-01-10 13:45:33 +01:00

mdx_urlize.py

helper/mdx_urlize

2021-01-10 13:46:53 +01:00

permission_config.py

helper/permissions_config

2021-01-10 13:47:23 +01:00

permission_helper.py

recipe share basics

2021-02-21 16:37:04 +01:00

recipe_url_import.py

Merge branch 'develop' into feature/spaces

2021-02-25 15:59:32 +01:00

scope_middleware.py

recipe share basics

2021-02-21 16:37:04 +01:00

template_helper.py

corrected servings factor

2021-01-13 21:35:39 +01:00