Commit Graph

1373 Commits

Author SHA1 Message Date
vabene1111
249663bd91
Merge branch 'develop' into develop 2021-03-18 20:53:08 +01:00
vabene1111
55920501b8 small tweaks 2021-03-18 20:48:28 +01:00
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
vabene1111
661f7ae789 fixed slice fix again 2021-03-18 20:34:37 +01:00
vabene1111
8bfbd96398 fixed slicing issue 2021-03-18 20:24:42 +01:00
vabene1111
8a051b531d import response view 2021-03-18 20:00:13 +01:00
vabene1111
de9456e3d7 import log api 2021-03-18 18:48:29 +01:00
vabene1111
950315936e import log working 2021-03-18 18:30:12 +01:00
vabene1111
af1bc19fd8 fixed importer threading stuff 2021-03-18 18:08:22 +01:00
vabene1111
906da25301 prevent duplicate imports 2021-03-18 17:02:02 +01:00
vabene1111
fe1ddf1237 improved paprika importer 2021-03-18 14:43:19 +01:00
vabene1111
48c90c483a merged PR 474 adding manual json import 2021-03-18 12:36:00 +01:00
vabene1111
3c1b6a5f3a updated unraid docs image 2021-03-18 12:08:12 +01:00
vabene1111
780c929162 fixed url import space 2021-03-18 12:07:02 +01:00
vabene1111
e00b6b9293 fixed meal plan creation from recipe context menu 2021-03-18 11:56:47 +01:00
vabene1111
8c9ee37c46 updated external image viewer 2021-03-18 11:53:32 +01:00
vabene1111
45a0bda758 updated transaltion 2021-03-18 11:53:14 +01:00
vabene1111
e71417e77f
Merge pull request #480 from auanasgheps/patch-1
Update Italian Translation
2021-03-18 11:19:58 +01:00
vabene1111
29e6eda9cd
Merge pull request #463 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_nl
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'nl'
2021-03-18 11:19:18 +01:00
vabene1111
32c984c7f0
Merge pull request #482 from vabene1111/dependabot/pip/pillow-8.1.2
Bump pillow from 8.1.0 to 8.1.2
2021-03-18 11:19:02 +01:00
vabene1111
b68d2ba384
Merge pull request #485 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_es
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'es'
2021-03-18 11:18:28 +01:00
vabene1111
daf0be37fd upgraded javascritp dependencies 2021-03-18 11:18:09 +01:00
vabene1111
2e625715cc updated help request template 2021-03-18 11:14:34 +01:00
vabene1111
6a25428b3c fixed shopping list share permission 2021-03-18 11:04:55 +01:00
vabene1111
cb78f75f19 fixed shopping list auto sync flickering 2021-03-18 10:56:12 +01:00
vabene1111
77cfcb4602 and pytest django 2021-03-17 23:52:41 +01:00
vabene1111
d2a4a9d953 addded pytest as dependency 2021-03-17 23:50:37 +01:00
vabene1111
9280540927 updated ci command 2021-03-17 23:48:49 +01:00
vabene1111
2f77532111 Merge branch 'feature/spaces' into develop 2021-03-17 23:47:35 +01:00
vabene1111
2149f4034b several shopping list improvements 2021-03-17 23:28:28 +01:00
vabene1111
76eeed1a77 all tests migrated and improved 2021-03-17 22:10:58 +01:00
vabene1111
ad0d802e41 more tests 2021-03-17 21:18:54 +01:00
vabene1111
e41464cb31 recipe api test 2021-03-17 20:53:12 +01:00
vabene1111
ab3f7bf671 step api test 2021-03-17 20:46:49 +01:00
vabene1111
e968a57c06 shopping list api tests and refactors 2021-03-17 20:42:17 +01:00
vabene1111
641feede74 space nested serializers 2021-03-17 19:55:34 +01:00
vabene1111
b48708652f delete model check fixes + sync log 2021-03-17 00:27:53 +01:00
vabene1111
c2addc1121 storage api test 2021-03-17 00:14:54 +01:00
vabene1111
a25109e16c added sync api test 2021-03-17 00:03:36 +01:00
vabene1111
ae81b10dbd added supermarket api test 2021-03-16 23:50:51 +01:00
vabene1111
4d6d84bf5b fixed some tests + added user pref tests 2021-03-16 23:46:54 +01:00
vabene1111
a8a132e2a1 fixed recipe book entry api and added test 2021-03-12 12:33:20 +01:00
vabene1111
3b0413c30e add test for recipe book 2021-03-12 10:50:08 +01:00
vabene1111
d767743b64 user name api test 2021-03-12 10:16:51 +01:00
vabene1111
e8f7caebd1 test unit api 2021-03-12 09:52:46 +01:00
vabene1111
a7b7272bec view log api test 2021-03-12 09:50:20 +01:00
vabene1111
d7402f60c5 meal plan api tests 2021-03-12 09:44:16 +01:00
vabene1111
d049cf6d3d ingredient test finished 2021-03-11 21:50:54 +01:00
vabene1111
fdcdf6a026 added food test 2021-03-11 18:23:00 +01:00
vabene1111
7e38e946a5 fixed various space related bugs 2021-03-11 16:41:05 +01:00