Commit Graph

643 Commits

Author SHA1 Message Date
d45e3b8e60 some tweaks for new exporter 2022-02-03 18:00:02 +01:00
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
d01cb26c4a length filter for add to old shopping list 2022-02-03 15:46:59 +01:00
f45e09a5a5 add units to search fields 2022-01-31 14:41:18 -06:00
e00794bbdf review shopping list in MealPlan modal 2022-01-29 14:10:14 -06:00
e2f8f29ec8 refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
7104b5b109 sort SupermarketCategory queryset
fixes #1422
2022-01-26 17:31:22 -06:00
2e2080d8d1 fix Recipe Counts on food/keyword/unit serializer 2022-01-25 16:48:30 -06:00
c20e982fb1 Fix typos 2022-01-20 00:50:41 +01:00
ba1f10cd3a Merge branch 'develop' into facet-fix 2022-01-18 07:59:32 +01:00
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
54721a0a62 also added space to bot 2022-01-17 22:37:14 +01:00
d04e9518cb fixed telegram shopping bot 2022-01-17 22:13:36 +01:00
cc5be844d5 force list params to list 2022-01-17 13:13:26 -06:00
dde350c8af prettier cleanup 2022-01-17 08:35:19 -06:00
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
8b1233be62 facets cache-only on initial load 2022-01-13 12:02:28 -06:00
22953b0591 trees in recipe search loaded asynchronously 2022-01-12 16:21:36 -06:00
20d61160ba refactor get_facets as RecipeFacets class 2022-01-12 12:21:28 -06:00
f9b04a3f1e bug fix 2022-01-11 08:33:42 -06:00
f7cb067b52 construct values in queryset instead of serializer methods 2022-01-11 07:24:59 -06:00
16b357e11e Added printReady selector 2022-01-08 14:44:28 -05:00
7c48c13dce Added export from url args 2022-01-08 13:37:26 -05:00
9c873127a5 Added loading page 2022-01-08 11:07:33 -05:00
d506952602 small PDF export tweaks 2022-01-07 10:55:27 +01:00
0a6abf9688 Merge pull request #1211 from TiagoRascazzi/develop
Added Saffron and PDF export format
2022-01-07 10:31:13 +01:00
6c4b1e76eb Merge pull request #1251 from smilerz/fail_connection_gracefully
ConnectError fail gracefully during URL import
2022-01-07 10:19:00 +01:00
5c98f06208 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-06 16:34:53 +01:00
063a0dec24 Merge branch 'master' into develop
# Conflicts:
#	requirements.txt
2022-01-06 16:08:06 +01:00
b09acefa6a fix 1244 2022-01-06 07:49:53 -06:00
13115a1e53 fixes 1176 2022-01-05 17:49:38 -06:00
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
214db80dac add category context menu 2022-01-05 15:20:10 -06:00
578154510b Merge shopping_list develop 2022-01-04 13:19:34 -05:00
0aafd8d8b2 Added Saffron export format 2022-01-03 13:28:21 -05:00
ba032e9353 Added PDF export format 2022-01-03 00:58:02 -05:00
582e145a9f Fix after rebase 2021-12-30 13:55:38 -06:00
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
bddaa77f71 fixed space not honourd in invite link 2021-12-30 17:37:10 +01:00
e257a8d29b fix responsive display of shopping list 2021-12-28 12:03:35 -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
24b0643765 copy shopping as markdown 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