vabene1111 cc3e00e75f Merge branch 'develop' into url_import_recipes ...

# Conflicts:
#	cookbook/helper/recipe_url_import.py
#	cookbook/tests/api/test_api_keyword.py
#	cookbook/tests/other/test_edits_recipe.py
#	cookbook/views/api.py
#	requirements.txt

2021-03-18 20:38:51 +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

CustomTestRunner.py

fixed normal django test running with scopes

2021-02-25 22:19:51 +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

fixed shopping list share permission

2021-03-18 11:04:55 +01:00

recipe_url_import.py

Merge branch 'develop' into url_import_recipes

2021-03-18 20:38:51 +01:00

scope_middleware.py

recipe share basics

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

template_helper.py

removed deprecated functions/packages

2021-03-10 18:17:31 +01:00