Commit Graph

350 Commits

Author SHA1 Message Date
vabene1111
e2b887b449 lots of fixes and stuff 2022-06-06 18:21:15 +02:00
vabene1111
ded092ed23 baiscs of space edit page 2022-05-31 21:52:59 +02:00
vabene1111
007b7294d9 join and leave spaces 2022-05-31 20:38:53 +02:00
vabene1111
151461508f multi space membership basics 2022-05-31 17:38:12 +02:00
vabene1111
bdccdf0893 Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
#	cookbook/helper/recipe_url_import.py
2022-03-04 14:33:59 +01:00
vabene1111
90d477a0fd small change to be able to retain large texts 2022-02-25 16:19:49 +01:00
vabene1111
fc6268b7ff
Merge pull request #1564 from smilerz/retain_original_ingredient_text
retain original text when parsing ingredients
2022-02-25 16:17:44 +01:00
vabene1111
1bde4e81b7 fixed duplicate returns from tree manager get or create 2022-02-25 15:42:33 +01:00
smilerz
e52054e732
retain original text when parsing ingredients 2022-02-21 09:47:27 -06:00
vabene1111
c8fc67fa2b changed source import to match field structure of recipe model
first imports working
2022-02-19 17:54:00 +01:00
vabene1111
89348f69f1 basics of new import page 2022-02-19 16:55:17 +01:00
smilerz
f1fa5e32bf
fix case insensitive get_or_create 2022-02-17 10:50:38 -06:00
smilerz
4e8bbefc17
minor cleanup 2022-02-15 06:42:57 -06:00
smilerz
bf54680178
more recipe search tests 2022-02-13 13:53:07 -06:00
smilerz
baa2aa51da
more recipe search tests 2022-02-09 16:18:45 -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
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
fcb8e520b7
WIP 2022-02-03 12:11:32 -06:00
Chris Scoggins
890e9e7242
created CustomFilter model and api 2022-02-03 12:09:14 -06:00
vabene1111
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
Chris Scoggins
a7796cbf5c
fix shopping list sharing 2022-01-29 11:59:06 -06:00
vabene1111
a0892470e1
Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
Kaibu
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
vabene1111
ab5bff62e3
Merge pull request #1381 from sebweb3r/spelling_mistakes
Fix typos
2022-01-20 17:44:49 +01:00
vabene1111
d27b39f7de changed default for auto on hand after shopping 2022-01-20 15:46:49 +01:00
Sebastian Weber
c20e982fb1
Fix typos 2022-01-20 00:50:41 +01:00
vabene1111
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
vabene1111
8d24ae9008 small tweaks to the recipe editor 2022-01-18 19:55:51 +01:00
smilerz
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
smilerz
dde350c8af prettier cleanup 2022-01-17 08:35:19 -06:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
smilerz
6d9a90c6ba fix onhand_users 2022-01-13 16:49:10 -06:00
smilerz
e313481fc8 WIP 2022-01-13 16:00:59 -06:00
smilerz
25ccea90e0 WIP 2022-01-10 15:05:56 -06:00
Tiago Rascazzi
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
smilerz
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
smilerz
7c89117e04 make on_hand multiuser 2022-01-05 15:20:10 -06:00
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
smilerz
3047c09e55 test rest food inheritance 2021-12-28 12:03:34 -06:00
smilerz
8f0c5e21ad basic tests with new factories 2021-12-28 12:03:34 -06:00
smilerz
2763eed5b2 minor cleanup 2021-12-28 12:03:34 -06:00
smilerz
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
smilerz
df54b10610 download as CSV 2021-12-28 12:03:33 -06:00
smilerz
b92c027919 food inherit tests 2021-12-28 12:03:33 -06:00
smilerz
a035e02288 refactor Food tests to use factory_boy fixture factories 2021-12-28 12:03:33 -06:00
smilerz
94b2e9b01c minor updates 2021-12-28 12:03:33 -06:00
smilerz
dcfe4de61f Fix after rebase 2021-12-28 12:03:32 -06:00
smilerz
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
smilerz
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
smilerz
6135a6f26d fix apis 2021-12-28 12:03:32 -06:00
smilerz
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
smilerz
7c598720d0 WIP 2021-12-28 12:03:32 -06:00
smilerz
2a138a852f inheritance works with object moves 2021-12-28 12:03:32 -06:00
smilerz
fbe748db62 food inherit attributes 2021-12-28 12:03:32 -06:00
smilerz
c5c76cadea getUserPreference available for all UserPreferences 2021-12-28 12:03:31 -06:00
smilerz
6eea7ac99b model changes and GenericAutoSchema 2021-12-28 12:03:31 -06:00
smilerz
f5f9380344 model migrations 2021-12-28 12:03:31 -06:00
smilerz
e243e089cc WIP 2021-12-28 12:03:31 -06:00
smilerz
0b1d8bbd5f WIP 2021-12-28 12:03:31 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
smilerz
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00
vabene1111
1fad1d2b8f improved deletion of recipes 2021-11-04 12:27:21 +01:00
xeals
b1b770c9e5
Add KJ user preference 2021-10-25 17:25:35 +11:00
smilerz
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05:00
vabene1111
26ef66f4e1 moved fix tree to apps ready hook and wrapped in catch for non existing models 2021-10-01 15:58:16 +02:00
vabene1111
e8ce040df6
Merge pull request #920 from smilerz/sort_tree
Sort tree enhancements
2021-10-01 07:48:47 +00:00
smilerz
9bbbd72285 catch IntegrityError caused by mis-sorted tree 2021-09-30 16:17:08 -05:00
vabene1111
12afb3eaa6 added search defaults mimicing old search behavior 2021-09-29 09:04:46 +02:00
smilerz
b7b0b9c690 fixed wsgi error 2021-09-28 15:45:54 -05:00
vabene1111
856c34a3bf fixed and expanded on trigram search 2021-09-28 19:12:51 +02:00
smilerz
658e04addb make node_sort_order an .env variable 2021-09-28 11:39:15 -05:00
smilerz
b3cffa4a38 cached facet results 2021-09-26 16:44:12 -05:00
vabene1111
ea472158f9 some small meal plan fixes 2021-09-23 13:57:47 +02:00
Kaibu
5c85369120 meal plan context menu added, further progress 2021-09-22 20:03:03 +02:00
smilerz
aa6b8be647 removed node sort on trees and added better indexes 2021-09-15 16:28:07 -05:00
vabene1111
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
vabene1111
70f96d3fe6 plan to eat importer 2021-09-14 22:47:26 +02:00
vabene1111
3b429c5d84 change iexact to exact for get_or_create tree mixing 2021-09-14 19:26:09 +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
smilerz
4d27a80cd5 implemented pagination on Log apis 2021-09-07 07:35:17 -05:00
smilerz
ab316236f9 allow deleting of Food part of Ingredient, but not recipe 2021-09-05 10:10:42 -05:00
vabene1111
b129753d4e
Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02: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
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
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
78ebd18ed8 fixes keyword filter on OR search 2021-08-24 22:01:02 -05: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
smilerz
447ead59a9 makemigrations 2021-08-13 11:30:08 -05:00
smilerz
5d8ebc513a minor cleanup 2021-08-13 11:23:47 -05:00
smilerz
170673f467 hierarchical keyword filtering in recipe search 2021-08-13 09:58:02 -05:00
smilerz
2da0f5c478 keyword update, tests sqlite and PG 2021-07-30 14:00:09 -05:00