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 |
|
smilerz
|
2b41fbc9f8
|
Fix after rebase
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
94b2e9b01c
|
minor updates
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
dcfe4de61f
|
Fix after rebase
|
2021-12-28 12:03:32 -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
|
6e9d609fe0
|
edit supermarket categories
|
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
|
6135a6f26d
|
fix apis
|
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
|
f400c7cd7c
|
shopping line item
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
2a138a852f
|
inheritance works with object moves
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
fbe748db62
|
food inherit attributes
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
4377505b14
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
c5c76cadea
|
getUserPreference available for all UserPreferences
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
fbd17b48fe
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
6eea7ac99b
|
model changes and GenericAutoSchema
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
f5f9380344
|
model migrations
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
e243e089cc
|
WIP
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
0b1d8bbd5f
|
WIP
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
10a33add75
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
09cc5aafe9
|
fix package.json
|
2021-12-07 15:38:03 -06:00 |
|
Kaibu
|
1907223a8a
|
reduced api calls
|
2021-11-25 12:51:55 +01:00 |
|
Kaibu
|
d76fdd090a
|
meal plan hotkeys and sharing
|
2021-11-25 01:28:07 +01:00 |
|
vabene1111
|
695cab29a1
|
fixed book sharing and added step page
|
2021-11-14 15:33:25 +01:00 |
|
vabene1111
|
03cd85537d
|
fixed exporter issue
|
2021-10-29 13:19:50 +02:00 |
|
vabene1111
|
6949e17a33
|
possibly fixed sub path hosting issues
|
2021-10-29 11:29:55 +02:00 |
|
smilerz
|
a7608de961
|
fix 977
|
2021-10-25 11:59:30 -05:00 |
|
vabene1111
|
b214ed0825
|
Merge pull request #956 from smilerz/serializer_fix
Update serializer.py
|
2021-10-14 08:51:07 +02:00 |
|
smilerz
|
32289d2fdf
|
Update serializer.py
|
2021-10-13 20:06:50 -05:00 |
|
vabene1111
|
1b1945d954
|
started migrating file editor page to generic model list
|
2021-10-13 15:03:59 +02:00 |
|
vabene1111
|
a7c80d65b1
|
overview for books
|
2021-10-12 17:13:43 +02:00 |
|
smilerz
|
613b618533
|
ExtendedRecipeMixin
|
2021-10-05 06:28:25 -05:00 |
|
smilerz
|
b3cffa4a38
|
cached facet results
|
2021-09-26 16:44:12 -05:00 |
|
vabene1111
|
ea472158f9
|
some small meal plan fixes
|
2021-09-23 13:57:47 +02:00 |
|
Kaibu
|
5c85369120
|
meal plan context menu added, further progress
|
2021-09-22 20:03:03 +02:00 |
|
vabene1111
|
d6f7aade46
|
basics for automation
|
2021-09-15 13:07:25 +02:00 |
|
vabene1111
|
aca526a9cd
|
added sharing back to recipe books
|
2021-09-14 21:07:15 +02:00 |
|
vabene1111
|
26f9d25bd2
|
fixed some integration issues
|
2021-09-14 20:31:41 +02:00 |
|
smilerz
|
85aca8acf6
|
shopping_list_category
|
2021-09-13 14:30:03 -05:00 |
|
Kaibu
|
8b09777b2c
|
Merge branch 'feature/books_refactor' into develop
# Conflicts:
# vue/webpack-stats.json
|
2021-09-13 19:30:13 +02:00 |
|
Kaibu
|
fd8797e2b7
|
cookbook view refactored, minor ui fixes
|
2021-09-13 19:28:16 +02:00 |
|
vabene1111
|
19d152461c
|
various fixes food serializer
|
2021-09-08 15:05:54 +02:00 |
|
vabene1111
|
76b1ab9e85
|
fixed food serializer supermarket
|
2021-09-08 11:40:20 +02:00 |
|
smilerz
|
7053a857c2
|
reworked MergeMixin to handle non-trees
|
2021-09-06 10:45:16 -05:00 |
|
smilerz
|
d33a49538e
|
Squashed commit of the following:
|
2021-09-05 11:18:57 -05:00 |
|
smilerz
|
93d261b529
|
fixed serializer for food
|
2021-08-31 15:29:16 -05:00 |
|
smilerz
|
70089998fe
|
Fix after rebase
|
2021-08-31 14:59:00 -05:00 |
|
smilerz
|
ba07e98cae
|
Squashed commit of the following:
commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 21:27:31 2021 -0500
fix #883
commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 21:08:35 2021 -0500
consolidated recently viewed into FTS queryset
commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 16:43:52 2021 -0500
fixed cookie reactivity
commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 16:37:43 2021 -0500
exact match appears first on keyword/food/unit searches
commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 16:36:14 2021 -0500
add pagination reset on search query change
|
2021-08-31 14:58:40 -05:00 |
|
smilerz
|
4714162c0b
|
WIP
|
2021-08-31 14:58:40 -05:00 |
|
smilerz
|
d5e9c5d8f8
|
food layout complete, edit food working
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
b56c2429c7
|
WIP
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
0559143f0e
|
initial Vue components
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
24a575c2d5
|
food to tree (model, api, serializer)
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
6ec0c1c71d
|
WIP
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
2808e3033d
|
fixes keyword filter on OR search
|
2021-08-31 14:58:38 -05:00 |
|
vabene1111
|
5ffc97a6a0
|
fixed importer compatability with new FTS and keyword features
|
2021-08-31 09:50:16 +02:00 |
|
smilerz
|
75e46b8023
|
fix #883
|
2021-08-25 21:27:31 -05:00 |
|
smilerz
|
2a1e1953ee
|
consolidated recently viewed into FTS queryset
|
2021-08-25 21:08:35 -05:00 |
|
vabene1111
|
31cb9e283a
|
Merge branch 'develop' into feature/fulltext-search
# Conflicts:
# cookbook/static/vue/js/chunk-vendors.js
# cookbook/static/vue/js/import_response_view.js
# cookbook/static/vue/js/offline_view.js
# cookbook/static/vue/js/recipe_search_view.js
# cookbook/static/vue/js/recipe_view.js
# cookbook/static/vue/js/supermarket_view.js
# cookbook/static/vue/js/user_file_view.js
# requirements.txt
# vue/src/apps/RecipeSearchView/RecipeSearchView.vue
# vue/src/components/GenericMultiselect.vue
# vue/src/locales/en.json
|
2021-08-22 13:28:57 +02:00 |
|
vabene1111
|
43dbb1d973
|
Merge branch 'search_and_keywords' of https://github.com/smilerz/recipes into smilerz-search_and_keywords
# Conflicts:
# cookbook/admin.py
# cookbook/helper/recipe_search.py
# cookbook/integration/chowdown.py
# cookbook/integration/integration.py
# cookbook/management/commands/rebuildindex.py
# cookbook/managers.py
# cookbook/migrations/0142_build_full_text_index.py
# cookbook/models.py
# cookbook/schemas.py
# cookbook/serializer.py
# cookbook/static/vue/css/keyword_list_view.css
# cookbook/static/vue/js/chunk-vendors.js
# cookbook/static/vue/js/keyword_list_view.js
# cookbook/tests/api/test_api_keyword.py
# cookbook/views/api.py
# cookbook/views/data.py
# cookbook/views/views.py
# recipes/settings.py
# vue/package.json
# vue/src/apps/KeywordListView/KeywordListView.vue
# vue/src/components/KeywordCard.vue
# vue/src/locales/en.json
# vue/src/utils/openapi/api.ts
# vue/yarn.lock
|
2021-08-22 13:14:23 +02:00 |
|
smilerz
|
080b4d328d
|
review feedback incorporated
|
2021-08-16 09:31:02 -05:00 |
|
smilerz
|
7b4123462d
|
ran and fixed tests
|
2021-08-13 15:22:22 -05:00 |
|