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

653 Commits

Author SHA1 Message Date
smilerz
d68a89a32c catch empty lines in paste_ingredients 2022-02-16 14:07:56 -06:00
smilerz
8b94bf1333 retain order of pasted ingredients 2022-02-16 13:22:53 -06:00
smilerz
ad6d99800e include note from ingredient API 2022-02-16 08:35:04 -06:00
smilerz
19708dbc64 paste list of ingredients 2022-02-14 17:28:16 -06:00
vabene1111
1e9f7af017 updated translations and django version 2022-02-11 09:29:28 +01:00
vabene1111
6ae1365505 Merge pull request #1512 from smilerz/additional_fixes 
various fixes
 2022-02-11 09:01:56 +01:00
Marion Kämpfer
13ed297fb9 Translated using Weblate (French) 
Currently translated at 95.9% (286 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2022-02-09 01:31:35 +00:00
smilerz
88b3ba1427 various fixes 2022-02-08 08:13:16 -06:00
vabene1111
969df37e28 fixed sharing and added additional tests 2022-02-07 15:43:06 +01:00
vabene1111
f37790a24a changed to vue 2 lifecycle hook 2022-02-07 14:48:52 +01:00
vabene1111
5f9820ed30 Merge pull request #1469 from benscobie/issue/1434 
Keep screen awake when viewing recipe
 2022-02-07 14:48:21 +01:00
Dersim Özdag
7dcc38b5b2 Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-06 21:31:33 +00:00
Dirk
6068496240 Translated using Weblate (German) 
Currently translated at 100.0% (298 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-06 21:31:33 +00:00
Dirk
65003175ce Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
A. L
72d29cc88a Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
Dersim Özdag
bc8131ac56 Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
Dirk
1c27f2f9b1 Translated using Weblate (German) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-02-05 21:06:28 +00:00
Tomasz Klimczak
262a1f0064 Translated using Weblate (Polish) 
Currently translated at 99.6% (297 of 298 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
 2022-02-04 19:31:33 +00:00
vabene1111
fd026154d8 changed step header default and fixed ingredient rendering error 2022-02-04 17:11:35 +01:00
vabene1111
7f427c2d1f validate 0 servings in frontend 2022-02-04 16:51:16 +01:00
vabene1111
d45e3b8e60 some tweaks for new exporter 2022-02-03 18:00:02 +01:00
vabene1111
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
Ben Scobie
74e88218d5 Keep screen awake when viewing recipe 2022-02-01 21:05:04 +00:00
Stephen Brown II
3961c684f9 Fix Make_Header/Make_Ingredient text and reference 2022-02-01 09:17:30 -06: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
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
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
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +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
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
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
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