Commit Graph

584 Commits

Author SHA1 Message Date
smilerz
c5c76cadea getUserPreference available for all UserPreferences 2021-12-28 12:03:31 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
vabene1111
3ff15b6766 added copy me that importer 2021-12-23 15:54:48 +01:00
smilerz
3516505dd1 fix bug in get_facet_api 2021-12-16 09:08:32 -06:00
vabene1111
3bc1daa72e fixed import 2021-11-30 18:48:07 +01:00
vabene1111
4d2e7eadb6
Merge branch 'develop' into generic_modal_v2 2021-11-30 17:23:27 +01:00
vabene1111
7c985cec23
Merge pull request #1088 from smilerz/search_troubleshooting
add search debug
2021-11-30 17:21:40 +01:00
vabene1111
7f22e0a275 fixed duplicate results on cook book view api 2021-11-27 16:03:08 +01:00
smilerz
55a0304700 add search debug 2021-11-24 12:10:15 -06:00
smilerz
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00
vabene1111
695cab29a1 fixed book sharing and added step page 2021-11-14 15:33:25 +01:00
vabene1111
5ae440d5c9 fixed image on url importer 2021-11-13 12:30:23 +01:00
vabene1111
dda2529f6f fixed plan share space filter 2021-11-05 19:42:41 +01:00
vabene1111
d681e3ced3 disable external recipes in hosted version 2021-11-04 15:56:22 +01:00
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