|
|
88b3ba1427
|
various fixes
|
2022-02-08 08:13:16 -06:00 |
|
|
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9c873127a5
|
Added loading page
|
2022-01-08 11:07:33 -05: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 |
|
|
|
957c659a62
|
Squashed commit of shoppinglist_v2
|
2021-12-30 15:33:34 -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 |
|
|
|
2d01a2af47
|
implemented quick switch
|
2021-12-22 14:43:00 -06:00 |
|
|
|
3516505dd1
|
fix bug in get_facet_api
|
2021-12-16 09:08:32 -06:00 |
|
|
|
d4553c05c2
|
fix get_facets_API
|
2021-12-16 08:13:10 -06:00 |
|
|
|
8b28a47297
|
rebase and fixes
|
2021-12-15 12:37:40 -06:00 |
|
|
|
e7e3a3083d
|
test shoppingFood API
|
2021-12-15 12:37:40 -06:00 |
|
|
|
ea7d34c8d2
|
test userpreference food_inherit defaults
|
2021-12-15 12:37:40 -06:00 |
|
|
|
6d1476b2d8
|
pytest edit shopping list recipes
|
2021-12-15 12:37:40 -06:00 |
|
|
|
5d79e4d3be
|
pytest shopping list from recipe methods
|
2021-12-15 12:37:40 -06:00 |
|
