mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 12:49:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,280 Commits 21 Branches 170 Tags
13d144345e31a6445e068c57fab8831e930d8496
Commit Graph

379 Commits

Author SHA1 Message Date
Chris Scoggins
13d144345e adjust height of viewport in mobile shopping view 2022-01-31 16:30:54 -06: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
Chris Scoggins
e2f8f29ec8 refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
vabene1111
b2fcdaa14e wont load by default otherwise 2022-01-27 14:15:38 +01:00
smilerz
331a949623 fixed saving shopping shared users 2022-01-26 17:27:52 -06:00
smilerz
cd733d3190 Update ShoppingListView.vue 2022-01-26 17:10:24 -06:00
Chris Scoggins
6e4bb64b4e fix translation on ModelListMenu 2022-01-26 15:00:21 -06:00
Chris Scoggins
4a48019885 fix duplicate shopping entries when using old list 2022-01-26 14:47:33 -06:00
Chris Scoggins
47823132f0 add ignore_shopping && additional help 2022-01-26 12:57:29 -06: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
f0b05808b8 moved Undefined to be first category 2022-01-21 12:36:54 -06:00
Chris Scoggins
250c3ce5b2 rebase with develop 2022-01-21 12:11:01 -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
vabene1111
20adcc0e83 fixed v2 autosync flickering 2022-01-21 16:44:03 +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
vabene1111
ab5bff62e3 Merge pull request #1381 from sebweb3r/spelling_mistakes 
Fix typos
 2022-01-20 17:44:49 +01:00
vabene1111
001edecdd3 fixed quick entry for shopping v2 2022-01-20 15:54:45 +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
smilerz
530b1a8986 fix sort by new 2022-01-19 08:39:40 -06:00
vabene1111
07195b74a3 Merge pull request #1368 from smilerz/fix-mutliselect 
fix multiselect
 2022-01-18 22:52:08 +01:00
smilerz
18c45771e7 fix multiselect 2022-01-18 15:44:11 -06:00
vabene1111
42aaed011c added saving of supermarket in shopping v2 2022-01-18 22:42:10 +01:00
vabene1111
66d29d10bf fixed shopping v2 export drop down alignment 2022-01-18 22:38:42 +01:00
vabene1111
dfa4f444ef Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-18 22:36:05 +01:00
vabene1111
f9c68e9fcc layout tweaks 2022-01-18 22:35:53 +01:00
vabene1111
d65c881fde Merge pull request #1366 from smilerz/super-cat-fix 
fix supermarket categories
 2022-01-18 22:14:42 +01:00
vabene1111
7bf9f18402 allow file uploading in recipe editor 2022-01-18 21:36:20 +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
vabene1111
8d24ae9008 small tweaks to the recipe editor 2022-01-18 19:55:51 +01:00
smilerz
2a13a341dd enable/disable treeselect 2022-01-18 08:17:54 -06:00
vabene1111
ba1f10cd3a Merge branch 'develop' into facet-fix 2022-01-18 07:59:32 +01:00
smilerz
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06: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
Kaibu
c60141940d shopping list ux improvements 2022-01-17 23:02:42 +01:00
vabene1111
e1c7305c07 switcher basically working again 2022-01-17 20:22:37 +01:00
vabene1111
d23158839b Revert "temporarily disable recipe switcher" 
This reverts commit d2b796ddd2.
 2022-01-17 17:58:09 +01:00
vabene1111
d2b796ddd2 temporarily disable recipe switcher 2022-01-17 17:58:04 +01:00
vabene1111
306f90aa98 recipe editor decimal fixes 2022-01-17 16:27:10 +01:00
vabene1111
30421d067e Merge branch 'develop' into fuzzy_search 2022-01-17 15:51:23 +01:00
vabene1111
d3b71e40c7 cleand up context menu code 2022-01-17 15:43:35 +01:00
vabene1111
1a84a8fe80 Merge pull request #1289 from MarcusWolschon/features/1093_recipe_link_in_plan 
#1093 Recipe link in plan
 2022-01-17 15:39:11 +01:00
smilerz
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
Marcus Wolschon
934eeee5c4 #1093 code cleanup 2022-01-14 13:56:46 +01:00
Marcus Wolschon
2927333bf1 #1093 code cleanup 2022-01-14 13:52:42 +01:00