mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 20:28:46 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,522 Commits 21 Branches 170 Tags
15eec9d3737487b779f857befc0e0a94476239e9
Commit Graph

201 Commits

Author SHA1 Message Date
xeals
15eec9d373 Set calories heading based on user preference 2021-10-25 17:38:41 +11:00
xeals
c9ff0543e3 Convert nutrition input from KJ to calories with preference 2021-10-25 17:37:31 +11:00
Kaibu
24c1bfa16f shopping and new nav for meal plan 2021-10-21 19:07:12 +02:00
Kaibu
d62557b804 calender selector 2021-10-19 18:53:35 +02:00
vabene1111
629a6d21e7 fixed ingredient rendering glitch 2021-10-19 17:26:56 +02:00
Kaibu
9694560deb Merge branch 'develop' into feature/minor_ui_improvements 2021-10-17 19:09:23 +02:00
Kaibu
bfbf932f6b setting starting day in meal plan 2021-10-17 17:31:52 +02:00
Kaibu
e784074ac8 meal plan icons, rating spacing 2021-10-17 16:36:45 +02:00
Kaibu
2e2b79c093 ical export and tooltips for new meal plan 2021-10-17 15:11:30 +02:00
vabene1111
3e51c262d5 fixed breaking new button in multi list to new line 2021-10-14 13:28:04 +02:00
vabene1111
df31f7388e fixed webpack public path 2021-10-14 12:20:31 +02:00
vabene1111
54a2a45959 completed migration of file view to generic model list 2021-10-14 11:20:30 +02:00
vabene1111
4324dd61cf Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-13 15:04:03 +02:00
vabene1111
1b1945d954 started migrating file editor page to generic model list 2021-10-13 15:03:59 +02:00
Kaibu
4b1443a705 new meal type edit 2021-10-13 14:50:52 +02:00
Kaibu
b6c17f3bf3 books lazy loading details 2021-10-12 18:20:14 +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
Kaibu
37e45bea76 meal plan fixes 
- added translations
- form validation & tagging support for meal types
 2021-10-09 02:25:31 +02:00
smilerz
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05:00
vabene1111
823c5d3975 fixed model list view error for unpaginated lists 2021-10-01 18:55:16 +02:00
vabene1111
b6d878e885 fixed model list error 2021-10-01 18:34:30 +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
smilerz
a140813a67 made add button on ModelList larger 2021-09-30 10:33:47 -05: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
smilerz
c1a22ea2a6 chain supermarket create/update to include categories 2021-09-27 17:55:58 -05: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
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
vabene1111
a7dc23194e converted ingredient parser to class and added automation beta hint 2021-09-16 17:52:11 +02:00
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
vabene1111
cfaae5b200 Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
vabene1111
1fa9c806a6 Merge branch 'develop' into patch2 2021-09-15 17:28:01 +02:00
smilerz
6a29c79e5c fix resetList function 2021-09-15 08:50:46 -05:00
smilerz
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
vabene1111
dbfa27e4b9 automatic rule creation 2021-09-15 14:58:55 +02:00
vabene1111
aeb5682176 Merge branch 'pr/897' into develop 2021-09-15 09:16:09 +02:00
smilerz
4296e8e44f remove console messages 2021-09-14 16:19:38 -05:00
Kaibu
d9300a9a90 meal planner refactor progress 2021-09-14 23:16:33 +02:00
smilerz
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
smilerz
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
vabene1111
1c661c9baf recipe edit view hotkeys and small tweaks 2021-09-14 12:36:04 +02:00
vabene1111
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +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
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