2932 Commits

Author	SHA1	Message	Date
vabene1111	6a7c3b472a	Merge branch 'develop' into feature/vue3 ... # Conflicts: # recipes/settings.py	2024-02-28 17:25:14 +01:00
vabene1111	a02e9e806c	fixed migration tree	2024-02-28 17:21:18 +01:00
vabene1111	7817ed2f7e	Merge branch 'develop' into feature/vue3 ... # Conflicts: # recipes/settings.py # vue/vue.config.js	2024-02-28 17:13:25 +01:00
vabene1111	7f6f579757	fixed imports again	2024-02-28 17:11:46 +01:00
vabene1111	1a31847223	Merge branch 'develop' into deprecate_old_code	2024-02-28 17:10:03 +01:00
vabene1111	9996d521f5	fixed imports	2024-02-28 17:02:33 +01:00
vabene1111	1e1399cfe9	Merge branch 'develop' into api_enhancements	2024-02-28 17:00:08 +01:00
Lukas Åteg	d71557dcec	Translated using Weblate (Swedish) ... Currently translated at 100.0% (371 of 371 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sv/	2024-02-27 12:19:58 +00:00
vabene1111	79c71bd5d9	saerch dialogh	2024-02-26 21:54:38 +01:00
vabene1111	0ddb013e94	Merge branch 'develop' into feature/vue3 ... # Conflicts: # requirements.txt	2024-02-26 16:32:28 +01:00
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	3b2e75db1d	playing with search	2024-02-25 17:10:40 +01:00
vabene1111	1e349214fe	Merge branch 'develop' into feature/vue3 ... # Conflicts: # .gitignore	2024-02-24 13:18:52 +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	1b8d501208	Merge branch 'develop' into feature/vue3	2024-02-24 11:16:55 +01:00
vabene1111	6de68707ed	fixed missing servings get parameter breaking view in some cases	2024-02-24 11:16:09 +01:00
smilerz	6224e38138	add filter for automation type on automation API	2024-02-23 13:27:59 -06:00
smilerz	0e8cac7ab9	paginated steps on GenericModelList ... paginate CustomFilter api and GenericModelList paginate Automation api and GenericModelList	2024-02-23 08:33:50 -06:00
smilerz	64ab768add	paginate cooklog and viewlog tables on history view	2024-02-23 07:23:10 -06:00
vabene1111	5587429475	some basic views	2024-02-21 20:18:54 +01:00
smilerz	b1f418622f	change Recipe API to make keywords an optional field	2024-02-21 08:25:06 -06:00
smilerz	23a7dc0ebf	remove django_autocomplete_light from requirements ... add back CreateRecipe view	2024-02-21 08:19:45 -06:00
smilerz	70e754eb37	remove unused delete and new forms	2024-02-20 17:56:55 -06:00
smilerz	ae9a78f2e1	remove commented out methods and functions	2024-02-20 17:47:23 -06:00
smilerz	a4849adb4c	remove recipebook and recipebookentry pages	2024-02-20 17:30:29 -06:00
smilerz	da9a2b4dc2	remove Supermarket view and template	2024-02-20 17:17:43 -06:00
smilerz	8f65ecfc18	remove dal autocomplete	2024-02-20 17:14:55 -06:00
smilerz	c8c8792ea8	remove ShoppingList model and tests	2024-02-20 17:09:18 -06:00
vabene1111	4972418dc5	basic app sceleton	2024-02-20 22:13:45 +01:00
vabene1111	1f39ed9d4e	first vue 3 commit	2024-02-20 20:11:51 +01: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