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
312c215813
Merge branch 'develop' into feature/vue3
...
# Conflicts:
# cookbook/urls.py
2024-03-09 14:34:44 +01:00
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
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
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
c0mputerguru
86b80a78d6
Allow non-specified to/from dates for ical.
2024-02-24 20:31:58 -08: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
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
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
