mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 04:39:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,427 Commits 21 Branches 170 Tags
57658e76f5feda8e360ab4cec7297cd2065bfbc3
Commit Graph

302 Commits

Author SHA1 Message Date
smilerz
57658e76f5 fix duplicate shopping recipes when auto-add enabled 2022-02-14 17:47:17 -06:00
smilerz
88b3ba1427 various fixes 2022-02-08 08:13:16 -06:00
vabene1111
fd026154d8 changed step header default and fixed ingredient rendering error 2022-02-04 17:11:35 +01:00
vabene1111
b2a415b333 Merge pull request #1447 from smilerz/mealplan_shopping_useability 
Mealplan shopping useability
 2022-02-01 08:28:59 +01:00
Chris Scoggins
b633be9c13 fix display issues 2022-01-31 16:24:40 -06:00
Chris Scoggins
f45e09a5a5 add units to search fields 2022-01-31 14:41:18 -06:00
Chris Scoggins
5b3a0a6e29 refactor IngredientComponent, move shopping logic to card 2022-01-31 14:05:01 -06:00
vabene1111
8216d0c025 Merge pull request #1439 from oliviapinson/develop 
Simple font size change
 2022-01-31 11:41:29 +01:00
Olivia Pinson
2d36db7822 Simple font size change 
Adjusted font size so longer months won't affect arrow buttons. I think this helps the meal plan calendar look more aesthetic.
 2022-01-29 22:44:19 -05:00
Chris Scoggins
e00794bbdf review shopping list in MealPlan modal 2022-01-29 14:10:14 -06:00
Chris Scoggins
e2f8f29ec8 refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
vabene1111
58f1ce0331 fixed rendering issue with single step recipes 2022-01-28 15:26:11 +01:00
vabene1111
20b4c4fb36 fixed using undeclared unused field 2022-01-28 15:21:07 +01:00
vabene1111
965e1664af Merge pull request #1411 from TheHaf/feature/addPortionSizeModifiersToGui 
Feature/add portion size modifiers to gui
 2022-01-28 15:17:05 +01:00
Chris Scoggins
85bbcb0010 fix servings reactivity 2022-01-28 07:38:36 -06:00
Chris Scoggins
6e4bb64b4e fix translation on ModelListMenu 2022-01-26 15:00:21 -06:00
Chris Scoggins
47823132f0 add ignore_shopping && additional help 2022-01-26 12:57:29 -06:00
TheHaf
6c619ab628 Add custom input component with spin button look&feel 2022-01-25 22:03:49 +01:00
Chris Scoggins
6e2374737e Squashed commit of the following: 
commit a30a27c755
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Fri Jan 21 17:49:27 2022 +0100

    added keyword clicking to recipe view and fixed deleted keyword showing in search when passed via parameter

commit f274f31e80
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Fri Jan 21 16:56:47 2022 +0100

    fixed unit search on importer page

commit 20adcc0e83
Author: vabene1111 <vabene1234@googlemail.com>
Date:   Fri Jan 21 16:44:03 2022 +0100

    fixed v2 autosync flickering
Merge branch 'develop' into add-recipe
 2022-01-21 13:11:33 -06:00
Chris Scoggins
7916635716 add recipes to shopping list 2022-01-21 12:01:46 -06:00
vabene1111
a30a27c755 added keyword clicking to recipe view and fixed deleted keyword showing in search when passed via parameter 2022-01-21 17:49:27 +01:00
Kaibu
c5b70b94c7 left handed only on mobile 2022-01-21 00:48:57 +01:00
Kaibu
c90e5d72af shopping list ux optimization, left handed mode 2022-01-21 00:13:36 +01:00
Sebastian Weber
c20e982fb1 Fix typos 2022-01-20 00:50:41 +01:00
Kaibu
0f7dc096cb shopping list ux 2022-01-20 00:29:10 +01:00
vabene1111
dfa4f444ef Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-18 22:36:05 +01:00
vabene1111
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
smilerz
b3417be2ec fix supermarket categories 2022-01-18 13:26:07 -06:00
smilerz
2a13a341dd enable/disable treeselect 2022-01-18 08:17:54 -06:00
vabene1111
b382ab9024 step rendering improvements 2022-01-18 15:09:51 +01:00
vabene1111
2d0a638c0a fixed empty step headers 2022-01-18 14:51:34 +01:00
vabene1111
a0fd1f4104 fixed step header rendering 2022-01-18 14:00:25 +01:00
Kaibu
ef4ce62f5b custom class selection for lookupinput comp 2022-01-17 23:48:57 +01:00
Kaibu
b990462bdb Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 
# Conflicts:
#	vue/src/components/Modals/LookupInput.vue
 2022-01-17 23:48:12 +01:00
smilerz
d8d76ae9e0 fix missing label supermarket category 2022-01-17 16:12:54 -06:00
Kaibu
c60141940d shopping list ux improvements 2022-01-17 23:02:42 +01:00
smilerz
5724ef9511 fix boolean directive 2022-01-17 14:02:58 -06:00
vabene1111
e1c7305c07 switcher basically working again 2022-01-17 20:22:37 +01:00
vabene1111
a539d14aad wip switcher 2022-01-17 18:15:23 +01:00
vabene1111
8b1e80efeb wip 2022-01-17 17:51:29 +01:00
vabene1111
30421d067e Merge branch 'develop' into fuzzy_search 2022-01-17 15:51:23 +01:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
smilerz
0e1153ce3a deleted extraneous emit 2022-01-13 17:40:26 -06:00
smilerz
6d9a90c6ba fix onhand_users 2022-01-13 16:49:10 -06:00
vabene1111
e1e53d12f8 playing around with the reciupe switcher 2022-01-07 16:19:25 +01:00
vabene1111
724217f142 Merge branch 'develop' into feature/shopping_list_v2 2022-01-06 16:27:39 +01:00
smilerz
b919fb4ae8 quick add shoppinglist 2022-01-05 15:20:10 -06:00
smilerz
214db80dac add category context menu 2022-01-05 15:20:10 -06:00
smilerz
795f3084d9 Merge branch 'feature/related_recipe_switcher' of https://github.com/TandoorRecipes/recipes into feature/related_recipe_switcher 2021-12-31 09:01:36 -06:00
smilerz
931eae4361 fix switcher to be TZ sensitive 2021-12-31 09:01:31 -06:00