cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,585 Commits 2 Branches 0 Tags 57 MiB
c7f5975c22
Commit Graph

856 Commits

Author SHA1 Message Date
dependabot[bot]
c7f5975c22
Bump url-parse from 1.5.7 to 1.5.10 in /vue 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-26 09:30:47 +00:00
dependabot[bot]
739c2ecc53
Bump prismjs from 1.25.0 to 1.27.0 in /vue 
Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](https://github.com/PrismJS/prism/compare/v1.25.0...v1.27.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-26 02:26:31 +00:00
vabene1111
fc6268b7ff
Merge pull request #1564 from smilerz/retain_original_ingredient_text 
retain original text when parsing ingredients
 2022-02-25 16:17:44 +01:00
Maximilian Jannack
715e301a4d Revert "Revert "Added some translations in meal plan, recipe search and recipe switcher."" 
This reverts commit 391c45b8be.
 2022-02-25 10:43:34 +01:00
MaxJa4
391c45b8be Revert "Added some translations in meal plan, recipe search and recipe switcher." 
This reverts commit b2fa1db4f9.
 2022-02-24 20:53:52 +01:00
MaxJa4
b2fa1db4f9 Added some translations in meal plan, recipe search and recipe switcher. 2022-02-24 19:19:25 +01:00
vabene1111
bedbc255b3
Merge pull request #1574 from smilerz/export_from_filter 
fix serializer using food name instead of supermarket name
 2022-02-24 07:50:18 +01:00
smilerz
c8dcca8630
fix recipe search in export form (converted to change safe genericAPI) 2022-02-23 17:24:06 -06:00
Kaibu
05305c46ca shopping list mobile detail fix 2022-02-23 23:23:37 +01:00
Kaibu
6d5195f0d3 improved cookbook detail loading 2022-02-23 22:44:37 +01:00
smilerz
f9a4521ca1
redirect export using djangoResolveUrl 2022-02-22 16:00:55 -06:00
smilerz
a7d66fa850
export recipes from saved filter 2022-02-22 15:18:39 -06:00
smilerz
e52054e732
retain original text when parsing ingredients 2022-02-21 09:47:27 -06:00
vabene1111
c1605454dd only show create/import on search when not loading 2022-02-19 09:37:57 +01:00
vabene1111
b19ff3dca4 added import/create buttons to empty search 2022-02-19 09:16:54 +01:00
vabene1111
7fa5c2d987 changed defaults for multiple kw/book/food filters 2022-02-19 08:51:11 +01:00
dependabot[bot]
c1297285f3
Bump url-parse from 1.5.3 to 1.5.7 in /vue 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-19 07:39:44 +00:00
vabene1111
e081d823ed fix book share permission 2022-02-18 17:52:32 +01:00
vabene1111
d6fa02cc9e
Merge branch 'develop' into feature/custom_filters 2022-02-18 17:25:15 +01:00
smilerz
2b5aec5d0a
resolved loading custom filter when not in expert mode 2022-02-18 09:08:36 -06:00
smilerz
6b5a099ba0
removed case insensitive get_or_create for units 2022-02-17 12:49:41 -06:00
smilerz
1c18c8faac
fix expert mode 2022-02-17 10:59:53 -06:00
smilerz
f1fa5e32bf
fix case insensitive get_or_create 2022-02-17 10:50:38 -06:00
vabene1111
26a5c665de fixed instructions rendering next to ingredients on small devices 2022-02-17 15:30:08 +01:00
vabene1111
6a73ac0a33 fixed editor leave warning 2022-02-17 15:20:42 +01:00
vabene1111
e9431b5ff2 changed warning stylin 2022-02-17 14:53:27 +01:00
vabene1111
a54d08c9e2 Merge branch 'develop' into feature/custom_filters 2022-02-17 14:23:47 +01:00
vabene1111
d342e12363 show warning for multiple identical filter 2022-02-17 14:23:35 +01:00
florian hantke
d135c755c8 fix file path checks 2022-02-17 13:26:35 +01:00
vabene1111
3292c596ff Merge branch 'develop' into feature/custom_filters 
# Conflicts:
#	vue/src/components/MealPlanEditModal.vue
#	vue/src/locales/en.json
 2022-02-17 10:57: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
a76c4365ea
mealplan showing on search when filtered instead of vice versa 2022-02-16 16:49:36 -06: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
smilerz
f9ae48e23c
fix Vue cookedon sort 2022-02-15 09:14:27 -06:00
smilerz
4e8bbefc17
minor cleanup 2022-02-15 06:42:57 -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
smilerz
444e0c1918
include new filters in ResetSearch() 2022-02-14 15:35:56 -06:00
smilerz
8fa00b50b1
added update_at filter 2022-02-14 15:13:34 -06:00
smilerz
c2fa86e388
fixed typo 2022-02-13 14:35:38 -06:00