smilerz
|
3b8be24630
|
merge RecipeSearch with upstream
|
2022-02-13 14:15:01 -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
|
ef81700c05
|
add created filter, viewed filter and viewed sort
|
2022-02-13 14:07:43 -06:00 |
|
smilerz
|
bf54680178
|
more recipe search tests
|
2022-02-13 13:53:07 -06:00 |
|
vabene1111
|
f4bfcdab2e
|
improved on explain and some tweaks
|
2022-02-11 14:15:46 +01:00 |
|
vabene1111
|
f320651cf8
|
Merge branch 'develop' into feature/custom_filters
|
2022-02-11 09:31:59 +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 |
|
vabene1111
|
32a8cc9a69
|
proof of concept for recipe search explain
|
2022-02-09 18:44:29 +01:00 |
|
smilerz
|
c2961eede4
|
stub out receip search tests
|
2022-02-08 20:23:49 -06:00 |
|
Marion Kämpfer
|
13ed297fb9
|
Translated using Weblate (French)
Currently translated at 95.9% (286 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
|
2022-02-09 01:31:35 +00: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 |
|
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 |
|
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
|
f37790a24a
|
changed to vue 2 lifecycle hook
|
2022-02-07 14:48:52 +01:00 |
|
vabene1111
|
5f9820ed30
|
Merge pull request #1469 from benscobie/issue/1434
Keep screen awake when viewing recipe
|
2022-02-07 14:48:21 +01:00 |
|
Dersim Özdag
|
7dcc38b5b2
|
Translated using Weblate (German)
Currently translated at 100.0% (298 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
|
2022-02-06 21:31:33 +00:00 |
|
Dirk
|
6068496240
|
Translated using Weblate (German)
Currently translated at 100.0% (298 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
|
2022-02-06 21:31:33 +00:00 |
|
Dirk
|
65003175ce
|
Translated using Weblate (German)
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
|
2022-02-05 21:06:28 +00:00 |
|
A. L
|
72d29cc88a
|
Translated using Weblate (German)
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
|
2022-02-05 21:06:28 +00:00 |
|
Dersim Özdag
|
bc8131ac56
|
Translated using Weblate (German)
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
|
2022-02-05 21:06:28 +00:00 |
|
Dirk
|
1c27f2f9b1
|
Translated using Weblate (German)
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
|
2022-02-05 21:06:28 +00:00 |
|
Tomasz Klimczak
|
262a1f0064
|
Translated using Weblate (Polish)
Currently translated at 99.6% (297 of 298 strings)
Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
|
2022-02-04 19:31:33 +00:00 |
|
vabene1111
|
fd026154d8
|
changed step header default and fixed ingredient rendering error
|
2022-02-04 17:11:35 +01:00 |
|
vabene1111
|
7f427c2d1f
|
validate 0 servings in frontend
|
2022-02-04 16:51:16 +01: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
|
5e3f94fcf7
|
fix after rebase
|
2022-02-03 12:21:35 -06:00 |
|
Chris Scoggins
|
dcad389010
|
food edit modal - reset children inheritance
|
2022-02-03 12:15:04 -06:00 |
|
Chris Scoggins
|
a0508684d9
|
cleaned up console messages
|
2022-02-03 12:14:43 -06:00 |
|
Chris Scoggins
|
9ffae0da7b
|
rebuild openapi
|
2022-02-03 12:14:42 -06:00 |
|
Chris Scoggins
|
04c4182b24
|
WIP
|
2022-02-03 12:14:42 -06:00 |
|
Chris Scoggins
|
583aee204e
|
fix view recipes in Model View
|
2022-02-03 12:14:18 -06:00 |
|
Chris Scoggins
|
e05fd02c65
|
recipecoontextmenu
|
2022-02-03 12:14:17 -06:00 |
|
Chris Scoggins
|
c45bf3a994
|
WIP
|
2022-02-03 12:14:17 -06:00 |
|
Chris Scoggins
|
203ff1a6ec
|
WIP
|
2022-02-03 12:14:04 -06:00 |
|
Chris Scoggins
|
07d5ead128
|
load RecipeFilter cookbook entries
|
2022-02-03 12:14:04 -06:00 |
|
Chris Scoggins
|
c042ab08c7
|
fix after rebase
|
2022-02-03 12:13:36 -06:00 |
|
Chris Scoggins
|
598f53f3d4
|
removeMissingItem disabled
|
2022-02-03 12:13:35 -06:00 |
|
Chris Scoggins
|
ec2cbc9b1b
|
Fix after rebase
|
2022-02-03 12:13:16 -06:00 |
|
Chris Scoggins
|
fcb8e520b7
|
WIP
|
2022-02-03 12:11:32 -06:00 |
|
Chris Scoggins
|
5959914932
|
makenow filter
|
2022-02-03 12:11:32 -06:00 |
|
Chris Scoggins
|
ebb0b3a5ea
|
sort by menu
|
2022-02-03 12:10:00 -06:00 |
|
Chris Scoggins
|
a72fc46d40
|
improved interaction between saved filter and filter fields
|
2022-02-03 12:10:00 -06:00 |
|
Chris Scoggins
|
8d78d15e21
|
implement sort order via API
|
2022-02-03 12:09:32 -06:00 |
|