|
|
2012ef9e46
|
fixed wrong assignment in automation processing
|
2021-09-21 16:19:53 +02:00 |
|
|
|
a7dc23194e
|
converted ingredient parser to class and added automation beta hint
|
2021-09-16 17:52:11 +02:00 |
|
|
|
ecd300d2db
|
Merge pull request #907 from smilerz/performance
Performance
|
2021-09-16 12:37:58 +02:00 |
|
|
|
7a01e8b1d3
|
fix tests
|
2021-09-15 17:19:04 -05:00 |
|
|
|
aa6b8be647
|
removed node sort on trees and added better indexes
|
2021-09-15 16:28:07 -05:00 |
|
|
|
c296678eb2
|
implemented automation on deprecated method
|
2021-09-15 17:20:44 +02:00 |
|
|
|
d6f7aade46
|
basics for automation
|
2021-09-15 13:07:25 +02:00 |
|
|
|
94e357f4f6
|
cookbookapp importer
|
2021-09-15 10:26:31 +02:00 |
|
|
|
d9300a9a90
|
meal planner refactor progress
|
2021-09-14 23:16:33 +02:00 |
|
|
|
70f96d3fe6
|
plan to eat importer
|
2021-09-14 22:47:26 +02:00 |
|
|
|
26f9d25bd2
|
fixed some integration issues
|
2021-09-14 20:31:41 +02:00 |
|
|
|
bbc6015898
|
Merge branch 'pr/891' into develop
|
2021-09-13 22:11:41 +02:00 |
|
|
|
85aca8acf6
|
shopping_list_category
|
2021-09-13 14:30:03 -05:00 |
|
|
|
c1161edc6d
|
build
|
2021-09-13 21:24:41 +02:00 |
|
|
|
6350d0e9c5
|
Merge branch 'feature/recipe-edit-vue' into develop
# Conflicts:
# vue/vue.config.js
# vue/webpack-stats.json
|
2021-09-13 21:14:45 +02:00 |
|
|
|
234e27c4c1
|
recipe editor
|
2021-09-13 21:13:43 +02:00 |
|
|
|
8b09777b2c
|
Merge branch 'feature/books_refactor' into develop
# Conflicts:
# vue/webpack-stats.json
|
2021-09-13 19:30:13 +02:00 |
|
|
|
4fbf080e2f
|
basics
|
2021-09-13 12:39:29 +02:00 |
|
|
|
9bdcf09f60
|
started reworking books
|
2021-09-08 16:15:33 +02:00 |
|
|
|
2df8ed8e80
|
filter distinct on some queries with shared models
|
2021-09-08 15:58:27 +02:00 |
|
|
|
68b64ba8e2
|
Merge branch 'pr/865' into develop
|
2021-09-08 09:42:16 +02:00 |
|
|
|
b3477332e7
|
Merge pull request #866 from smilerz/log_pagination
implemented pagination on Log apis
|
2021-09-08 09:32:51 +02:00 |
|
|
|
4d27a80cd5
|
implemented pagination on Log apis
|
2021-09-07 07:35:17 -05:00 |
|
|
|
c9d1a9b551
|
finished unit page
|
2021-09-06 14:00:32 -05:00 |
|
|
|
7053a857c2
|
reworked MergeMixin to handle non-trees
|
2021-09-06 10:45:16 -05:00 |
|
|
|
f12558951a
|
moved keyword Vue to generic components
|
2021-09-05 16:26:01 -05:00 |
|
|
|
638dd96812
|
finished making FoodList completely generic
|
2021-09-05 14:15:58 -05:00 |
|
|
|
d33a49538e
|
Squashed commit of the following:
|
2021-09-05 11:18:57 -05:00 |
|
|
|
d1556f69c2
|
WIP
|
2021-09-05 11:17:28 -05:00 |
|
|
|
ab316236f9
|
allow deleting of Food part of Ingredient, but not recipe
|
2021-09-05 10:10:42 -05:00 |
|
|
|
b147c975b8
|
post food_tree bug fixing
|
2021-09-04 16:41:57 -05:00 |
|
|
|
16d125a243
|
fixed search facets and sub recipe
|
2021-09-04 19:26:42 +02:00 |
|
|
|
b129753d4e
|
Merge branch 'develop' into keyword_todo
|
2021-09-04 18:30:49 +02:00 |
|
|
|
ac08ede464
|
refactored genericAPI as ApiMixin
|
2021-09-01 12:28:33 -05:00 |
|
|
|
65fbbabec5
|
finished food view
|
2021-08-31 14:58:41 -05:00 |
|
|
|
a1d1cbac5d
|
refactored Generic API
|
2021-08-31 14:58:40 -05:00 |
|
|
|
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 |
|
|
|
4714162c0b
|
WIP
|
2021-08-31 14:58:40 -05:00 |
|
|
|
44aa05fe5c
|
Fix after rebase
|
2021-08-31 14:58:39 -05:00 |
|
|
|
d606ea8db3
|
moved food and keyword to generic cards
|
2021-08-31 14:58:39 -05:00 |
|
|
|
aba2e66163
|
passed all tests
|
2021-08-31 14:58:39 -05:00 |
|
|
|
0559143f0e
|
initial Vue components
|
2021-08-31 14:58:38 -05:00 |
|
|
|
a605113b00
|
abstract merge function to handle all related models
|
2021-08-31 14:58:38 -05:00 |
|
|
|
24a575c2d5
|
food to tree (model, api, serializer)
|
2021-08-31 14:58:38 -05:00 |
|
|
|
2808e3033d
|
fixes keyword filter on OR search
|
2021-08-31 14:58:38 -05:00 |
|
|
|
7bab07bdaf
|
search filter fix
|
2021-08-31 10:09:39 +02:00 |
|
|
|
7e9a8d4d86
|
test case to detect 833
|
2021-08-26 21:56:59 -05:00 |
|
|
|
2a1e1953ee
|
consolidated recently viewed into FTS queryset
|
2021-08-25 21:08:35 -05:00 |
|
|
|
b74fdb3825
|
exact match appears first on keyword/food/unit searches
|
2021-08-25 16:37:43 -05:00 |
|
|
|
78ebd18ed8
|
fixes keyword filter on OR search
|
2021-08-24 22:01:02 -05:00 |
|
