Commit Graph

254 Commits

Author SHA1 Message Date
214db80dac add category context menu 2022-01-05 15:20:10 -06:00
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
ee4ab41c1c test shoppingFood API 2021-12-28 12:03:34 -06:00
1364f75f21 test userpreference food_inherit defaults 2021-12-28 12:03:34 -06:00
a51eb7a2cb pytest edit shopping list recipes 2021-12-28 12:03:34 -06:00
262387da3e pytest shopping list from recipe methods 2021-12-28 12:03:34 -06:00
ab968f225b test recent shopping list 2021-12-28 12:03:34 -06:00
0693d31550 WIP 2021-12-28 12:03:33 -06:00
1d224d8658 yarn build 2021-12-28 12:03:33 -06:00
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00
b92c027919 food inherit tests 2021-12-28 12:03:33 -06:00
94b2e9b01c minor updates 2021-12-28 12:03:33 -06:00
f245aa8b4f add to shopping from card context menu 2021-12-28 12:03:32 -06:00
ecac3f3c2d related recipes included when adding mealplan to shopping list 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
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
3516505dd1 fix bug in get_facet_api 2021-12-16 09:08:32 -06:00
3bc1daa72e fixed import 2021-11-30 18:48:07 +01:00
4d2e7eadb6 Merge branch 'develop' into generic_modal_v2 2021-11-30 17:23:27 +01:00
7c985cec23 Merge pull request #1088 from smilerz/search_troubleshooting
add search debug
2021-11-30 17:21:40 +01:00
7f22e0a275 fixed duplicate results on cook book view api 2021-11-27 16:03:08 +01:00
55a0304700 add search debug 2021-11-24 12:10:15 -06:00
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00
695cab29a1 fixed book sharing and added step page 2021-11-14 15:33:25 +01:00
d681e3ced3 disable external recipes in hosted version 2021-11-04 15:56:22 +01:00
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05:00
658e04addb make node_sort_order an .env variable 2021-09-28 11:39:15 -05:00
b3cffa4a38 cached facet results 2021-09-26 16:44:12 -05:00
a7dc23194e converted ingredient parser to class and added automation beta hint 2021-09-16 17:52:11 +02:00
7a01e8b1d3 fix tests 2021-09-15 17:19:04 -05: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
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
234e27c4c1 recipe editor 2021-09-13 21:13:43 +02:00
2df8ed8e80 filter distinct on some queries with shared models 2021-09-08 15:58:27 +02:00
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +02:00
b3477332e7 Merge pull request #866 from smilerz/log_pagination
implemented pagination on Log apis
2021-09-08 09:32:51 +02:00
4d27a80cd5 implemented pagination on Log apis 2021-09-07 07:35:17 -05:00
c9d1a9b551 finished unit page 2021-09-06 14:00:32 -05:00
7053a857c2 reworked MergeMixin to handle non-trees 2021-09-06 10:45:16 -05:00
d33a49538e Squashed commit of the following: 2021-09-05 11:18:57 -05:00
ab316236f9 allow deleting of Food part of Ingredient, but not recipe 2021-09-05 10:10:42 -05:00
b147c975b8 post food_tree bug fixing 2021-09-04 16:41:57 -05:00
16d125a243 fixed search facets and sub recipe 2021-09-04 19:26:42 +02:00
b129753d4e Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02:00
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00