Commit Graph

489 Commits

Author SHA1 Message Date
smilerz
fb3473459d remove custom QueryParams with extend_schema decorator 2024-03-27 08:18:50 -05:00
vabene1111
79a7e60cfc Merge branch 'feature/vue3' of https://github.com/vabene1111/recipes into feature/vue3 2024-03-21 14:59:51 +01:00
vabene1111
8f03899302 Merge branch 'master' into feature/vue3 2024-03-21 14:54:25 +01:00
smilerz
b6f3ed6bd9 handle auto_onhand on bulkShoppingListEntry api 2024-03-19 09:12:31 -05:00
c0mputerguru
8ccd4b5045 Add drf-spectacular parameter/response schema for meal plan retrieve ical API 2024-03-18 17:41:12 +00:00
c0mputerguru
57314c56c8 Merge branch 'feature/vue3' into ical-default-dates-new-api 2024-03-18 09:34:25 -07:00
Anand Patel
ffe02bf210 Introduce ical action on MealPlanViewSet to expose ical format for listing meal plans. 2024-03-16 05:28:16 +00:00
vabene1111
e12c83faf1 working on select components 2024-03-15 22:38:52 +01:00
vabene1111
09dc35228f playing with generic select 2024-03-10 13:00:39 +01:00
vabene1111
75e3d826a0 Merge branch 'develop' into feature/vue3
# Conflicts:
#	.github/workflows/ci.yml
#	.gitignore
#	requirements.txt
2024-03-02 07:41:07 +01:00
vabene1111
1cac34d2a0 working search with flat endpoint 2024-02-29 20:08:37 +01:00
vabene1111
e47bdd043e drf spectacular 2024-02-29 16:34:13 +01:00
Anand Patel
0d56d8a836 Merge commit '23c58868dee75fbe7a082d4cc2113f8e3ea9a9b2' into ical-default-dates 2024-02-28 18:34:09 -08:00
c0mputerguru
23c58868de Allow tokens for getting ical 2024-02-28 18:03:50 -08: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
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
c15bd663cb Merge pull request #2874 from Mikhail5555/HomeAssistantConnector
Home assistant connector
2024-02-26 08:06:50 +01:00
vabene1111
3b2e75db1d playing with search 2024-02-25 17:10:40 +01:00
c0mputerguru
86b80a78d6 Allow non-specified to/from dates for ical. 2024-02-24 20:31:58 -08:00
vabene1111
59ecc40dc6 added comment field and a recipe filter to cook log 2024-02-24 13:18:08 +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
c8c8792ea8 remove ShoppingList model and tests 2024-02-20 17:09:18 -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
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
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
f085e7ff2f fixed merging issue 2024-02-18 21:35:16 +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
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
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
631af65cf3 Merge pull request #2810 from m7modSy/develop
Reorder books #2338
2024-02-16 19:53:38 +01:00
vabene1111
03c775d1cc added merge capabilities to supermarket category 2024-02-10 09:01:21 +01:00
vabene1111
dffb2d4eae fixed test 2024-02-06 14:42:14 +01:00
Mikhail Epifanov
247907ef25 move from signals to apps, add dedicated feature docs, add config toggle to menu item, undo unnecessary changes 2024-02-05 23:26:33 +01:00
vabene1111
4eafbddfdb fixed SLE api endpoint 2024-02-02 09:31:33 +01:00
vabene1111
bb1b1a40b6 fixed search on userfile and supermarket generic select 2024-02-01 20:00:51 +01:00
Mikhail Epifanov
8b5b063da6 Merge branch 'develop' into HomeAssistantConnector 2024-01-29 09:57:10 +01:00
vabene1111
77f81523d0 lmiit SLE endpoint and always fitler for recent days 2024-01-29 09:02:11 +01:00
Mikhail Epifanov
502a606534 Update the code based on feedback. set Default to enabled, add to documentation how to disable it. Add extra documentation 2024-01-28 22:59:51 +01:00
Mahmoud
d4fbc266a1 removing wrong import and deleting migrations 2024-01-28 14:04:50 +01:00