mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-02 12:49:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,706 Commits 21 Branches 170 Tags
e901c6708ca43e116392c32ddc8f1022f595891b
Commit Graph

2105 Commits

Author SHA1 Message Date
vabene1111
e901c6708c Merge branch 'develop' into feature/importer_to_vue 2022-03-15 13:02:10 +01:00
vabene1111
4cf8b72e3f removed OT from sle 2022-03-15 12:50:41 +01:00
vabene1111
96bd66f9e6 fixed telegram bot 2022-03-15 11:48:12 +01:00
vabene1111
92b536b32c check login remember by default 2022-03-10 16:10:33 +01:00
vabene1111
5627161c5e Merge branch 'develop' into feature/importer_to_vue 2022-03-10 15:27:11 +01:00
vabene1111
091fab154a improved openid and social auth pages 2022-03-10 15:24:13 +01:00
vabene1111
c6e11f6ef2 Merge pull request #1640 from CameronJGrant/develop 
Fixed typos and grammatical issues.
 2022-03-10 14:43:16 +01:00
Matthias Bilger
f040b491d4 Allow img tag (including width/height attribute) 
Allow using img tag in markdown and additionally allowing to specify
width and height attribute for elements.
 2022-03-10 11:38:08 +01:00
karawedi
8174da31e8 Translated using Weblate (German) 
Currently translated at 95.1% (535 of 562 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2022-03-09 18:31:44 +00:00
Cameron Grant
53518f4c47 Fixed typos and grammatical issues. 2022-03-08 12:12:20 -08:00
Felipe Castro
693d829946 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 3.0% (17 of 562 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pt_BR/
 2022-03-08 01:31:43 +00:00
Felipe Castro
332f518774 Added translation using Weblate (Portuguese (Brazil)) 2022-03-07 01:00:09 +00:00
Kaibu
aeb38cd2e9 Merge branch 'develop-weblate' into develop 
# Conflicts:
#	cookbook/locale/de/LC_MESSAGES/django.po
#	cookbook/locale/hu_HU/LC_MESSAGES/django.po
#	vue/src/locales/de.json
 2022-03-06 20:45:35 +01:00
Adrian M
17cf5f48a1 Translated using Weblate (Hungarian) 
Currently translated at 2.9% (17 of 568 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hu/
 2022-03-06 19:35:42 +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
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
vabene1111
e27a64f52c Merge pull request #1623 from gloriousDan/develop 
Improve recipe import for non schema.org recipes
 2022-03-04 14:28:34 +01:00
vabene1111
c6e36b802c Merge pull request #1617 from smilerz/fix_sqlite_search 
remove unaccent from sqlite search
 2022-03-04 14:26:32 +01:00
Daniel Schulz
cfcf354d59 Improve recipe import for non schema.org recipes 2022-03-03 23:47:50 +01:00
smilerz
08c1a8f2ab fix loading children in treeselect 2022-03-02 14:56:33 -06:00
smilerz
f2211da9bb remove unaccent from sqlite search 2022-03-02 09:42:10 -06:00
smilerz
d6db3fe65b missing prepTime assignment 2022-03-01 16:31:18 -06:00
vabene1111
55539c83c9 fixed supermarket category creation 2022-03-01 16:26:36 +01:00
MaxJa4
1e3a6fadf0 More localization of recipe search and view 2022-02-28 21:19:00 +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
vabene1111
028ee4a861 fixed file filter regex for importers 2022-02-27 11:37:12 +01:00
vabene1111
561c2106ce fixed nextcloud import first item 2022-02-27 11:27:23 +01:00
smilerz
56c553c35d load language_code to new shopping list 2022-02-25 13:52:56 -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
e824c9bff2 improved rezkonv parser 2022-02-25 15:51:37 +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
MaxJa4
95b63d882b Fixed member count in space settings. 2022-02-24 19:31:42 +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
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
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
smilerz
9b5a9b87e9 fix combined fulltext search and trigram generating error 2022-02-22 11:28:30 -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
c06c511dc9 changed unit default in ingredient parser to none 
because empty name units are not accepted by unit serializer but null values can be handled by the ingredient serializer (as a unit can be null)
 2022-02-21 15:35:36 +01:00