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
3,301 Commits 21 Branches 170 Tags
b2a415b33364fe8c15ff72e1633ca8cafd85a510
Commit Graph

3301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
b2a415b333 Merge pull request #1447 from smilerz/mealplan_shopping_useability 
Mealplan shopping useability
 2022-02-01 08:28:59 +01:00
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
vabene1111
8216d0c025 Merge pull request #1439 from oliviapinson/develop 
Simple font size change
 2022-01-31 11:41:29 +01:00
dudel
98128fabab Translated using Weblate (German) 
Currently translated at 95.9% (545 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-01-30 15:07:01 +00: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
a7796cbf5c fix shopping list sharing 2022-01-29 11:59:06 -06:00
Chris Scoggins
e2f8f29ec8 refactor list_from_recipe as class RecipeShoppingEditor 2022-01-29 10:28:01 -06:00
vabene1111
9fcfa17004 Merge pull request #1377 from MaxJa4/docs/docker-installation 
Enhancement of installation instruction docs
 2022-01-28 15:35:20 +01: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
vabene1111
8232c77ef6 Merge pull request #1432 from smilerz/mealplan_shopping_useability 
fix servings reactivity
 2022-01-28 15:16:01 +01:00
Chris Scoggins
85bbcb0010 fix servings reactivity 2022-01-28 07:38:36 -06:00
vabene1111
338d8459de Merge pull request #1429 from smilerz/fix_shopping_sharing 
fix #1426
 2022-01-28 08:54:08 +01:00
Mario Dvorsek
fbf9a81121 Translated using Weblate (Slovenian) 
Currently translated at 97.2% (283 of 291 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/
 2022-01-28 00:07:08 +00:00
Alex Hanselmann
1f80936805 Translated using Weblate (German) 
Currently translated at 93.1% (529 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-01-28 00:07:08 +00:00
Chris Scoggins
8d424d668d fix #1426 2022-01-27 16:46:46 -06:00
vabene1111
b2fcdaa14e wont load by default otherwise 2022-01-27 14:15:38 +01:00
vabene1111
d4d949b870 Merge pull request #1421 from TandoorRecipes/minor_fixes 
Minor fixes
 2022-01-27 08:02:06 +01:00
smilerz
759ae99b56 Update en.json 2022-01-26 18:58:45 -06:00
smilerz
7104b5b109 sort SupermarketCategory queryset 
fixes #1422
 2022-01-26 17:31:22 -06: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
Leni
bb5c8bbbf1 Translated using Weblate (German) 
Currently translated at 100.0% (291 of 291 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-01-26 14:07:05 +00:00
Rene
5a0a1ca6a9 Translated using Weblate (German) 
Currently translated at 100.0% (291 of 291 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-01-26 14:07:05 +00:00
Leni
19cc1e11b9 Translated using Weblate (German) 
Currently translated at 91.5% (520 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-01-26 14:07:05 +00:00
Rene
c070c5b0ed Translated using Weblate (German) 
Currently translated at 91.5% (520 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-01-26 14:07:05 +00:00
Chris Scoggins
2e2080d8d1 fix Recipe Counts on food/keyword/unit serializer 2022-01-25 16:48:30 -06:00
TheHaf
381a7e76be Use custom input component in recipe view 2022-01-25 22:04:21 +01:00
TheHaf
6c619ab628 Add custom input component with spin button look&feel 2022-01-25 22:03:49 +01:00
vabene1111
ae14dde13d propperly fixed setting 2022-01-25 18:33:12 +01:00
vabene1111
e33cf08fca Revert "use old system to define frontend settings" 
This reverts commit f2e9f50d94.
 2022-01-25 18:26:51 +01:00
vabene1111
f2e9f50d94 use old system to define frontend settings 2022-01-25 18:14:25 +01:00
vabene1111
75259ec230 corrected comment 2022-01-25 17:38:35 +01:00
vabene1111
f581f17308 Merge branch 'master' into develop 2022-01-25 15:30:36 +01:00
vabene1111
8c49e6ba18 another small migration fix 1.0.5.2 2022-01-25 15:29:36 +01:00
vabene1111
4b0ed86c36 Merge branch 'develop' 1.0.5.1 2022-01-25 12:22:16 +01:00
vabene1111
44da3ed7a9 Merge pull request #1406 from smilerz/patch_1.0.5_migration 
Patch 1.0.5 migration
 2022-01-25 12:21:46 +01:00
Chris Scoggins
f3f50d179f fixed missing field 2022-01-24 19:16:14 -06:00
vabene1111
6cabeba3cb Merge branch 'develop' 1.0.5 2022-01-24 18:25:49 +01:00
vabene1111
90bb67ff89 compiled translations 2022-01-24 18:25:33 +01:00
vabene1111
69ed987db8 Merge pull request #1400 from geisterfurz007/chore/filename-consistency 
k8s yaml file consistency
 2022-01-23 21:58:16 +01:00
vabene1111
638904abc8 Merge pull request #1399 from geisterfurz007/patch-1 
Correct path to kubernetes files
 2022-01-23 21:57:52 +01:00