vabene1111
a6e8fa8ddf
Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop
2024-03-09 07:44:36 +01:00
vabene1111
37fb0418ac
fixed default page setting and made PWA respect that setting
2024-03-09 07:44:32 +01:00
Rich Schumacher
3489216daf
bug: Fix decimal.InvalidOperation on /system for some PG versions
...
In https://github.com/TandoorRecipes/recipes/pull/2730 the /system page was improved to warn the user if the version of Postgres they are using is out of date and should be updated. The current code attempts to determine the major versions by replacing `00` with `.` and then converting to a `Decimal`. Unfortunately, it appears the only value this method _does not_ work for are initial releases of major versions, like `16.0.0`.
For reference, either Postgres or the PsyCog driver represents the semver values but without the dots, so `16.0.0` becomes `1600000`.
This change removes the string replace and Decimal conversion in favor of using the divmod() function. In this application it will return a tuple with the first element being the major version of Postgres. This is then used as before to compare against deprecated versions.
2024-03-07 20:47:40 -05: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
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
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
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
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
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
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
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
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
