vabene1111
|
1fad1d2b8f
|
improved deletion of recipes
|
2021-11-04 12:27:21 +01:00 |
|
vabene1111
|
c9bd3ccae8
|
Merge branch 'develop' into feature/kilojoules
|
2021-11-01 09:46:04 +01:00 |
|
Kaibu
|
31720927b1
|
deprecated old meal plan
|
2021-10-31 18:08:37 +01:00 |
|
vabene1111
|
2a682892c6
|
fixed importing of tags
|
2021-10-26 14:51:37 +02:00 |
|
xeals
|
b1b770c9e5
|
Add KJ user preference
|
2021-10-25 17:25:35 +11:00 |
|
vabene1111
|
70df8a5ffd
|
show better error message when recipe deletion breaks due to constraints
|
2021-10-19 18:22:18 +02:00 |
|
vabene1111
|
54a2a45959
|
completed migration of file view to generic model list
|
2021-10-14 11:20:30 +02:00 |
|
vabene1111
|
1b1945d954
|
started migrating file editor page to generic model list
|
2021-10-13 15:03:59 +02:00 |
|
smilerz
|
613b618533
|
ExtendedRecipeMixin
|
2021-10-05 06:28:25 -05:00 |
|
vabene1111
|
64b2e21747
|
Merge branch 'develop' into draggable_pill_update
|
2021-10-01 07:53:35 +00:00 |
|
vabene1111
|
e8ce040df6
|
Merge pull request #920 from smilerz/sort_tree
Sort tree enhancements
|
2021-10-01 07:48:47 +00:00 |
|
smilerz
|
96d7cc42a5
|
fix automation in url_import
|
2021-09-30 15:34:28 -05:00 |
|
smilerz
|
17cedf17b5
|
stubbed out new shopping list
|
2021-09-30 14:56:59 -05:00 |
|
vabene1111
|
20db5cfd74
|
search presets
|
2021-09-30 13:46:49 +02:00 |
|
vabene1111
|
856c34a3bf
|
fixed and expanded on trigram search
|
2021-09-28 19:12:51 +02:00 |
|
smilerz
|
658e04addb
|
make node_sort_order an .env variable
|
2021-09-28 11:39:15 -05:00 |
|
smilerz
|
b3cffa4a38
|
cached facet results
|
2021-09-26 16:44:12 -05:00 |
|
vabene1111
|
b949fe6a90
|
removed some deprecated stuff
|
2021-09-23 15:19:10 +02:00 |
|
vabene1111
|
2012ef9e46
|
fixed wrong assignment in automation processing
|
2021-09-21 16:19:53 +02:00 |
|
vabene1111
|
a7dc23194e
|
converted ingredient parser to class and added automation beta hint
|
2021-09-16 17:52:11 +02:00 |
|
vabene1111
|
ecd300d2db
|
Merge pull request #907 from smilerz/performance
Performance
|
2021-09-16 12:37:58 +02:00 |
|
smilerz
|
7a01e8b1d3
|
fix tests
|
2021-09-15 17:19:04 -05:00 |
|
smilerz
|
aa6b8be647
|
removed node sort on trees and added better indexes
|
2021-09-15 16:28:07 -05:00 |
|
vabene1111
|
c296678eb2
|
implemented automation on deprecated method
|
2021-09-15 17:20:44 +02:00 |
|
vabene1111
|
d6f7aade46
|
basics for automation
|
2021-09-15 13:07:25 +02:00 |
|
vabene1111
|
94e357f4f6
|
cookbookapp importer
|
2021-09-15 10:26:31 +02:00 |
|
Kaibu
|
d9300a9a90
|
meal planner refactor progress
|
2021-09-14 23:16:33 +02:00 |
|
vabene1111
|
70f96d3fe6
|
plan to eat importer
|
2021-09-14 22:47:26 +02:00 |
|
vabene1111
|
26f9d25bd2
|
fixed some integration issues
|
2021-09-14 20:31:41 +02:00 |
|
vabene1111
|
bbc6015898
|
Merge branch 'pr/891' into develop
|
2021-09-13 22:11:41 +02:00 |
|
smilerz
|
85aca8acf6
|
shopping_list_category
|
2021-09-13 14:30:03 -05:00 |
|
vabene1111
|
c1161edc6d
|
build
|
2021-09-13 21:24:41 +02:00 |
|
vabene1111
|
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 |
|
vabene1111
|
234e27c4c1
|
recipe editor
|
2021-09-13 21:13:43 +02:00 |
|
Kaibu
|
8b09777b2c
|
Merge branch 'feature/books_refactor' into develop
# Conflicts:
# vue/webpack-stats.json
|
2021-09-13 19:30:13 +02:00 |
|
vabene1111
|
4fbf080e2f
|
basics
|
2021-09-13 12:39:29 +02:00 |
|
Kaibu
|
9bdcf09f60
|
started reworking books
|
2021-09-08 16:15:33 +02:00 |
|
vabene1111
|
2df8ed8e80
|
filter distinct on some queries with shared models
|
2021-09-08 15:58:27 +02:00 |
|
vabene1111
|
68b64ba8e2
|
Merge branch 'pr/865' into develop
|
2021-09-08 09:42:16 +02:00 |
|
vabene1111
|
b3477332e7
|
Merge pull request #866 from smilerz/log_pagination
implemented pagination on Log apis
|
2021-09-08 09:32:51 +02:00 |
|
smilerz
|
4d27a80cd5
|
implemented pagination on Log apis
|
2021-09-07 07:35:17 -05:00 |
|
smilerz
|
c9d1a9b551
|
finished unit page
|
2021-09-06 14:00:32 -05:00 |
|
smilerz
|
7053a857c2
|
reworked MergeMixin to handle non-trees
|
2021-09-06 10:45:16 -05:00 |
|
smilerz
|
f12558951a
|
moved keyword Vue to generic components
|
2021-09-05 16:26:01 -05:00 |
|
smilerz
|
638dd96812
|
finished making FoodList completely generic
|
2021-09-05 14:15:58 -05:00 |
|
smilerz
|
d33a49538e
|
Squashed commit of the following:
|
2021-09-05 11:18:57 -05:00 |
|
smilerz
|
d1556f69c2
|
WIP
|
2021-09-05 11:17:28 -05:00 |
|
smilerz
|
ab316236f9
|
allow deleting of Food part of Ingredient, but not recipe
|
2021-09-05 10:10:42 -05:00 |
|
smilerz
|
b147c975b8
|
post food_tree bug fixing
|
2021-09-04 16:41:57 -05:00 |
|
vabene1111
|
16d125a243
|
fixed search facets and sub recipe
|
2021-09-04 19:26:42 +02:00 |
|