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

2907 Commits

Author SHA1 Message Date
vabene1111
c9e0f40e88 fixed mealmaster regex 2024-02-26 16:29:04 +01:00
vabene1111
dc5de6f0a2 added migration and try/catch to apps.py 2024-02-26 16:13:19 +01:00
vabene1111
c15bd663cb
Merge pull request #2874 from Mikhail5555/HomeAssistantConnector 
Home assistant connector
 2024-02-26 08:06:50 +01:00
vabene1111
95fdf893f4
Merge pull request #2968 from smilerz/keywords_not_required 
change Recipe API to make keywords an optional field
 2024-02-26 08:01:25 +01:00
vabene1111
63f9d5c181
Merge pull request #2974 from smilerz/logging_api_paging 
paginate cooklog and viewlog tables on history view
 2024-02-26 07:56:00 +01:00
vabene1111
59ecc40dc6 added comment field and a recipe filter to cook log 2024-02-24 13:18:08 +01:00
vabene1111
ae70064c06 renamed ingredients_markdown and removed ingredients_vue 2024-02-24 13:05:23 +01:00
vabene1111
6de68707ed fixed missing servings get parameter breaking view in some cases 2024-02-24 11:16:09 +01:00
smilerz
64ab768add
paginate cooklog and viewlog tables on history view 2024-02-23 07:23:10 -06:00
smilerz
b1f418622f
change Recipe API to make keywords an optional field 2024-02-21 08:25:06 -06:00
Mikhail Epifanov
3e641e4d28
Merge remote-tracking branch 'origin/develop' into HomeAssistantConnector 
# Conflicts:
#	cookbook/forms.py
#	requirements.txt
 2024-02-20 09:18:19 +01:00
vabene1111
de80702e3f fixed property duplicate detection 2024-02-20 07:54:13 +01:00
vabene1111
04e0a6df4a Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop 2024-02-19 20:53:13 +01:00
vabene1111
b8cadf1faa fixed property editor fdc import 2024-02-19 20:53:07 +01:00
vabene1111
2b15a5e6be
Merge pull request #2956 from smilerz/openapi_types 
fixed openapi schema type int ==> integer
 2024-02-19 20:27:42 +01:00
vabene1111
fece7e9bd6 fixed food create 2024-02-19 19:57:56 +01:00
vabene1111
b109e28b0c almost all unit conversion working 2024-02-19 17:20:04 +01:00
smilerz
e766df947e
fixed openapi schema type int ==> integer 2024-02-19 07:34:32 -06:00
vabene1111
0725fb0f2b added management command to delete duplicate food properties 2024-02-19 13:07:34 +01:00
vabene1111
33ac00e294 improved importer functions unit and category 2024-02-19 09:41:45 +01:00
vabene1111
3a349b1bd2 use ID in unit food import 2024-02-18 21:38:52 +01:00
vabene1111
f085e7ff2f fixed merging issue 2024-02-18 21:35:16 +01:00
vabene1111
ac68fd30ae fixed two more import errors 2024-02-18 21:30:02 +01:00
vabene1111
7c1de82c8a what you get for not testing locally 2024-02-18 18:12:24 +01:00
vabene1111
7bc567ab95 name uniquness checking for food import 2024-02-18 18:01:59 +01:00
vabene1111
596ec9134e fixed title of space management page 2024-02-18 17:59:06 +01:00
vabene1111
bfb8c31329 fixed issue in open data importer 2024-02-18 17:51:01 +01:00
vabene1111
9e63c5321e fixed property calculation issues 
- don't count ingredients without amounts as missing properties
- don't fail when property_amount is null
 2024-02-18 17:45:56 +01:00
vabene1111
28479e96e9 improved property system to differentiate between unknown and zero 2024-02-18 11:26:16 +01:00
vabene1111
f57d2ca832 improved open data importer and fdc API 2024-02-18 08:50:50 +01:00
Andrea
d75c4ffaed Translated using Weblate (Italian) 
Currently translated at 93.0% (456 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2024-02-17 19:16:35 +00:00
vabene1111
4869f9596a fixerd serving size parsing in property importer 2024-02-17 11:08:21 +01:00
vabene1111
0989a58af5 fixed rezeptsuite importer 2024-02-17 10:52:08 +01:00
vabene1111
2f0b32f3c2 added help to importer page 2024-02-17 10:51:57 +01:00
vabene1111
9cf13e898c all types of unit conversion fixed 2024-02-17 10:10:09 +01:00
vabene1111
705fa18dd6 fixed open data property type and category 2024-02-17 08:43:41 +01:00
vabene1111
53e27d62e6 fixed open data import for units 2024-02-16 22:56:19 +01:00
vabene1111
ce32c20f67 fixed to space delete 2024-02-16 20:36:08 +01:00
vabene1111
3fd3c8ec12 recipe book entry order 2024-02-16 20:09:38 +01:00
Mikhail Epifanov
f50bf39e60
merge 2024-02-17 00:34:16 +05:30
Mikhail Epifanov
beb860acc6
Merge remote-tracking branch 'origin/develop' into HomeAssistantConnector 
# Conflicts:
#	cookbook/views/api.py
#	recipes/settings.py
 2024-02-17 00:29:29 +05:30
vabene1111
1883da5e49
Merge branch 'develop' into deprecate_settings_form 2024-02-16 19:58:31 +01:00
vabene1111
631af65cf3
Merge pull request #2810 from m7modSy/develop 
Reorder books #2338
 2024-02-16 19:53:38 +01:00
vabene1111
b99443cb30
Merge pull request #2938 from patmagauran/meal-plan-serving-size-link 
Add ability to open recipes with specified number of servings from meal plan
 2024-02-16 19:46:36 +01:00
smilerz
9506f2889a
deprecate unused forms 2024-02-16 09:21:27 -06:00
dalan
80c594d486 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (490 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
 2024-02-15 03:19:57 +00:00
Patrick Magauran
cf190734b2 Switches to named GET Parameter for servings 2024-02-13 20:59:04 -05:00
Kirstin Seidel-Gebert
d7d34b2326 Translated using Weblate (German) 
Currently translated at 100.0% (490 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2024-02-13 16:19:57 +00:00
vabene1111
0499745772 added captcha option to password reset form 2024-02-13 10:56:43 +01:00
Kirstin Seidel-Gebert
c45a88d048 Translated using Weblate (German) 
Currently translated at 100.0% (490 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2024-02-12 12:19:57 +00:00