Commit Graph

235 Commits

Author SHA1 Message Date
f45e09a5a5 add units to search fields 2022-01-31 14:41:18 -06:00
75259ec230 corrected comment 2022-01-25 17:38:35 +01:00
8c49e6ba18 another small migration fix 2022-01-25 15:29:36 +01:00
f3f50d179f fixed missing field 2022-01-24 19:16:14 -06:00
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
d27b39f7de changed default for auto on hand after shopping 2022-01-20 15:46:49 +01:00
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
7c89117e04 make on_hand multiuser 2022-01-05 15:20:10 -06:00
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
2763eed5b2 minor cleanup 2021-12-28 12:03:34 -06:00
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
df54b10610 download as CSV 2021-12-28 12:03:33 -06:00
6eec3d18fe more fixes after rebase 2021-12-28 12:03:33 -06:00
de7d2e27d9 update migrations 2021-12-28 12:03:32 -06:00
dcfe4de61f Fix after rebase 2021-12-28 12:03:32 -06:00
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
f400c7cd7c shopping line item 2021-12-28 12:03:32 -06:00
fbe748db62 food inherit attributes 2021-12-28 12:03:32 -06:00
c5c76cadea getUserPreference available for all UserPreferences 2021-12-28 12:03:31 -06:00
f5f9380344 model migrations 2021-12-28 12:03:31 -06:00
e243e089cc WIP 2021-12-28 12:03:31 -06:00
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
b1b770c9e5 Add KJ user preference 2021-10-25 17:25:35 +11:00
12afb3eaa6 added search defaults mimicing old search behavior 2021-09-29 09:04:46 +02:00
856c34a3bf fixed and expanded on trigram search 2021-09-28 19:12:51 +02:00
ea472158f9 some small meal plan fixes 2021-09-23 13:57:47 +02:00
5c85369120 meal plan context menu added, further progress 2021-09-22 20:03:03 +02:00
aa6b8be647 removed node sort on trees and added better indexes 2021-09-15 16:28:07 -05:00
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
71ac73ff2a migration various leftover things after PR's 2021-09-15 10:39:33 +02:00
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
09e886958f restrict dev docker builds to vabene1111 2021-08-31 16:58:00 -05:00
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
d7d552c5c5 fixed migrations 2021-08-31 14:58:40 -05:00
72b4bd7e5c finished food view 2021-08-31 14:58:39 -05:00
d5e9c5d8f8 food layout complete, edit food working 2021-08-31 14:58:38 -05:00
24a575c2d5 food to tree (model, api, serializer) 2021-08-31 14:58:38 -05:00
f76dd86f73 fix migration chain 2021-08-22 13:34:34 +02:00
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
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
51f15c0ccb fix leading and trailing spaces 2021-08-16 15:15:38 -05:00
447ead59a9 makemigrations 2021-08-13 11:30:08 -05:00
2da0f5c478 keyword update, tests sqlite and PG 2021-07-30 14:00:09 -05:00
2f91c2f86e Fix after rebase 2021-07-29 16:38:33 -05:00
a6e351736b trying to fix things 2021-07-29 16:38:26 -05:00
1bd90f9304 fixed migration order and dependencies 2021-07-29 16:38:26 -05:00