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,590 Commits 21 Branches 170 Tags
429607e1fe9ca0e4684a22aff36e358b598bd273
Commit Graph

3590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
429607e1fe fixed shoppoing v2 list container size 2022-02-27 11:07:06 +01:00
vabene1111
802242f54e Merge pull request #1586 from smilerz/genericmodal_translations 
fix translations in helper libraries models.js and utils.js
 2022-02-27 09:50:37 +01:00
vabene1111
cd58b6681b Merge pull request #1588 from TandoorRecipes/dependabot/npm_and_yarn/vue/url-parse-1.5.10 
Bump url-parse from 1.5.7 to 1.5.10 in /vue
 2022-02-26 17:37:00 +01:00
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
vabene1111
03e32dba90 Merge pull request #1587 from TandoorRecipes/dependabot/npm_and_yarn/vue/prismjs-1.27.0 
Bump prismjs from 1.25.0 to 1.27.0 in /vue
 2022-02-26 10:30:09 +01: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
smilerz
56c553c35d load language_code to new shopping list 2022-02-25 13:52:56 -06:00
smilerz
dae49ec5f3 fix translations in helper libraries models.js and utils.js 2022-02-25 13:16:34 -06:00
vabene1111
90d477a0fd small change to be able to retain large texts 2022-02-25 16:19:49 +01: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
vabene1111
425a38f030 Merge pull request #1584 from smilerz/fix_duplicate_entry 
return distinct shopping entries
 2022-02-25 16:15:41 +01:00
vabene1111
d94e0523b0 Merge pull request #1582 from MaxJa4/fix/member_count 
[PR cleanup] Add translations as in #1580
 2022-02-25 15:52:09 +01:00
vabene1111
e824c9bff2 improved rezkonv parser 2022-02-25 15:51:37 +01:00
vabene1111
38ad246dc1 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2022-02-25 15:51:28 +01:00
vabene1111
1bde4e81b7 fixed duplicate returns from tree manager get or create 2022-02-25 15:42:33 +01:00
smilerz
18e53aa03f return distinct shopping entries 2022-02-25 07:59:20 -06:00
vabene1111
e0b9b9caa2 Merge pull request #1583 from TandoorRecipes/expanded-contributors 
Update CONTRIBUTERS.md
 2022-02-25 14:49:08 +01:00
smilerz
25db5946bf Update CONTRIBUTERS.md 2022-02-25 07:47:36 -06: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
vabene1111
581f950e33 Merge pull request #1578 from smilerz/remove_stale_requirements 
remove stale requirements
 2022-02-25 08:01:24 +01:00
vabene1111
97eadfc39a Merge pull request #1577 from smilerz/email_confrm_ignores_ScriptName 
fix bad redirect after email confirmation when using script_name
 2022-02-25 08:00:47 +01:00
vabene1111
f7a3e2371a Merge pull request #1581 from MaxJa4/fix/member_count 
Fix member count in space settings
 2022-02-25 07:58:10 +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
95b63d882b Fixed member count in space settings. 2022-02-24 19:31:42 +01:00
MaxJa4
b2fa1db4f9 Added some translations in meal plan, recipe search and recipe switcher. 2022-02-24 19:19:25 +01:00
smilerz
3b0b756a30 remove stale requirements 2022-02-24 09:58:14 -06:00
smilerz
896be70a77 fix bad redirect after email confirmation when using script_name 2022-02-24 09:03:29 -06: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
abeeac838b fix serializer using food name instead of supermarket name 2022-02-23 14:31:43 -06:00
vabene1111
f2c543ac15 Merge pull request #1572 from smilerz/export_from_filter 
Export from filter
 2022-02-23 17:59:19 +01:00
smilerz
081edfd2d6 fix errors on Tandoor recipe import 2022-02-22 16:33:09 -06: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
vabene1111
b9597a3333 fixed keyword names including labels during import 2022-02-22 21:21:25 +01:00
vabene1111
5424702dff Merge pull request #1570 from smilerz/trigram_fullltext_fix 
fix combined fulltext search and trigram generating error
 2022-02-22 21:17:35 +01:00
smilerz
9b5a9b87e9 fix combined fulltext search and trigram generating error 2022-02-22 11:28:30 -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
8361f4f692 Merge branch 'feature/custom_filters' into develop 
# Conflicts:
#	cookbook/helper/recipe_search.py
 2022-02-19 08:54:14 +01:00
vabene1111
1b6863683f rename to prevent shadowing 2022-02-19 08:53:25 +01:00
vabene1111
7fa5c2d987 changed defaults for multiple kw/book/food filters 2022-02-19 08:51:11 +01:00
smilerz
3b08b1406f filters are automatically shared when part of shared book 2022-02-19 08:51:11 +01:00
smilerz
6dddcadf41 calculate child/sibling subsitutes correctly 2022-02-19 08:50:55 +01:00
vabene1111
a843f94ea1 Merge pull request #1560 from TandoorRecipes/dependabot/npm_and_yarn/vue/url-parse-1.5.7 
Bump url-parse from 1.5.3 to 1.5.7 in /vue
 2022-02-19 08:42:55 +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
43252a941b Merge pull request #1558 from smilerz/better_get_minutes 
handle fractions and decimals in get_minutes() during import
 2022-02-19 08:39:00 +01:00