mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 04:39:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,689 Commits 21 Branches 170 Tags
7426bb4e7627fe32e91c16a049a6603f90479744
Commit Graph

886 Commits

Author SHA1 Message Date
vabene1111
7426bb4e76 auto import multiple urls 2022-03-10 17:35:11 +01:00
vabene1111
5627161c5e Merge branch 'develop' into feature/importer_to_vue 2022-03-10 15:27:11 +01:00
Felipe Castro
5ab11eb1bc Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 0.5% (2 of 378 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt_BR/
 2022-03-08 01:31:43 +00:00
Felipe Castro
ed33114947 Added translation using Weblate (Portuguese (Brazil)) 2022-03-07 00:56:04 +00:00
vabene1111
22ca482458 super very basics of manual mapping page working 2022-03-05 16:02:42 +01:00
vabene1111
2565ab30a4 lots of improvements and bookmarklet import working again 2022-03-05 15:16:58 +01:00
vabene1111
1caabef56a step functions 2022-03-04 16:54:59 +01:00
vabene1111
6d8fe3c162 wip 2022-03-04 15:54:11 +01:00
vabene1111
bdccdf0893 Merge branch 'develop' into feature/importer_to_vue 
# Conflicts:
#	cookbook/helper/recipe_url_import.py
 2022-03-04 14:33:59 +01:00
smilerz
2993c7e688 trigger shopping modal 2022-03-01 17:17:35 -06:00
vabene1111
8ea882e5b3 Merge branch 'develop' into improvement/multiselect_localization 2022-03-01 15:55:27 +01:00
vabene1111
65432895ba Merge branch 'develop' into improvement/minor_translation_fixes 2022-03-01 15:54:44 +01:00
vabene1111
b730acc06a Merge pull request #1596 from MaxJa4/improvement/select_amount 
Auto selects amount of ingredient when adding new ingredient.
 2022-03-01 15:52:10 +01:00
MaxJa4
cebd47a639 Fixed json format after merge 2022-02-28 21:21:06 +01:00
MaxJa4
1e3a6fadf0 More localization of recipe search and view 2022-02-28 21:19:00 +01:00
MaxJa4
47723673d0 Multiselect controls are now fully localized in RecipeEditView 2022-02-28 20:28:41 +01:00
MaxJa4
429d381f63 Auto selects amount of ingredient when adding new ingredient. 2022-02-28 19:43:37 +01:00
MaxJa4
b393d026f7 Added a few more strings to be localized and fixed one ui alignment 2022-02-27 22:40:03 +01:00
MaxJa4
09804de809 Optimized advanced search settings UX 2022-02-27 21:53:22 +01:00
vabene1111
089e634d69 fixed mobile emoji select 2022-02-27 11:39:24 +01:00
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
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
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
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
vabene1111
52c16ab7dd all types bascially working (lacking bookmark) 2022-02-22 17:00:30 +01:00
vabene1111
0d98c77301 some small ui stuff 2022-02-21 18:29:23 +01:00
smilerz
e52054e732 retain original text when parsing ingredients 2022-02-21 09:47:27 -06:00
vabene1111
e04d672750 import with image working 2022-02-21 15:59:30 +01:00
vabene1111
c8fc67fa2b changed source import to match field structure of recipe model 
first imports working
 2022-02-19 17:54:00 +01:00
vabene1111
89348f69f1 basics of new import page 2022-02-19 16:55:17 +01:00
vabene1111
c1605454dd only show create/import on search when not loading 2022-02-19 09:37:57 +01:00
vabene1111
55b035eaaa first boilerplate for new import view 2022-02-19 09:34:42 +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