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
|
05f2fdecb3
|
fixes 1123
|
2021-12-23 07:44:11 -06:00 |
|
vabene1111
|
4d2e7eadb6
|
Merge branch 'develop' into generic_modal_v2
|
2021-11-30 17:23:27 +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 |
|
Kaibu
|
4288d76afd
|
added more translations
|
2021-11-07 17:32:43 +01:00 |
|
vabene1111
|
1fad1d2b8f
|
improved deletion of recipes
|
2021-11-04 12:27:21 +01:00 |
|
Kaibu
|
2215e06506
|
translation fixes
|
2021-11-03 21:34:18 +01:00 |
|
Kaibu
|
a40c8c3f83
|
added password reset from key templates
|
2021-11-03 20:44:36 +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
|
6949e17a33
|
possibly fixed sub path hosting issues
|
2021-10-29 11:29:55 +02:00 |
|
vabene1111
|
0091abd2c0
|
fixed typo
|
2021-10-26 14:51:30 +02:00 |
|
xeals
|
c9ff0543e3
|
Convert nutrition input from KJ to calories with preference
|
2021-10-25 17:37:31 +11:00 |
|
xeals
|
3d830a4449
|
Display nutritional energy in KJ with preference
|
2021-10-25 17:28:52 +11:00 |
|
vabene1111
|
8363b1925c
|
Merge pull request #971 from vabene1111/feature/meal_plan_shopping
Feature/meal plan shopping
|
2021-10-21 20:36:44 +02:00 |
|
Kaibu
|
24c1bfa16f
|
shopping and new nav for meal plan
|
2021-10-21 19:07:12 +02:00 |
|
vabene1111
|
ae12b8111d
|
added debug info to system page
|
2021-10-20 17:51:23 +02:00 |
|
vabene1111
|
70df8a5ffd
|
show better error message when recipe deletion breaks due to constraints
|
2021-10-19 18:22:18 +02:00 |
|
vabene1111
|
12b3d3a188
|
fixed shopping list decimal rounding
|
2021-10-19 17:03:24 +02:00 |
|
Kaibu
|
2e2b79c093
|
ical export and tooltips for new meal plan
|
2021-10-17 15:11:30 +02:00 |
|
vabene1111
|
54a2a45959
|
completed migration of file view to generic model list
|
2021-10-14 11:20:30 +02:00 |
|
Kaibu
|
4b1443a705
|
new meal type edit
|
2021-10-13 14:50:52 +02:00 |
|
vabene1111
|
38c0d01dc1
|
fixed old shopping list containing to many decimal places
|
2021-10-13 11:40:49 +02:00 |
|
vabene1111
|
cae3a35926
|
added export to nav
|
2021-10-13 10:03:58 +02:00 |
|
vabene1111
|
22fd499213
|
build frontend
|
2021-10-12 18:23:53 +02:00 |
|
vabene1111
|
fe99324c38
|
Merge branch 'develop' into api_performance
|
2021-10-12 16:28:49 +02:00 |
|
vabene1111
|
88a2255ed2
|
fixes
translation
disabled note rendering when less than 15 characters
fixed step header rendering
fixed image in recipe edit on mobile layout
|
2021-10-11 16:29:32 +02:00 |
|
vabene1111
|
f845acded7
|
Merge pull request #945 from wisdomkhan/wisdomkhan-tandoor-translate-link
Added link for Tandoor Translate
|
2021-10-08 19:11:46 +02:00 |
|
vabene1111
|
a870ff9325
|
Merge branch 'beta' into develop
# Conflicts:
# cookbook/static/vue/js/checklist_view.js
# cookbook/static/vue/js/chunk-vendors.js
# cookbook/static/vue/js/cookbook_view.js
# cookbook/static/vue/js/edit_internal_recipe.js
# cookbook/static/vue/js/import_response_view.js
# cookbook/static/vue/js/meal_plan_view.js
# cookbook/static/vue/js/model_list_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
# cookbook/templates/sw.js
|
2021-10-06 20:14:35 +02:00 |
|
vabene1111
|
ede7925203
|
compiled javascript
|
2021-10-06 20:13:36 +02:00 |
|
smilerz
|
613b618533
|
ExtendedRecipeMixin
|
2021-10-05 06:28:25 -05:00 |
|
Mohammad Asim Khan
|
4f435748a7
|
Added link for Tandoor Translate
|
2021-10-02 17:24:46 +05:30 |
|
vabene1111
|
d510b521af
|
updated nav
|
2021-10-01 18:45:59 +02:00 |
|
vabene1111
|
4ba4eec238
|
fixed ci and rebuild files
|
2021-10-01 12:44:37 +02:00 |
|
vabene1111
|
64b2e21747
|
Merge branch 'develop' into draggable_pill_update
|
2021-10-01 07:53:35 +00: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 |
|
Kaibu
|
b61512da77
|
meal plan refactor progress
- added paginated loading
- tab panes
- default meal type selection
- image placeholder
- drang and drop delete area
|
2021-09-30 02:33:40 +02:00 |
|
vabene1111
|
71a13d33fe
|
update javascript
|
2021-09-29 15:39:34 +02:00 |
|
vabene1111
|
856c34a3bf
|
fixed and expanded on trigram search
|
2021-09-28 19:12:51 +02:00 |
|
smilerz
|
b3cffa4a38
|
cached facet results
|
2021-09-26 16:44:12 -05:00 |
|
Kaibu
|
b7be5cd325
|
meal plan fixes
added the option to create entries from recipe card context menu
|
2021-09-26 11:55:50 +02: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
|
f3593e8151
|
implemented rule processing in ingredient parser
|
2021-09-16 18:31:21 +02:00 |
|
Kaibu
|
e2def416ab
|
new meal planner basic features implemented
|
2021-09-15 17:31:25 +02:00 |
|
smilerz
|
5c0fa7cd19
|
fix inputLookup
|
2021-09-15 08:13:22 -05:00 |
|
vabene1111
|
94e357f4f6
|
cookbookapp importer
|
2021-09-15 10:26:31 +02:00 |
|