mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 05:11:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,217 Commits 21 Branches 170 Tags
57314c56c850f62ab7a416be04126522dad4c4c4
Commit Graph

2969 Commits

Author SHA1 Message Date
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
05102d3842 Merge branch 'develop' into feature/vue3 2024-03-15 19:11:24 +01:00
vabene1111
2f203d7786 reverted api plan ical having optional parameters 2024-03-15 19:11:11 +01:00
Kn
658bc5ca54 Translated using Weblate (Swedish) 
Currently translated at 55.2% (268 of 485 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sv/
 2024-03-11 13:02:39 +00:00
vabene1111
09dc35228f playing with generic select 2024-03-10 13:00:39 +01:00
vabene1111
539eb8e612 make and compile all messages 2024-03-10 07:25:13 +01:00
Kn
5ecddaf02f Translated using Weblate (Finnish) 
Currently translated at 4.4% (22 of 493 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fi/
 2024-03-10 06:12:01 +00:00
Kn
7986d9c8f3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (371 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sv/
 2024-03-10 06:12:01 +00:00
vabene1111
312c215813 Merge branch 'develop' into feature/vue3 
# Conflicts:
#	cookbook/urls.py
 2024-03-09 14:34:44 +01:00
vabene1111
02523f5325 fixed duplicate operation ID for plan-ical endpoint 2024-03-09 12:54:49 +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
vabene1111
2264050d40 Merge pull request #3027 from richid/system-pg-version-fix 
bug: Fix decimal.InvalidOperation on /system for some PG versions
 2024-03-09 07:32:23 +01:00
Enric Bergadà
952d50d8dd Translated using Weblate (Catalan) 
Currently translated at 85.5% (419 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/ca/
 2024-03-08 23:19:56 +00: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
95583dbe2c editor improvements 2024-03-06 21:44:55 +01:00
Jocelin Lebreton
bfdd5a8bfc Translated using Weblate (French) 
Currently translated at 96.5% (473 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2024-03-05 22:19:58 +00:00
vabene1111
9fe3eeb823 Merge branch 'master' into feature/vue3 
# Conflicts:
#	requirements.txt
 2024-03-05 14:45:53 +01:00
vabene1111
56223df80b updated translations 2024-03-05 07:45:43 +01:00
M Ugur
88efe7ac8e Translated using Weblate (Turkish) 
Currently translated at 6.5% (32 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/tr/
 2024-03-03 23:19:58 +00:00
Jocelin Lebreton
be999c726b Translated using Weblate (French) 
Currently translated at 96.5% (473 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2024-03-03 23:19:58 +00: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
a57b8f6081 start page 2024-02-29 21:28:44 +01:00
vabene1111
1cac34d2a0 working search with flat endpoint 2024-02-29 20:08:37 +01:00
Anand Patel
7b506ff903 Remove unnecessary imports in meal plan ical test. 2024-02-29 16:13:17 +00:00
c0mputerguru
23a6efbb05 Merge branch 'TandoorRecipes:develop' into ical-default-dates 2024-02-29 08:07:21 -08:00
vabene1111
e47bdd043e drf spectacular 2024-02-29 16:34:13 +01:00
Anand Patel
49d3d6cbc2 Add tests for plan-ical 2024-02-29 04:35:25 +00:00
Anand Patel
0d56d8a836 Merge commit '23c58868dee75fbe7a082d4cc2113f8e3ea9a9b2' into ical-default-dates 2024-02-28 18:34:09 -08:00
M Ugur
e639ff9d77 Translated using Weblate (Turkish) 
Currently translated at 3.6% (18 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/tr/
 2024-02-29 02:19:57 +00:00
c0mputerguru
23c58868de Allow tokens for getting ical 2024-02-28 18:03:50 -08:00
vabene1111
b7533457de Merge branch 'develop' into feature/vue3 2024-02-28 20:21:15 +01:00
vabene1111
54c5655b85 SLE's dont need to belong to a shopping list 2024-02-28 20:21:03 +01:00
vabene1111
388a7ceb16 v3 update 2024-02-28 17:58:27 +01:00
vabene1111
6a7c3b472a Merge branch 'develop' into feature/vue3 
# Conflicts:
#	recipes/settings.py
 2024-02-28 17:25:14 +01:00
vabene1111
a02e9e806c fixed migration tree 2024-02-28 17:21:18 +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
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
Lukas Åteg
d71557dcec Translated using Weblate (Swedish) 
Currently translated at 100.0% (371 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sv/
 2024-02-27 12:19:58 +00: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
c9e0f40e88 fixed mealmaster regex 2024-02-26 16:29:04 +01:00
vabene1111
dc5de6f0a2 added migration and try/catch to apps.py 2024-02-26 16:13:19 +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