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
|
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
|
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
|
64ab768add
|
paginate cooklog and viewlog tables on history view
|
2024-02-23 07:23:10 -06: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
|
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
|
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 |
|
Patrick Magauran
|
cf190734b2
|
Switches to named GET Parameter for servings
|
2024-02-13 20:59:04 -05:00 |
|
vabene1111
|
03c775d1cc
|
added merge capabilities to supermarket category
|
2024-02-10 09:01:21 +01:00 |
|
Patrick Magauran
|
13f532a67b
|
Add serving size to recipe url so it loads with num
|
2024-02-06 22:21:37 -05: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 |
|
vabene1111
|
67f6e04680
|
Merge branch 'develop' into feature/shopping-ui
|
2024-01-28 08:32:31 +01:00 |
|
vabene1111
|
d10c70b797
|
fixed iCal endpoint
|
2024-01-28 08:21:57 +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
|
764cd7dba0
|
SLE bulk permission and tests
|
2024-01-17 22:32:34 +08:00 |
|
vabene1111
|
2697e42af7
|
added bulk api endpoint for SLE checking
|
2024-01-16 08:06:26 +08:00 |
|
vabene1111
|
31de43196a
|
Merge branch 'develop' into feature/shopping-ui
|
2024-01-15 07:57:09 +08:00 |
|
vabene1111
|
bb52f8902d
|
added max spaces per user + added custom app name + fixed theming tests
|
2024-01-15 07:41:51 +08:00 |
|
Mikhail Epifanov
|
245787b89e
|
make the connectors form be able to display all types for connectors
|
2024-01-14 17:03:02 +01:00 |
|
vabene1111
|
37c7a62853
|
Merge branch 'beta' into feature/shopping-ui
|
2024-01-14 08:40:24 +08:00 |
|
vabene1111
|
2ba2b97f9c
|
moved manifest to use main theming function
|
2024-01-14 08:40:05 +08:00 |
|