mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-04 21:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,544 Commits 21 Branches 170 Tags
7fa5c2d9879ab1c2fac6b4e635c686a500043695
Commit Graph

136 Commits

Author SHA1 Message Date
Chris Scoggins
5b3a0a6e29 refactor IngredientComponent, move shopping logic to card 2022-01-31 14:05:01 -06:00
Chris Scoggins
47823132f0 add ignore_shopping && additional help 2022-01-26 12:57:29 -06:00
vabene1111
a30a27c755 added keyword clicking to recipe view and fixed deleted keyword showing in search when passed via parameter 2022-01-21 17:49:27 +01:00
smilerz
530b1a8986 fix sort by new 2022-01-19 08:39:40 -06:00
smilerz
18c45771e7 fix multiselect 2022-01-18 15:44:11 -06:00
smilerz
2a13a341dd enable/disable treeselect 2022-01-18 08:17:54 -06:00
smilerz
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
vabene1111
e1c7305c07 switcher basically working again 2022-01-17 20:22:37 +01:00
vabene1111
d23158839b Revert "temporarily disable recipe switcher" 
This reverts commit d2b796ddd2.
 2022-01-17 17:58:09 +01:00
vabene1111
d2b796ddd2 temporarily disable recipe switcher 2022-01-17 17:58:04 +01:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
smilerz
8b1233be62 facets cache-only on initial load 2022-01-13 12:02:28 -06:00
smilerz
22953b0591 trees in recipe search loaded asynchronously 2022-01-12 16:21:36 -06:00
smilerz
20d61160ba refactor get_facets as RecipeFacets class 2022-01-12 12:21:28 -06:00
smilerz
957c659a62 Squashed commit of shoppinglist_v2 2021-12-30 15:33:34 -06:00
smilerz
67e4c88be7 implement related recipes on home page 2021-12-22 15:23:16 -06:00
smilerz
75b45ba8eb Squashed commit of the following: 
commit 7837467c30
Merge: aaaae5b1b 84759383f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Dec 18 23:14:24 2021 +0100

    Merge pull request #1146 from auanasgheps/patch-1

    Add documentation about swag by linuxserver

commit 84759383fa
Author: Oliver Cervera <cervera93-19@yahoo.it>
Date:   Sat Dec 18 13:49:09 2021 +0100

    Add documentation about swag by linuxserver

    Documents behaviour in #959

commit aaaae5b1ba
Merge: 4a747f5cd ea62c10d9
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Thu Dec 16 18:10:48 2021 +0100

    Merge pull request #1143 from smilerz/fix_get_facet_api

    fix bug in get_facet_api

commit ea62c10d9a
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:20:56 2021 -0600

    remove console message

commit 3516505dd1
Author: smilerz <smilerz@gmail.com>
Date:   Thu Dec 16 09:08:32 2021 -0600

    fix bug in get_facet_api
 2021-12-20 15:26:31 -06:00
smilerz
d4553c05c2 fix get_facets_API 2021-12-16 08:13:10 -06:00
smilerz
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
smilerz
55a0304700 add search debug 2021-11-24 12:10:15 -06:00
smilerz
b3cffa4a38 cached facet results 2021-09-26 16:44:12 -05:00
smilerz
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
smilerz
6888233b6a fixed mispelled parameter 2021-09-10 06:44:09 -05:00
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
04c047bd31 fixed keyword url parameter type in search view 2021-09-08 15:44:36 +02:00
vabene1111
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +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
smilerz
d33a49538e Squashed commit of the following: 2021-09-05 11:18:57 -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
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
smilerz
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -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
4714162c0b WIP 2021-08-31 14:58:40 -05:00
smilerz
44aa05fe5c Fix after rebase 2021-08-31 14:58:39 -05:00
smilerz
0559143f0e initial Vue components 2021-08-31 14:58:38 -05:00
vabene1111
cd8085acf8 search persistence time limit 2021-08-31 09:21:40 +02:00
smilerz
7e9a8d4d86 test case to detect 833 2021-08-26 21:56:59 -05:00
smilerz
2a1e1953ee consolidated recently viewed into FTS queryset 2021-08-25 21:08:35 -05:00
smilerz
aa2d0eafb1 fixed cookie reactivity 2021-08-25 16:43:52 -05:00
smilerz
b00c189fd6 add pagination reset on search query change 2021-08-25 16:36:14 -05:00
vabene1111
4a1a45032e small tweaks and fixes 2021-08-22 14:18:46 +02:00
vabene1111
31cb9e283a Merge branch 'develop' into feature/fulltext-search 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	requirements.txt
#	vue/src/apps/RecipeSearchView/RecipeSearchView.vue
#	vue/src/components/GenericMultiselect.vue
#	vue/src/locales/en.json
 2021-08-22 13:28:57 +02:00
vabene1111
43dbb1d973 Merge branch 'search_and_keywords' of https://github.com/smilerz/recipes into smilerz-search_and_keywords 
# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/integration/chowdown.py
#	cookbook/integration/integration.py
#	cookbook/management/commands/rebuildindex.py
#	cookbook/managers.py
#	cookbook/migrations/0142_build_full_text_index.py
#	cookbook/models.py
#	cookbook/schemas.py
#	cookbook/serializer.py
#	cookbook/static/vue/css/keyword_list_view.css
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/keyword_list_view.js
#	cookbook/tests/api/test_api_keyword.py
#	cookbook/views/api.py
#	cookbook/views/data.py
#	cookbook/views/views.py
#	recipes/settings.py
#	vue/package.json
#	vue/src/apps/KeywordListView/KeywordListView.vue
#	vue/src/components/KeywordCard.vue
#	vue/src/locales/en.json
#	vue/src/utils/openapi/api.ts
#	vue/yarn.lock
 2021-08-22 13:14:23 +02:00