cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,172 Commits 2 Branches 0 Tags 57 MiB
b51636ef64
Commit Graph

2172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smilerz
b51636ef64 update settings after testing 2021-08-31 16:16:43 -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
smilerz
f7b2af7f97 working WIP 2021-08-31 14:58:39 -05:00
smilerz
d606ea8db3 moved food and keyword to generic cards 2021-08-31 14:58:39 -05:00
smilerz
aba2e66163 passed all tests 2021-08-31 14:58:39 -05:00
smilerz
72b4bd7e5c finished food view 2021-08-31 14:58:39 -05:00
smilerz
d5e9c5d8f8 food layout complete, edit food working 2021-08-31 14:58:38 -05:00
smilerz
b56c2429c7 WIP 2021-08-31 14:58:38 -05:00
smilerz
0559143f0e initial Vue components 2021-08-31 14:58:38 -05:00
smilerz
a605113b00 abstract merge function to handle all related models 2021-08-31 14:58:38 -05:00
smilerz
24a575c2d5 food to tree (model, api, serializer) 2021-08-31 14:58:38 -05:00
smilerz
6ec0c1c71d WIP 2021-08-31 14:58:38 -05:00
smilerz
2808e3033d fixes keyword filter on OR search 2021-08-31 14:58:38 -05:00
vabene1111
7bab07bdaf search filter fix 2021-08-31 10:09:39 +02:00
vabene1111
5ffc97a6a0 fixed importer compatability with new FTS and keyword features 2021-08-31 09:50:16 +02:00
vabene1111
cd8085acf8 search persistence time limit 2021-08-31 09:21:40 +02:00
vabene1111
88fb6e32ef
Merge pull request #839 from smilerz/fix_search 
Fix search
 2021-08-31 08:57:14 +02:00
Oliver Cervera
1e330e8ff7 Translated using Weblate (Italian) 
Currently translated at 43.8% (43 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-08-30 22:31:01 +00:00
Oliver Cervera
5a696dfe42 Translated using Weblate (Italian) 
Currently translated at 79.2% (381 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-08-30 22:31:00 +00:00
Oliver Cervera
8c6cc2edcd Added translation using Weblate (Italian) 2021-08-29 22:19:54 +00:00
smilerz
7e9a8d4d86 test case to detect 833 2021-08-26 21:56:59 -05:00
smilerz
75e46b8023 fix #883 2021-08-25 21:27:31 -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
b74fdb3825 exact match appears first on keyword/food/unit searches 2021-08-25 16:37:43 -05:00
smilerz
b00c189fd6 add pagination reset on search query change 2021-08-25 16:36:14 -05:00
Jesse
16e8b24947 Translated using Weblate (Dutch) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-08-24 18:28:20 +00:00
Jesse
a0a2b57942 Translated using Weblate (Dutch) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-08-24 18:28:19 +00:00
vabene1111
8b3827e56c small tweaks 2021-08-22 14:28:58 +02:00
vabene1111
4a1a45032e small tweaks and fixes 2021-08-22 14:18:46 +02:00
vabene1111
d744da2c3d fixed integration 2021-08-22 13:54:33 +02:00
vabene1111
4b3fa1a4b5 fixed imports 2021-08-22 13:39:53 +02:00
vabene1111
f76dd86f73 fix migration chain 2021-08-22 13:34:34 +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
vabene1111
7b4387575c
Merge pull request #819 from vabene1111/dependabot/pip/boto3-1.18.25 
Bump boto3 from 1.18.21 to 1.18.25
 2021-08-21 13:01:42 +02:00