vabene1111
74e731e334
inject space context into serializer writes
2021-02-25 16:45:47 +01:00
vabene1111
d01f7409bf
removed django-random-queryset
...
the looping strategy is not efficient when using spacing as ids for a single user might be spaced far apart. A single user also only has a few hundred recipes so using the order by ? method should be more efficient and also automatically be compatible with spaces
2021-02-25 16:44:42 +01:00
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
vabene1111
59b2da933d
fixed tests
2021-02-25 08:27:22 +01:00
vabene1111
24b5cdff85
Merge pull request #459 from smilerz/fix-456
...
Fix 456
2021-02-25 08:14:55 +01:00
smilerz
21740522bc
fixed URL import when ingredient is a string
2021-02-24 20:13:06 -06:00
smilerz
47090ce863
added tests for add keyword and add duplicate keyword
2021-02-24 18:52:43 -06:00
smilerz
3ac22c08ff
fixed duplicate keyword handling
2021-02-24 18:52:04 -06:00
smilerz
cc62b088fd
fix URL import when recipeYield is a list
2021-02-24 17:52:40 -06:00
vabene1111
205f76d128
fix that does not really fix anything
...
see #453/454
2021-02-23 21:43:14 +01:00
vabene1111
4147bc61c7
Merge pull request #390 from smilerz/develop
...
Add keywords during edit & url import
2021-02-23 21:12:45 +01:00
vabene1111
058723d583
compiled translations and added hy
2021-02-23 20:54:42 +01:00
vabene1111
db4abdd31d
Merge pull request #426 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_it
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'it'
2021-02-23 20:50:35 +01:00
vabene1111
727b0e9e61
Merge pull request #403 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_hy
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'hy'
2021-02-23 20:49:40 +01:00
vabene1111
aa41146735
Merge pull request #448 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_de
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'de'
2021-02-23 20:48:51 +01:00
vabene1111
59cc22a877
wip serializer permission
2021-02-23 20:44:13 +01:00
vabene1111
7f391c25a4
fixed test
2021-02-22 19:59:43 +01:00
transifex-integration[bot]
cc882082d2
Apply translations in de
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'de' language.
2021-02-22 15:41:54 +00:00
vabene1111
40387428e7
recipe filter
2021-02-21 16:49:34 +01:00
vabene1111
46fb02376e
recipe share basics
2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e
updated migrations + setup process update
2021-02-21 15:34:35 +01:00
vabene1111
846c660811
usr signup and more
2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f
forms
2021-02-20 23:42:44 +01:00
vabene1111
58c6077925
basic test stuff
2021-02-20 22:56:29 +01:00
vabene1111
d7675d4b80
ingredients and helpers
2021-02-20 21:26:16 +01:00
vabene1111
e2b1115b3b
fixed servings blank
2021-02-20 18:50:28 +01:00
vabene1111
96c963795e
more spaces work
2021-02-20 18:47:14 +01:00
vabene1111
ad163509b4
updated edit and added space find methods
2021-02-19 18:09:42 +01:00
vabene1111
fb58d35029
space stuff partially working
2021-02-19 15:50:55 +01:00
transifex-integration[bot]
79f823cd62
Apply translations in it
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'it' language.
2021-02-19 13:42:50 +00:00
vabene1111
c42266b82c
basic space stuff
2021-02-19 11:53:30 +01:00
smilerz
fc5455a0f2
Revert "added new keyword management page"
...
This reverts commit 6962b0e218
2021-02-18 07:27:43 -06:00
smilerz
28d8f62af7
Revert "add filter to new keywords page"
...
This reverts commit c6dd55df4e
2021-02-18 07:25:31 -06:00
vabene1111
b6b505c361
fixed nutrition scaling fractiosn
2021-02-18 11:11:07 +01:00
vabene1111
97cef449c9
fixed recipe template rendering scaling issue
2021-02-18 09:37:17 +01:00
vabene1111
fef6f695ce
chowdown import folder syntax support
2021-02-18 09:36:13 +01:00
vabene1111
e727cae020
fixed typo that broke fractions
2021-02-18 09:17:42 +01:00
smilerz
c6dd55df4e
add filter to new keywords page
2021-02-17 10:45:31 -06:00
smilerz
6962b0e218
added new keyword management page
2021-02-17 07:09:19 -06:00
vabene1111
894d2d2e6b
gracful recipes api error on wrong format of update_at
2021-02-16 22:14:40 +01:00
transifex-integration[bot]
8bf4a32dfd
Apply translations in hy
...
translation completed for the source file '/cookbook/locale/en/LC_MESSAGES/django.po'
on the 'hy' language.
2021-02-16 19:31:09 +00:00
smilerz
505650518e
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
2021-02-16 07:45:22 -06:00
vabene1111
f2765c75c6
favicon path in markdown docs
2021-02-15 21:16:31 +01:00
vabene1111
150d4c7309
refactor assset and paths
2021-02-15 21:01:54 +01:00
vabene1111
ac9922ff61
manifest fixes
2021-02-15 16:08:18 +01:00
vabene1111
ff0cd6fa93
fixed import log
2021-02-15 15:30:19 +01:00
vabene1111
777f4518be
servings default to 1 on import
2021-02-15 15:16:15 +01:00
vabene1111
84591fd17a
fixed issue with shopping list saving
2021-02-15 15:13:59 +01:00
vabene1111
7536425e39
added czech locale
2021-02-15 15:13:40 +01:00
vabene1111
9d28ce48fe
Merge pull request #397 from vabene1111/translations_cookbook-locale-en-lc-messages-django-po--develop_cs
...
Translate '/cookbook/locale/en/LC_MESSAGES/django.po' in 'cs'
2021-02-15 15:11:50 +01:00
