cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,722 Commits 2 Branches 0 Tags 57 MiB
b0ca2ff228
Commit Graph

5722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vabene1111
f861b39d05
Merge pull request #2833 from luc-ass/develop 
Fix truenas_portainer compose example/documentation
 2024-01-01 14:55:28 +01:00
vabene1111
5c18c09944
Merge branch 'develop' into develop 2024-01-01 14:55:21 +01:00
vabene1111
1bd5f96029
Merge pull request #2792 from Sriyukthika26/my-contribution 
Update truenas_portainer.md
 2024-01-01 14:53:47 +01:00
vabene1111
988df4eb00
Merge pull request #2823 from smilerz/admin_updates 
Admin updates
 2024-01-01 14:53:01 +01:00
vabene1111
bf61b6474e fixed ingredient note field to high 2024-01-01 14:51:20 +01:00
dependabot[bot]
bace2f7ba4
Bump github/codeql-action from 2 to 3 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-01 00:44:38 +00:00
dependabot[bot]
0576337e9c
Bump pillow from 10.0.1 to 10.1.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.0.1...10.1.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-01 00:37:18 +00:00
AquaticLava
be177cf258 Merge remote-tracking branch 'origin/Auto-Planner' into Auto-Planner 2023-12-31 11:20:06 -07:00
Jaan
5059abc232 Translated using Weblate (Russian) 
Currently translated at 63.4% (344 of 542 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ru/
 2023-12-30 15:19:57 +00:00
smilerz
cb63bb2615
avoid recursion in ingredient.__str__ 2023-12-28 10:44:51 -06:00
smilerz
7ca5a34b28
fixed recursion in Step.__str__() 2023-12-28 10:00:15 -06:00
Lucas Gasenzer
a7ea7a8987
fix code block and replace tab with spaces 2023-12-27 10:43:56 +01:00
vabene1111
8d7b4f614c improved mobile shopping entry adding layout 2023-12-22 09:25:30 +01:00
vabene1111
df67d3ce7b improved shopping context dark theme 2023-12-22 09:25:18 +01:00
vabene1111
54119ed1ec Merge branch 'develop' into beta 2023-12-22 08:38:25 +01:00
smilerz
26f694576a
update __str__() on Step and Ingredient models 2023-12-20 15:55:02 -06:00
smilerz
7a5b744ff0
order recipes in admin 2023-12-20 15:49:54 -06:00
smilerz
4058c997de
updates to admin pages 2023-12-20 15:46:28 -06:00
smilerz
089677d799
add rating to recipe card 2023-12-20 13:51:04 -06:00
vabene1111
4de9be5c89
Merge pull request #2808 from smilerz/add_mealtype_filter 
add ability to filter meal plans based on type
 2023-12-20 15:55:09 +01:00
vabene1111
34ee03b720
Merge pull request #2818 from smilerz/modal_updates 
Modal updates
 2023-12-20 15:51:24 +01:00
smilerz
48dacf46c3
updated RecipeSwitcher with new MealPlan API format 2023-12-19 16:50:32 -06:00
smilerz
181c270b34
added substitute children to food edit modal 2023-12-19 15:22:26 -06:00
smilerz
e89c3887ec
remove reference to facets on Space page 2023-12-19 15:09:18 -06:00
smilerz
99cd9bfb5b
update meal_type filter on MealPlan to be a list 2023-12-19 12:59:24 -06:00
smilerz
8bbccad7a9
updated API correclty this time 2023-12-19 12:59:24 -06:00
smilerz
a59a78f44c
update meal-plan API on MealPlanStore 2023-12-19 12:59:24 -06:00
smilerz
205bf5253d
add ability to filter meal plans based on type 2023-12-19 12:59:19 -06:00
vabene1111
0fed6b9fb3 added migration status to system page 2023-12-16 14:03:32 +01:00
vabene1111
dd3e91e10d added ability to set rate limiting for url import 2023-12-16 09:19:12 +01:00
vabene1111
76b84898f6 lmit ingredient parser to 512 characters to prevent too complex computations 2023-12-16 09:08:50 +01:00
vabene1111
05d971835f autoamtically keep meal plan to date relative to from date 2023-12-16 08:40:20 +01:00
vabene1111
0a814fa896 dont hide ingredients in edit when hiding them in view 2023-12-16 08:18:05 +01:00
vabene1111
05ba11a48e Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop 2023-12-16 08:09:22 +01:00
vabene1111
6a7a22626e use commit hash as version number if not on a tagged release 2023-12-16 08:09:18 +01:00
vabene1111
1635a3a335
Merge pull request #2794 from TyreceDJ/mobileCalender/sort 
Sorted by current day in meal plan
 2023-12-16 07:57:18 +01:00
vabene1111
1d84e7851b
Merge pull request #2706 from ambroisie/bump-allauth 
Bump django-allauth from 0.54.0 to 0.58.1
 2023-12-16 07:54:08 +01:00
vabene1111
44d1cc3a30
Merge pull request #2802 from smilerz/automation_fixes 
kw automation not applying during url import
 2023-12-16 07:48:49 +01:00
vabene1111
04b4f552f8 comment out orphaned files 2023-12-16 07:40:09 +01:00
vabene1111
6214176fe5
Merge pull request #2730 from smilerz/orphan_file_cleanup 
view and delete orphaned files
 2023-12-16 07:36:08 +01:00
vabene1111
205dc11125 changed raspi docs 2023-12-16 07:30:39 +01:00
smilerz
ba5112e138
kw automation not applying during url import 2023-12-12 13:49:23 -06:00
Khuslen Misheel
0e34cc72d5 Proper fix for Calendar 2023-12-10 13:46:55 -05:00
Khuslen Misheel
31c6defc93 Only fixed current day in meal plan 2023-12-10 13:44:01 -05:00
vabene1111
d4c544bb4b partially working replace logic 2023-12-10 16:32:12 +01:00
vabene1111
2b05efeff6 Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop 2023-12-10 16:03:18 +01:00
vabene1111
d7ddcd3214 playing around with codemirror 2023-12-10 16:03:14 +01:00
Robin Wilmet
29133f4236 Translated using Weblate (French) 
Currently translated at 96.1% (521 of 542 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2023-12-10 14:19:57 +00:00
Robin Wilmet
b440b09be5 Translated using Weblate (French) 
Currently translated at 93.0% (456 of 490 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2023-12-10 14:19:57 +00:00
smilerz
ed1f656167
fix version information on system page 2023-12-10 07:54:44 -06:00