Commit Graph

878 Commits

Author SHA1 Message Date
42aaed011c added saving of supermarket in shopping v2 2022-01-18 22:42:10 +01:00
66d29d10bf fixed shopping v2 export drop down alignment 2022-01-18 22:38:42 +01:00
dfa4f444ef Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-18 22:36:05 +01:00
f9c68e9fcc layout tweaks 2022-01-18 22:35:53 +01:00
d65c881fde Merge pull request #1366 from smilerz/super-cat-fix
fix supermarket categories
2022-01-18 22:14:42 +01:00
7bf9f18402 allow file uploading in recipe editor 2022-01-18 21:36:20 +01:00
3ea96d4102 basics 2022-01-18 21:09:08 +01:00
b3417be2ec fix supermarket categories 2022-01-18 13:26:07 -06:00
8d24ae9008 small tweaks to the recipe editor 2022-01-18 19:55:51 +01:00
a9d8080ec2 Merge pull request #1358 from smilerz/expert-settings
enable/disable treeselect
2022-01-18 16:17:36 +01:00
fe09278b0e silenced translation warnings 2022-01-18 16:16:11 +01:00
2a13a341dd enable/disable treeselect 2022-01-18 08:17:54 -06:00
b382ab9024 step rendering improvements 2022-01-18 15:09:51 +01:00
24c476830d Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-01-18 14:51:44 +01:00
2d0a638c0a fixed empty step headers 2022-01-18 14:51:34 +01:00
70b8a50d1d Translated using Weblate (Polish)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2022-01-18 13:43:20 +00:00
05df133960 Translated using Weblate (Chinese (Simplified))
Currently translated at 58.4% (166 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2022-01-18 13:43:20 +00:00
426f4d3e77 Translated using Weblate (Dutch)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
2022-01-18 13:43:20 +00:00
6b2ac3f873 Translated using Weblate (German)
Currently translated at 87.3% (248 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
cc7b9bba32 Translated using Weblate (German)
Currently translated at 87.3% (248 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
8e0c709427 Translated using Weblate (German)
Currently translated at 87.3% (248 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
1ed965adcd Translated using Weblate (German)
Currently translated at 87.3% (248 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2022-01-18 13:43:20 +00:00
a0fd1f4104 fixed step header rendering 2022-01-18 14:00:25 +01:00
ba1f10cd3a Merge branch 'develop' into facet-fix 2022-01-18 07:59:32 +01:00
4e0cc34d41 better fix for counting facets 2022-01-17 17:18:43 -06:00
ef4ce62f5b custom class selection for lookupinput comp 2022-01-17 23:48:57 +01:00
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
d8d76ae9e0 fix missing label supermarket category 2022-01-17 16:12:54 -06:00
c60141940d shopping list ux improvements 2022-01-17 23:02:42 +01:00
5724ef9511 fix boolean directive 2022-01-17 14:02:58 -06:00
e1c7305c07 switcher basically working again 2022-01-17 20:22:37 +01:00
a539d14aad wip switcher 2022-01-17 18:15:23 +01:00
d23158839b Revert "temporarily disable recipe switcher"
This reverts commit d2b796ddd2.
2022-01-17 17:58:09 +01:00
d2b796ddd2 temporarily disable recipe switcher 2022-01-17 17:58:04 +01:00
8b1e80efeb wip 2022-01-17 17:51:29 +01:00
306f90aa98 recipe editor decimal fixes 2022-01-17 16:27:10 +01:00
30421d067e Merge branch 'develop' into fuzzy_search 2022-01-17 15:51:23 +01:00
d3b71e40c7 cleand up context menu code 2022-01-17 15:43:35 +01:00
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
37971acb48 refactor recipe search 2022-01-17 08:26:34 -06:00
0c603e3665 Translated using Weblate (Italian)
Currently translated at 84.1% (239 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2022-01-17 07:56:19 +00:00
5a65fd2231 Merge pull request #1331 from TandoorRecipes/dependabot/npm_and_yarn/vue/follow-redirects-1.14.7
Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
2022-01-16 17:29:35 +01:00
c2a763fa4c Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-16 07:07:02 +00:00
528767a835 Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-16 07:07:02 +00:00
9b182f6076 Translated using Weblate (Chinese (Simplified))
Currently translated at 32.0% (91 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2022-01-16 07:07:02 +00:00
24e42496a7 Bump follow-redirects from 1.14.6 to 1.14.7 in /vue
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-16 01:02:54 +00:00
8cebc98d3b Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 23:18:42 +00:00
965d2c05e7 Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 23:18:37 +00:00
17ad01ae8c Translated using Weblate (French)
Currently translated at 100.0% (284 of 284 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
2022-01-14 23:18:36 +00:00
91fcb1b822 Translated using Weblate (Polish)
Currently translated at 80.9% (225 of 278 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2022-01-14 19:11:20 +00:00