Commit Graph

631 Commits

Author SHA1 Message Date
Sebastian Weber
c20e982fb1
Fix typos 2022-01-20 00:50:41 +01:00
vabene1111
ba1f10cd3a
Merge branch 'develop' into facet-fix 2022-01-18 07:59:32 +01:00
smilerz
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
vabene1111
54721a0a62 also added space to bot 2022-01-17 22:37:14 +01:00
vabene1111
d04e9518cb fixed telegram shopping bot 2022-01-17 22:13:36 +01:00
smilerz
cc5be844d5 force list params to list 2022-01-17 13:13:26 -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
8b1233be62 facets cache-only on initial load 2022-01-13 12:02:28 -06:00
smilerz
22953b0591 trees in recipe search loaded asynchronously 2022-01-12 16:21:36 -06:00
smilerz
20d61160ba refactor get_facets as RecipeFacets class 2022-01-12 12:21:28 -06:00
smilerz
f9b04a3f1e bug fix 2022-01-11 08:33:42 -06:00
smilerz
f7cb067b52 construct values in queryset instead of serializer methods 2022-01-11 07:24:59 -06:00
vabene1111
d506952602 small PDF export tweaks 2022-01-07 10:55:27 +01:00
vabene1111
0a6abf9688
Merge pull request #1211 from TiagoRascazzi/develop
Added Saffron and PDF export format
2022-01-07 10:31:13 +01:00
vabene1111
6c4b1e76eb
Merge pull request #1251 from smilerz/fail_connection_gracefully
ConnectError fail gracefully during URL import
2022-01-07 10:19:00 +01:00
vabene1111
5c98f06208 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-06 16:34:53 +01:00
vabene1111
063a0dec24 Merge branch 'master' into develop
# Conflicts:
#	requirements.txt
2022-01-06 16:08:06 +01:00
smilerz
b09acefa6a fix 1244 2022-01-06 07:49:53 -06:00
smilerz
13115a1e53 fixes 1176 2022-01-05 17:49:38 -06:00
smilerz
2c76fb7b69 make food onhand when complete shopping entry 2022-01-05 15:20:10 -06:00
smilerz
214db80dac add category context menu 2022-01-05 15:20:10 -06:00
Tiago Rascazzi
578154510b Merge shopping_list develop 2022-01-04 13:19:34 -05:00
Tiago Rascazzi
0aafd8d8b2 Added Saffron export format 2022-01-03 13:28:21 -05:00
Tiago Rascazzi
ba032e9353 Added PDF export format 2022-01-03 00:58:02 -05:00
smilerz
582e145a9f Fix after rebase 2021-12-30 13:55:38 -06:00
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
vabene1111
bddaa77f71 fixed space not honourd in invite link 2021-12-30 17:37:10 +01:00
smilerz
e257a8d29b fix responsive display of shopping list 2021-12-28 12:03:35 -06:00
smilerz
453b1eb5b9 rebase and fixes 2021-12-28 12:03:34 -06:00
smilerz
ee4ab41c1c test shoppingFood API 2021-12-28 12:03:34 -06:00
smilerz
1364f75f21 test userpreference food_inherit defaults 2021-12-28 12:03:34 -06:00
smilerz
a51eb7a2cb pytest edit shopping list recipes 2021-12-28 12:03:34 -06:00
smilerz
262387da3e pytest shopping list from recipe methods 2021-12-28 12:03:34 -06:00
smilerz
ab968f225b test recent shopping list 2021-12-28 12:03:34 -06:00
smilerz
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
smilerz
0693d31550 WIP 2021-12-28 12:03:33 -06:00
smilerz
1d224d8658 yarn build 2021-12-28 12:03:33 -06:00
smilerz
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00
smilerz
b92c027919 food inherit tests 2021-12-28 12:03:33 -06:00
smilerz
94b2e9b01c minor updates 2021-12-28 12:03:33 -06:00
smilerz
f245aa8b4f add to shopping from card context menu 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
7a0b395107 alpha shopping list 2021-12-28 12:03:32 -06:00
smilerz
7c598720d0 WIP 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
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
vabene1111
3ff15b6766 added copy me that importer 2021-12-23 15:54:48 +01:00