Commit Graph

398 Commits

Author SHA1 Message Date
vabene1111
7397f4c381 space settings and file dialog 2024-08-20 15:17:06 +02:00
vabene1111
4ba769a49e updated space api endpoint to list all spaces + addtional /current/ endpoint 2024-08-20 13:49:12 +02:00
vabene1111
516b345807 settings page WIP 2024-08-04 16:59:56 +02:00
vabene1111
6a8b2b6338 playing with AI image recognition 2024-05-18 14:29:42 +02:00
smilerz
5f4283ca3f update MealPlan queryset filtering to use dates instead of datetime 2024-05-01 12:03:10 -05:00
vabene1111
17693b90b5 Merge branch 'develop' into feature/vue3 2024-05-01 13:45:37 +02:00
vabene1111
4b551c595a MealPlan from/to date to datetime, added time to MealType 2024-05-01 13:45:12 +02:00
smilerz
dd3f38fe75 Merge remote-tracking branch 'upstream/feature/vue3' into feature/vue3 2024-04-23 09:47:09 -05:00
smilerz
2847721584 update tests to reflect pagination and API changes 2024-04-23 09:18:48 -05:00
smilerz
fd0d5813fb update SpaceFilterSerializer to handle both lists and QuerySets 2024-04-19 09:00:19 -05:00
smilerz
8cd79cdc20 update SpaceFilterSerializer to reflect paginated ViewSets provide
a list instead of a queryset
2024-04-19 08:37:27 -05:00
smilerz
d3abe4db3e updated tests to reflect API changes in pagination 2024-04-19 07:43:29 -05:00
smilerz
f312f6028d ensure that all schema fields are typed correctly 2024-04-18 10:54:45 -05:00
vabene1111
dfd9f7b066 posprocessing hook for DRF 2024-03-30 11:01:37 +01:00
smilerz
0f5d37fc7c apply PK only update to NestedWritableSerializer 2024-03-27 08:38:36 -05:00
vabene1111
77a46a4ef6 working on select components 2024-03-27 08:37:01 -05:00
vabene1111
418821d8d3 saerch dialogh 2024-03-27 08:34:49 -05:00
vabene1111
92b7439969 some basic views 2024-03-27 08:34:19 -05:00
smilerz
d6929e5cf9 apply PK only update to NestedWritableSerializer 2024-03-27 08:17:20 -05:00
vabene1111
e12c83faf1 working on select components 2024-03-15 22:38:52 +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
1a31847223 Merge branch 'develop' into deprecate_old_code 2024-02-28 17:10:03 +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
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
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
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
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
28479e96e9 improved property system to differentiate between unknown and zero 2024-02-18 11:26:16 +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
Mikhail Epifanov
513082255b Merge branch 'develop' into HomeAssistantConnector 2024-02-05 16:09:47 +01:00
vabene1111
1a5881bb4b Merge branch 'develop' into feature/shopping-ui
# Conflicts:
#	cookbook/serializer.py
2024-02-05 15:59:56 +01:00
vabene1111
7e39e6fea5 fixed meal type constraint 2024-02-05 13:52:52 +01:00
Mikhail Epifanov
8b5b063da6 Merge branch 'develop' into HomeAssistantConnector 2024-01-29 09:57:10 +01:00
vabene1111
3e51bdc7f0 Merge branch 'develop' into feature/shopping-ui
# Conflicts:
#	cookbook/serializer.py
2024-01-28 11:05:56 +01:00
vabene1111
5001d05df2 removed use plurarl from space serializer 2024-01-28 11:05:31 +01:00
vabene1111
7de9758ee1 auto sync proper data merging 2024-01-20 02:17:48 +08:00
Mikhail Epifanov
5f9d59317b Merge branch 'develop' into HomeAssistantConnector 2024-01-17 22:55:21 +01:00
Mikhail Epifanov
409c0295ec convert example & homeassistant specific configs to a generic with all optional fields 2024-01-17 22:40:44 +01:00
vabene1111
2697e42af7 added bulk api endpoint for SLE checking 2024-01-16 08:06:26 +08:00
vabene1111
fd821c30c7 removed ingredient from shopping list entry API 2024-01-13 21:34:27 +08:00
Mikhail Epifanov
a61f79507b add enabled field 2024-01-11 23:11:04 +01:00
Mikhail Epifanov
e5f0c19cdc Add ConnectorManager component which allows for Connectors to listen to triggers and do actions on them. Also add HomeAssistantConfig which stores the configuration for the HomeAssistantConnector 2024-01-11 22:13:20 +01:00
vabene1111
a5135de50b Merge branch 'develop' into feature/shopping-ui
# Conflicts:
#	cookbook/models.py
#	vue/src/locales/en.json
2024-01-08 06:45:56 +08:00