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
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
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
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
vabene1111
f9bfb8e258
added custom logo to space manage view
2024-01-07 08:12:20 +08:00
vabene1111
146e97c8ec
Merge branch 'develop' into feature/shopping-ui
...
# Conflicts:
# vue/src/locales/en.json
2024-01-03 15:09:30 +01:00
AquaticLava
200cacb9ac
changed keywords to be index based.
2024-01-02 18:44:23 -07:00
vabene1111
3d8b1d6ccb
lots of theming related changes
...
- upload a custom logo for your space
- space settings can override user settings for theming
- spaces can upload custom CSS overrides
- allow users to disable showing the tandoor/space logo
- allow changing navigation background color to any color desired
- allow switching navigation text color between dark/light (different effects depending on theme)
2024-01-01 22:14:01 +01:00
vabene1111
c76f5d9482
starting work on new sync algorithm
2024-01-01 12:01:39 +01:00
Mahmoud
42839a5886
Manual order: you can now change the order by dragging and dropping
2023-12-25 19:44:23 +01:00
vabene1111
f65597c391
basic nocer ui, nothing really working
2023-12-22 11:40:17 +01:00
vabene1111
f3e11e6358
fixed and improvements to property editor
2023-12-02 20:14:12 +01:00
vabene1111
3054297357
improved error handling and fixed meal plan api
2023-12-02 18:11:09 +01:00
vabene1111
a3a2433d2a
made to_date field optional in meal plan api
2023-12-02 16:29:37 +01:00
vabene1111
9c74730461
added first draft of property editor
2023-11-27 22:20:09 +01:00
vabene1111
e746b44f3b
Merge pull request #2632 from smilerz/unique_name
...
updates to multiple models uniqueness capabilities
2023-10-05 18:57:08 +02:00
smilerz
a7795092b3
make 'name' unique in space for MealType
...
make MealType, Unit, Supermarket, Supermarket Category, PropoertyType
case insenstive for get_or_create
convert unit conversion create serializer to get_or_create behavior
enable create duplicate tests for unitconversion and mealtype api
2023-09-14 14:46:37 -05:00
smilerz
538fb8b42e
remove unused imports, vairables and commented code
...
from views, and base cookbook and recipes modules
2023-09-13 13:31:53 -05:00
smilerz
1f0cd58d7d
remove unused imports, variables and commented code
...
from tests
2023-09-13 13:08:26 -05:00
smilerz
1b97472368
Squashed commit of the following:
...
commit 52909e8117
Author: smilerz <smilerz@gmail.com>
Date: Wed Sep 6 15:54:23 2023 -0500
fix recipe counting issue on extended mixin
2023-09-12 09:48:41 -05:00
vabene1111
3f63eab68c
Merge branch 'develop' into remove_facets
2023-09-12 15:36:14 +02:00
vabene1111
94f398a7f6
added multi day meal planning
2023-09-08 15:31:42 +02:00
smilerz
9ee4be621b
remove facets and treeselect
2023-09-07 13:20:51 -05:00
vabene1111
4ffc9cc72f
removed icons
2023-08-29 15:58:57 +02:00
vabene1111
92d648c3a3
added ability to order property types
2023-08-24 12:50:17 +02:00
vabene1111
2f0929e90e
Merge pull request #2539 from srwareham/hide-step-ingredients
...
Added option: Hide step ingredients
2023-08-24 10:33:57 +02:00
srwareham
6785033a21
Add step-level configuration whether an ingredients table should be shown. User-level default added to settings
2023-08-23 21:46:09 -07:00
vabene1111
f07dec6062
Merge pull request #2468 from AquaticLava/Auto-Planner
...
Auto meal plan
2023-08-16 06:18:43 +02:00
AquaticLava
ecd828008e
added auto shopping functionality. fixed bug when there are no matching recipes
2023-08-01 21:52:59 -06:00
vabene1111
b30f8c245e
added option to set URL on food
2023-07-22 09:12:45 +02:00
vabene1111
1f10a66c74
added base unit to unit editor
2023-07-18 13:54:35 +02:00