smilerz
|
93b7e5790d
|
merge clashing commits
|
2022-02-07 18:11:38 -06:00 |
|
vabene1111
|
4c5994ee7f
|
Merge branch 'develop' into feature/custom_filters
# Conflicts:
# cookbook/serializer.py
# cookbook/views/api.py
# vue/src/utils/openapi/api.ts
|
2022-02-07 18:56:19 +01:00 |
|
smilerz
|
d6af318c21
|
tests for single food reset inherit and additional inheritted fields
|
2022-02-07 09:16:48 -06:00 |
|
vabene1111
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +01:00 |
|
Chris Scoggins
|
6ef25b604b
|
add food substitutions
|
2022-02-03 15:04:46 -06:00 |
|
Chris Scoggins
|
dcad389010
|
food edit modal - reset children inheritance
|
2022-02-03 12:15:04 -06:00 |
|
Chris Scoggins
|
fcb8e520b7
|
WIP
|
2022-02-03 12:11:32 -06:00 |
|
Chris Scoggins
|
890e9e7242
|
created CustomFilter model and api
|
2022-02-03 12:09:14 -06:00 |
|
vabene1111
|
a3fa01d8d3
|
Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress
|
2022-02-03 15:59:18 +01:00 |
|
Chris Scoggins
|
e2f8f29ec8
|
refactor list_from_recipe as class RecipeShoppingEditor
|
2022-01-29 10:28:01 -06:00 |
|
vabene1111
|
a0892470e1
|
Merge branch 'feature/export-progress' into develop
|
2022-01-28 15:41:49 +01:00 |
|
Chris Scoggins
|
4a48019885
|
fix duplicate shopping entries when using old list
|
2022-01-26 14:47:33 -06:00 |
|
Chris Scoggins
|
47823132f0
|
add ignore_shopping && additional help
|
2022-01-26 12:57:29 -06:00 |
|
Chris Scoggins
|
2e2080d8d1
|
fix Recipe Counts on food/keyword/unit serializer
|
2022-01-25 16:48:30 -06:00 |
|
vabene1111
|
ae14dde13d
|
propperly fixed setting
|
2022-01-25 18:33:12 +01:00 |
|
Kaibu
|
c90e5d72af
|
shopping list ux optimization, left handed mode
|
2022-01-21 00:13:36 +01:00 |
|
Sebastian Weber
|
c20e982fb1
|
Fix typos
|
2022-01-20 00:50:41 +01:00 |
|
vabene1111
|
890817ef6d
|
Merge pull request #1374 from smilerz/patch-updated-search
fix sort by new and show recent recipes
|
2022-01-19 17:01:46 +01:00 |
|
vabene1111
|
61a253675c
|
fixed default import / export
|
2022-01-19 16:08:03 +01:00 |
|
smilerz
|
530b1a8986
|
fix sort by new
|
2022-01-19 08:39:40 -06:00 |
|
vabene1111
|
3ea96d4102
|
basics
|
2022-01-18 21:09:08 +01:00 |
|
vabene1111
|
532d32c194
|
fixed shopping user save setting would not work
|
2022-01-17 22:41:38 +01:00 |
|
vabene1111
|
90b6f9ad06
|
fixed sub recipe issue
|
2022-01-17 19:54:16 +01:00 |
|
vabene1111
|
306f90aa98
|
recipe editor decimal fixes
|
2022-01-17 16:27:10 +01:00 |
|
smilerz
|
37971acb48
|
refactor recipe search
|
2022-01-17 08:26:34 -06:00 |
|
smilerz
|
6d9a90c6ba
|
fix onhand_users
|
2022-01-13 16:49:10 -06:00 |
|
smilerz
|
e313481fc8
|
WIP
|
2022-01-13 16:00:59 -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 |
|
Tiago Rascazzi
|
9c873127a5
|
Added loading page
|
2022-01-08 11:07:33 -05:00 |
|
smilerz
|
922eb7402b
|
fix tess
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
2c76fb7b69
|
make food onhand when complete shopping entry
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
7c89117e04
|
make on_hand multiuser
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
29aa52aa3d
|
fix saving old list
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
79b4bc387e
|
change ingore_inherit to inherit_fields
|
2021-12-30 12:54:39 -06:00 |
|
smilerz
|
3fafd43e58
|
merge ignore shopping with onhand
|
2021-12-29 16:32:19 -06:00 |
|
smilerz
|
c20e036d90
|
add path to generic cards for food/keywords
|
2021-12-28 12:03:36 -06:00 |
|
smilerz
|
24bef756e8
|
fix filter_to_supermarket setting
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
63fe174070
|
fix add to shopping from MealPlan Modal
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
2d94cb70ab
|
fix shopping list api
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
453b1eb5b9
|
rebase and fixes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
1364f75f21
|
test userpreference food_inherit defaults
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
8f0c5e21ad
|
basic tests with new factories
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
b5bf0a4584
|
fixed userpref serializer
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
2af7b64d4f
|
visual indicator meal plan in shopping
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
24b0643765
|
copy shopping as markdown
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
df54b10610
|
download as CSV
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
8dcdf00dc7
|
refresh shopping list when item is delayed
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
0693d31550
|
WIP
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
cae3773d5a
|
Fix after rebase
|
2021-12-28 12:03:33 -06:00 |
|