Commit Graph

772 Commits

Author SHA1 Message Date
florian hantke
d135c755c8 fix file path checks 2022-02-17 13:26:35 +01:00
vabene1111
4fa5b28328
Merge branch 'develop' into feature/copy-to-new-recipe 2022-02-17 10:55:59 +01:00
vabene1111
f916e38da8
Merge pull request #1539 from smilerz/auto_add_shopping_fix
fix duplicate shopping recipes when auto-add enabled
2022-02-17 10:55:06 +01:00
vabene1111
f77b45725b
Merge pull request #1538 from smilerz/feature/paste_ingredients
paste list of ingredients
2022-02-17 10:54:25 +01:00
smilerz
21c6f819a0
start counting at zero 2022-02-16 14:19:58 -06:00
smilerz
5f3d5afc37
typo 2022-02-16 14:18:23 -06:00
smilerz
57dec86b06
handle empty ingredient list when pasting 2022-02-16 14:17:41 -06:00
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
42a6f8457a
remove console messages 2022-02-16 10:58:05 -06:00
smilerz
501f56ffd5
copy to new recipe 2022-02-16 09:16:51 -06:00
smilerz
ad6d99800e
include note from ingredient API 2022-02-16 08:35:04 -06:00
dependabot[bot]
90b4ecb599
Bump follow-redirects from 1.14.7 to 1.14.8 in /vue
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-15 02:38:12 +00:00
smilerz
57658e76f5
fix duplicate shopping recipes when auto-add enabled 2022-02-14 17:47:17 -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
vabene1111
ba3c0b933c update vue cli 2022-02-03 15:59:02 +01:00
vabene1111
7f84186b5b
Merge pull request #1456 from TandoorRecipes/dependabot/npm_and_yarn/vue/vue/compiler-sfc-3.2.29
Bump @vue/compiler-sfc from 3.2.26 to 3.2.29 in /vue
2022-02-03 14:41:52 +01:00
vabene1111
bc72086912
Merge pull request #1455 from TandoorRecipes/dependabot/npm_and_yarn/vue/typescript-4.5.5
Bump typescript from 4.5.4 to 4.5.5 in /vue
2022-02-03 14:41:47 +01:00
vabene1111
a41e5b362a
Merge pull request #1454 from TandoorRecipes/dependabot/npm_and_yarn/vue/core-js-3.20.3
Bump core-js from 3.20.2 to 3.20.3 in /vue
2022-02-03 14:41:42 +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
dependabot[bot]
1e417fee97
Bump @vue/compiler-sfc from 3.2.26 to 3.2.29 in /vue
Bumps [@vue/compiler-sfc](https://github.com/vuejs/core/tree/HEAD/packages/compiler-sfc) from 3.2.26 to 3.2.29.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits/v3.2.29/packages/compiler-sfc)

---
updated-dependencies:
- dependency-name: "@vue/compiler-sfc"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:10:38 +00:00
dependabot[bot]
47d7c846a3
Bump typescript from 4.5.4 to 4.5.5 in /vue
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.5.4 to 4.5.5.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.5.4...v4.5.5)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:10:13 +00:00
dependabot[bot]
3b236ea04e
Bump core-js from 3.20.2 to 3.20.3 in /vue
Bumps [core-js](https://github.com/zloirock/core-js) from 3.20.2 to 3.20.3.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/compare/v3.20.2...v3.20.3)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-01 00:09:45 +00: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