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

725 Commits

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
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
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
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
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
dependabot[bot]
2398c00dfe Bump node-fetch from 2.6.6 to 2.6.7 in /vue 
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-23 20:53:52 +00:00
dependabot[bot]
202ef9509d Bump nanoid from 3.1.30 to 3.2.0 in /vue 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-22 10:32:18 +00:00
糖多
95b10bc01c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 95.1% (275 of 289 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2022-01-22 03:31:00 +00: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
Tomasz Klimczak
ddbbd53ace Translated using Weblate (Polish) 
Currently translated at 100.0% (285 of 285 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
 2022-01-20 14:24:20 +00:00
Philipp Wensauer
0360d443ea Translated using Weblate (German) 
Currently translated at 87.0% (248 of 285 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2022-01-20 14:24:19 +00: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
fc9eb249a8 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-19 17:37:01 +01:00
vabene1111
4a9e027849 changed asset caching strategy 
there were to many issues with stale content breaking the application thus policy was changed to network first. might make another fix to split between more static assets (bootstrap/libraries/...) and more actively changed ones like the frontend
 2022-01-19 17:36:57 +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