mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 12:18:45 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,486 Commits 21 Branches 170 Tags
b5c6c7cf2b020b29738a8786d4e72dcf5a459cc7
Commit Graph

2034 Commits

Author SHA1 Message Date
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
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
Chris Scoggins
583aee204e fix view recipes in Model View 2022-02-03 12:14:18 -06:00
Chris Scoggins
c45bf3a994 WIP 2022-02-03 12:14:17 -06:00
Chris Scoggins
07d5ead128 load RecipeFilter cookbook entries 2022-02-03 12:14:04 -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
8d78d15e21 implement sort order via API 2022-02-03 12:09:32 -06:00
Chris Scoggins
890e9e7242 created CustomFilter model and api 2022-02-03 12:09:14 -06:00
Chris Scoggins
d0549bcb6d complex book filters 2022-02-03 12:07:51 -06:00
Chris Scoggins
5e36bd0c27 complex food filters 2022-02-03 12:07:51 -06:00
Chris Scoggins
28d3d8a1e0 complex keyword filters 2022-02-03 12:07:50 -06:00
Chris Scoggins
bb226a221e WIP 2022-02-03 12:07:14 -06:00