TandoorRecipes/cookbook
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
..
fixtures cleanup and dependency updates + new nav 2019-11-19 19:59:53 +01:00
helper Merge branch 'develop' into url_import_recipes 2021-03-18 20:38:51 +01:00
integration import response view 2021-03-18 20:00:13 +01:00
locale updated transaltion 2021-03-18 11:53:14 +01:00
migrations import log working 2021-03-18 18:30:12 +01:00
provider delete model check fixes + sync log 2021-03-17 00:27:53 +01:00
static import response view 2021-03-18 20:00:13 +01:00
templates import response view 2021-03-18 20:00:13 +01:00
templatetags removed deprecated functions/packages 2021-03-10 18:17:31 +01:00
tests import log api 2021-03-18 18:48:29 +01:00
views Merge branch 'develop' into url_import_recipes 2021-03-18 20:38:51 +01:00
__init__.py basic stuff 2018-01-31 23:40:16 +01:00
admin.py import log working 2021-03-18 18:30:12 +01:00
apps.py basic stuff 2018-01-31 23:40:16 +01:00
filters.py recipe filter 2021-02-21 16:49:34 +01:00
forms.py fixed various space related bugs 2021-03-11 16:41:05 +01:00
models.py import log working 2021-03-18 18:30:12 +01:00
serializer.py fixed slice fix again 2021-03-18 20:34:37 +01:00
tables.py Revert "added new keyword management page" 2021-02-18 07:27:43 -06:00
urls.py import response view 2021-03-18 20:00:13 +01:00