vabene1111
|
e081d823ed
|
fix book share permission
|
2022-02-18 17:52:32 +01:00 |
|
vabene1111
|
d6fa02cc9e
|
Merge branch 'develop' into feature/custom_filters
|
2022-02-18 17:25:15 +01:00 |
|
smilerz
|
2b5aec5d0a
|
resolved loading custom filter when not in expert mode
|
2022-02-18 09:08:36 -06:00 |
|
smilerz
|
6b5a099ba0
|
removed case insensitive get_or_create for units
|
2022-02-17 12:49:41 -06:00 |
|
smilerz
|
f1fa5e32bf
|
fix case insensitive get_or_create
|
2022-02-17 10:50:38 -06:00 |
|
smilerz
|
d49818ae6a
|
change default trigram threshold
|
2022-02-17 10:27:15 -06:00 |
|
smilerz
|
1b7f97dc64
|
case insensitive get_or_create
|
2022-02-17 10:23:31 -06:00 |
|
vabene1111
|
7e5019eed3
|
fixed share write permission for meal plan
|
2022-02-17 14:57:28 +01:00 |
|
smilerz
|
4c9ddee55c
|
restrict get_or_create to name & space
|
2022-02-16 10:50:01 -06:00 |
|
smilerz
|
bd973ec3a9
|
always sort count attributes to end
|
2022-02-15 16:19:41 -06:00 |
|
smilerz
|
b5c6c7cf2b
|
sort cooked date fix
|
2022-02-15 12:00:59 -06:00 |
|
smilerz
|
4e8bbefc17
|
minor cleanup
|
2022-02-15 06:42:57 -06:00 |
|
smilerz
|
19708dbc64
|
paste list of ingredients
|
2022-02-14 17:28:16 -06:00 |
|
smilerz
|
8fa00b50b1
|
added update_at filter
|
2022-02-14 15:13:34 -06:00 |
|
smilerz
|
e72f6e4ac4
|
Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters
|
2022-02-13 14:14:28 -06:00 |
|
smilerz
|
bf54680178
|
more recipe search tests
|
2022-02-13 13:53:07 -06:00 |
|
vabene1111
|
f320651cf8
|
Merge branch 'develop' into feature/custom_filters
|
2022-02-11 09:31:59 +01:00 |
|
vabene1111
|
3e9de4c392
|
compiled translations
|
2022-02-11 09:31:37 +01:00 |
|
vabene1111
|
1e9f7af017
|
updated translations and django version
|
2022-02-11 09:29:28 +01:00 |
|
vabene1111
|
6ae1365505
|
Merge pull request #1512 from smilerz/additional_fixes
various fixes
|
2022-02-11 09:01:56 +01:00 |
|
smilerz
|
baa2aa51da
|
more recipe search tests
|
2022-02-09 16:18:45 -06:00 |
|
smilerz
|
c2961eede4
|
stub out receip search tests
|
2022-02-08 20:23:49 -06:00 |
|
Jesse
|
4c259e6b9c
|
Translated using Weblate (Dutch)
Currently translated at 95.2% (541 of 568 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
|
2022-02-09 01:31:35 +00:00 |
|
Marion Kämpfer
|
faf51d0455
|
Translated using Weblate (French)
Currently translated at 94.7% (538 of 568 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
|
2022-02-09 01:31:35 +00:00 |
|
smilerz
|
924ffc473b
|
fix recipe sharing
|
2022-02-08 14:59:54 -06:00 |
|
smilerz
|
0e258a49fb
|
reload book recipes when adding filter
|
2022-02-08 12:30:11 -06:00 |
|
smilerz
|
b3a830c319
|
fix missing pill when loading CustomFilter
|
2022-02-08 11:41:57 -06:00 |
|
smilerz
|
62adc5a91f
|
make +/- search fields not clickable
|
2022-02-08 09:57:23 -06:00 |
|
smilerz
|
dc71260baa
|
Merge branch 'additional_fixes' into feature/custom_filters
|
2022-02-08 09:05:07 -06:00 |
|
smilerz
|
88b3ba1427
|
various fixes
|
2022-02-08 08:13:16 -06:00 |
|
smilerz
|
93b7e5790d
|
merge clashing commits
|
2022-02-07 18:11:38 -06:00 |
|
smilerz
|
286c6344ec
|
Merge branch 'feature/custom_filters' into feature/custom_filtersv2
|
2022-02-07 17:47:53 -06:00 |
|
smilerz
|
1be5889923
|
tests for makenow filter
|
2022-02-07 17:46:04 -06:00 |
|
vabene1111
|
4c5994ee7f
|
Merge branch 'develop' into feature/custom_filters
# Conflicts:
# cookbook/serializer.py
# cookbook/views/api.py
# vue/src/utils/openapi/api.ts
|
2022-02-07 18:56:19 +01:00 |
|
vabene1111
|
c92c3e7d85
|
improved comment formatting
|
2022-02-07 17:43:57 +01:00 |
|
smilerz
|
d6af318c21
|
tests for single food reset inherit and additional inheritted fields
|
2022-02-07 09:16:48 -06:00 |
|
vabene1111
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +01:00 |
|
vabene1111
|
0dbb9457a1
|
fixed test
|
2022-02-07 14:41:36 +01:00 |
|
vabene1111
|
5cc81d977f
|
updated translations
|
2022-02-07 14:41:00 +01:00 |
|
vabene1111
|
39ca3ac1ad
|
no system page for non superuser
|
2022-02-07 13:08:18 +01:00 |
|
Marion Kämpfer
|
2b6e365f0b
|
Translated using Weblate (French)
Currently translated at 91.0% (517 of 568 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
|
2022-02-06 21:31:32 +00:00 |
|
David Laukamp
|
2f045e6e0d
|
Translated using Weblate (German)
Currently translated at 96.6% (549 of 568 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2022-02-06 21:31:32 +00:00 |
|
Christian
|
8dffc58ca6
|
Translated using Weblate (German)
Currently translated at 96.6% (549 of 568 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2022-02-06 21:31:32 +00:00 |
|
Kristof Mattei
|
3b946e512c
|
Aligned formatting.
|
2022-02-04 14:04:05 -08:00 |
|
Kristof Mattei
|
d2a6409381
|
Fixed parsing error, } should've been included
|
2022-02-04 14:02:50 -08:00 |
|
Chris Scoggins
|
ab52bd1a07
|
fix makenow/fulltext search duplicate results
|
2022-02-04 08:40:20 -06:00 |
|
Chris Scoggins
|
f9244a93a5
|
fix MakeNow filter
|
2022-02-03 17:19:38 -06:00 |
|
Chris Scoggins
|
6ef25b604b
|
add food substitutions
|
2022-02-03 15:04:46 -06:00 |
|
Chris Scoggins
|
dcad389010
|
food edit modal - reset children inheritance
|
2022-02-03 12:15:04 -06:00 |
|
Chris Scoggins
|
04c4182b24
|
WIP
|
2022-02-03 12:14:42 -06:00 |
|