mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,520 Commits 21 Branches 170 Tags
3d830a44493118dab06baeb9120a80d6501056d3
Commit Graph

761 Commits

Author SHA1 Message Date
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
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
cbb2c0460c fixed fractional servings breaking importer 2021-09-14 21:54:08 +02:00
vabene1111
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
Kaibu
02635b017c more minor drawer fixes 2021-09-13 22:38:24 +02:00
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
Kaibu
659847a949 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 
# Conflicts:
#	cookbook/templates/base.html
 2021-09-13 22:15:24 +02:00
Kaibu
9ace332ba5 drawer added 2021-09-13 22:14:15 +02:00
vabene1111
6f44ad760c quick solution for external recipe nav 2021-09-13 21:51:24 +02:00
Kaibu
0c3dcf143f drawer rework 2021-09-13 21:41:15 +02: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
Kaibu
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
Kaibu
9efc60232a removed old asset 2021-09-13 19:30:53 +02:00
Kaibu
8b09777b2c Merge branch 'feature/books_refactor' into develop 
# Conflicts:
#	vue/webpack-stats.json
 2021-09-13 19:30:13 +02:00