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 |
|
vabene1111
|
f869fc85ae
|
fixed broken share links
|
2021-08-12 15:12:08 +02:00 |
|
smilerz
|
2da0f5c478
|
keyword update, tests sqlite and PG
|
2021-07-30 14:00:09 -05:00 |
|
vabene1111
|
89ec549dac
|
minor fixes keyword tree system
|
2021-07-29 16:38:27 -05:00 |
|