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
2,244 Commits 21 Branches 170 Tags
cd137f9da38a14c1bb07299e2b02a08f09e3fa5a
Commit Graph

1571 Commits

Author SHA1 Message Date
smilerz
cd137f9da3 yarn build 2021-09-09 19:07:16 -05:00
smilerz
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
vabene1111
51dd137d96 Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
smilerz
7b3dee4595 fix food facets 2021-09-08 17:07:00 -05:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
vabene1111
6936710093 Merge pull request #869 from smilerz/fixes 
Move/Merge updated to handle object vs id
 2021-09-08 18:29:24 +02:00
smilerz
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05:00
vabene1111
2df8ed8e80 filter distinct on some queries with shared models 2021-09-08 15:58:27 +02:00
vabene1111
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
vabene1111
76b1ab9e85 fixed food serializer supermarket 2021-09-08 11:40:20 +02:00
vabene1111
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +02:00
vabene1111
b3477332e7 Merge pull request #866 from smilerz/log_pagination 
implemented pagination on Log apis
 2021-09-08 09:32:51 +02:00
vabene1111
8edc01db26 Merge pull request #861 from smilerz/food_tree_patch 
post food_tree bug fixing
 2021-09-08 09:11:00 +02:00
smilerz
8420995aa8 updated RecipeSearch API 2021-09-07 13:52:14 -05:00
Afaren
f2497b0a52 Translated using Weblate (French) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-09-07 16:06:03 +00:00
smilerz
4d27a80cd5 implemented pagination on Log apis 2021-09-07 07:35:17 -05:00
smilerz
c9d1a9b551 finished unit page 2021-09-06 14:00:32 -05:00
smilerz
84744560e0 infinite loader bug fixing 2021-09-06 12:28:14 -05:00
smilerz
7053a857c2 reworked MergeMixin to handle non-trees 2021-09-06 10:45:16 -05:00
smilerz
f12558951a moved keyword Vue to generic components 2021-09-05 16:26:01 -05:00
smilerz
638dd96812 finished making FoodList completely generic 2021-09-05 14:15:58 -05:00
smilerz
d33a49538e Squashed commit of the following: 2021-09-05 11:18:57 -05:00
smilerz
d1556f69c2 WIP 2021-09-05 11:17:28 -05:00
smilerz
ab316236f9 allow deleting of Food part of Ingredient, but not recipe 2021-09-05 10:10:42 -05:00
smilerz
cd0259ad26 remove console messages 2021-09-04 16:47:12 -05:00
smilerz
b147c975b8 post food_tree bug fixing 2021-09-04 16:41:57 -05:00
vabene1111
16d125a243 fixed search facets and sub recipe 2021-09-04 19:26:42 +02:00
vabene1111
b129753d4e Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02:00
vabene1111
de8ceba3bc compiled and updated javascript resources 2021-09-04 18:17:07 +02:00
vabene1111
d6e0faf7f4 Merge pull request #846 from smilerz/food_tree 
Food tree
 2021-09-04 17:47:10 +02:00
Oliver Cervera
27aae26f16 Translated using Weblate (Italian) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-09-02 11:06:01 +00:00
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
Oliver Cervera
32da9e006b Translated using Weblate (Italian) 
Currently translated at 90.8% (437 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-08-31 23:31:40 +00:00
smilerz
09e886958f restrict dev docker builds to vabene1111 2021-08-31 16:58:00 -05:00
smilerz
93d261b529 fixed serializer for food 2021-08-31 15:29:16 -05:00
smilerz
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
smilerz
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
smilerz
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
smilerz
caeb47aee9 bind data in dynamic fields to parent model 2021-08-31 14:58:40 -05:00
smilerz
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -05:00
smilerz
30b513cb58 Squashed commit of the following: 
commit 7e9a8d4d86
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 26 21:56:59 2021 -0500

    test case to detect 833

commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
 2021-08-31 14:58:40 -05:00
smilerz
ba07e98cae Squashed commit of the following: 
commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
 2021-08-31 14:58:40 -05:00
smilerz
07a67684ab WIP 2021-08-31 14:58:40 -05:00
smilerz
4714162c0b WIP 2021-08-31 14:58:40 -05:00
smilerz
d7d552c5c5 fixed migrations 2021-08-31 14:58:40 -05:00
smilerz
bf3feef707 yarn build 2021-08-31 14:58:39 -05:00
smilerz
44aa05fe5c Fix after rebase 2021-08-31 14:58:39 -05:00
smilerz
35dc981713 generic api mixin 2021-08-31 14:58:39 -05:00