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 |
|
dalan
|
80c594d486
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
|
2024-02-15 03:19:57 +00:00 |
|
Patrick Magauran
|
cf190734b2
|
Switches to named GET Parameter for servings
|
2024-02-13 20:59:04 -05:00 |
|
Kirstin Seidel-Gebert
|
d7d34b2326
|
Translated using Weblate (German)
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2024-02-13 16:19:57 +00:00 |
|
vabene1111
|
0499745772
|
added captcha option to password reset form
|
2024-02-13 10:56:43 +01:00 |
|
Kirstin Seidel-Gebert
|
c45a88d048
|
Translated using Weblate (German)
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2024-02-12 12:19:57 +00:00 |
|
vabene1111
|
3f19d94d2f
|
Merge pull request #2937 from smilerz/automation_fix
regex replace not run on food if there are no food aliases
|
2024-02-11 09:31:15 +01:00 |
|
Jonan B
|
b5c3ef72ef
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (490 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
|
2024-02-10 12:20:02 +00: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 |
|
smilerz
|
dc7db75963
|
regex replace not run on food if there are no food aliases
|
2024-02-06 11:14:47 -06:00 |
|
vabene1111
|
dffb2d4eae
|
fixed test
|
2024-02-06 14:42:14 +01:00 |
|
vabene1111
|
08a2b4d0b2
|
formatted file
|
2024-02-06 14:10:36 +01:00 |
|
vabene1111
|
1a5881bb4b
|
Merge branch 'develop' into feature/shopping-ui
# Conflicts:
# cookbook/serializer.py
|
2024-02-05 15:59:56 +01:00 |
|
vabene1111
|
36c0fbffbe
|
fixed duplicate detection in migration 0200
|
2024-02-05 14:52:40 +01:00 |
|
vabene1111
|
febf3a3d86
|
removed flawed duplicate detection
|
2024-02-05 14:05:11 +01:00 |
|
vabene1111
|
7e39e6fea5
|
fixed meal type constraint
|
2024-02-05 13:52:52 +01:00 |
|
vabene1111
|
4eafbddfdb
|
fixed SLE api endpoint
|
2024-02-02 09:31:33 +01:00 |
|
vabene1111
|
010fb0112f
|
Merge branch 'develop' into feature/shopping-ui
|
2024-02-02 07:46:48 +01:00 |
|
vabene1111
|
bb1b1a40b6
|
fixed search on userfile and supermarket generic select
|
2024-02-01 20:00:51 +01:00 |
|
Lorenzo
|
199caff2a2
|
Translated using Weblate (Italian)
Currently translated at 93.0% (456 of 490 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
|
2024-02-01 17:22:53 +00:00 |
|
vabene1111
|
77f81523d0
|
lmiit SLE endpoint and always fitler for recent days
|
2024-01-29 09:02:11 +01:00 |
|
Mahmoud
|
d4fbc266a1
|
removing wrong import and deleting migrations
|
2024-01-28 14:04:50 +01:00 |
|
vabene1111
|
6e6af47d8c
|
fixed migration order
|
2024-01-28 11:06:38 +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
|
58989a96e3
|
added force theme
|
2024-01-28 09:22:37 +01:00 |
|
vabene1111
|
25c8f18b79
|
Merge pull request #2380 from RomRider/fix-1706
add: support to scale numbers/amounts in a recipe step
|
2024-01-28 09:18:19 +01:00 |
|
vabene1111
|
6b4b2a8f87
|
removed use_plural space attribute and left over settings
|
2024-01-28 08:42:42 +01:00 |
|
vabene1111
|
67f6e04680
|
Merge branch 'develop' into feature/shopping-ui
|
2024-01-28 08:32:31 +01:00 |
|
vabene1111
|
126e8a5a53
|
fixed FDC migration
|
2024-01-28 08:22:04 +01:00 |
|
vabene1111
|
d10c70b797
|
fixed iCal endpoint
|
2024-01-28 08:21:57 +01:00 |
|
vabene1111
|
8e4c8821dc
|
recipe list and detail modal background
|
2024-01-23 18:48:29 +01:00 |
|
vabene1111
|
f431e18336
|
fixed test
|
2024-01-23 18:03:31 +01:00 |
|
vabene1111
|
43aac60e9c
|
Merge branch 'develop' into feature/shopping-ui
|
2024-01-23 15:52:31 +01:00 |
|
tomtjes
|
570aefc9fa
|
add styles to base
|
2024-01-20 10:42:52 -05:00 |
|
vabene1111
|
7de9758ee1
|
auto sync proper data merging
|
2024-01-20 02:17:48 +08:00 |
|
vabene1111
|
764cd7dba0
|
SLE bulk permission and tests
|
2024-01-17 22:32:34 +08:00 |
|
vabene1111
|
dc81ca19b9
|
fixed old migrations in shopping tree
|
2024-01-16 08:06:37 +08:00 |
|
vabene1111
|
2697e42af7
|
added bulk api endpoint for SLE checking
|
2024-01-16 08:06:26 +08:00 |
|
tomtjes
|
36fd097ec5
|
Update base.html
|
2024-01-14 19:18:17 -05:00 |
|
vabene1111
|
40da2cee19
|
updated migration
|
2024-01-15 07:58:10 +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 |
|
vabene1111
|
35eff630ff
|
updated theming tests
|
2024-01-14 15:39:02 +08:00 |
|
vabene1111
|
8d90fada1d
|
fixed theming breaking for users without space
|
2024-01-14 15:33:14 +08: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 |
|
vabene1111
|
fd821c30c7
|
removed ingredient from shopping list entry API
|
2024-01-13 21:34:27 +08:00 |
|