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

830 Commits

Author SHA1 Message Date
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
smilerz
3b8be24630
merge RecipeSearch with upstream 2022-02-13 14:15:01 -06:00
smilerz
e72f6e4ac4
Merge remote-tracking branch 'upstream/feature/custom_filters' into feature/custom_filters 2022-02-13 14:14:28 -06:00
smilerz
ef81700c05
add created filter, viewed filter and viewed sort 2022-02-13 14:07:43 -06:00
smilerz
bf54680178
more recipe search tests 2022-02-13 13:53:07 -06:00
vabene1111
f4bfcdab2e improved on explain and some tweaks 2022-02-11 14:15:46 +01:00
vabene1111
f320651cf8 Merge branch 'develop' into feature/custom_filters 2022-02-11 09:31:59 +01: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
vabene1111
32a8cc9a69 proof of concept for recipe search explain 2022-02-09 18:44:29 +01:00
smilerz
c2961eede4
stub out receip search tests 2022-02-08 20:23:49 -06: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
0e258a49fb
reload book recipes when adding filter 2022-02-08 12:30:11 -06:00
smilerz
b3a830c319
fix missing pill when loading CustomFilter 2022-02-08 11:41:57 -06:00
smilerz
62adc5a91f
make +/- search fields not clickable 2022-02-08 09:57:23 -06:00
smilerz
dc71260baa
Merge branch 'additional_fixes' into feature/custom_filters 2022-02-08 09:05:07 -06:00
smilerz
88b3ba1427
various fixes 2022-02-08 08:13:16 -06:00
vabene1111
4c5994ee7f Merge branch 'develop' into feature/custom_filters 
# Conflicts:
#	cookbook/serializer.py
#	cookbook/views/api.py
#	vue/src/utils/openapi/api.ts
 2022-02-07 18:56:19 +01:00
smilerz
d6af318c21
tests for single food reset inherit and additional inheritted fields 2022-02-07 09:16:48 -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