Commit Graph

6923 Commits

Author SHA1 Message Date
vabene1111
00ae511076 various meal plan fixes 2025-01-02 09:21:52 +01:00
vabene1111
f97d8ffdfd shopping load with pagination 2025-01-01 13:44:07 +01:00
vabene1111
34f337290c fixed comment 2025-01-01 10:07:49 +01:00
vabene1111
8159838fc3 warn before leaving model edit page 2025-01-01 10:07:27 +01:00
vabene1111
60f2494eae allow router back while snackbar is running 2025-01-01 08:56:29 +01:00
vabene1111
303f999b74 test include async results in global search 2025-01-01 08:51:34 +01:00
vabene1111
f83daf154f removed tests for no longer existing signal 2025-01-01 08:22:49 +01:00
vabene1111
55ee75fed1 ingredient checkboxes and table style 2024-12-31 16:44:10 +01:00
vabene1111
846a4796e2 recipe view as model chain and ingredient checkbox 2024-12-31 15:23:44 +01:00
vabene1111
545c464f4f very very basic merge dialog working 2024-12-30 18:43:10 +01:00
vabene1111
fabf0c28e3 WIP merge button 2024-12-30 17:07:38 +01:00
vabene1111
e219f7e07c fixed SLE create 2024-12-30 14:49:34 +01:00
vabene1111
830ce14c65 Merge branch 'develop' into feature/vue3
# Conflicts:
#	.gitignore
#	recipes/settings.py
2024-12-30 14:48:10 +01:00
vabene1111
fd4236672e update gitignore like vue3 branch 2024-12-29 13:46:17 +01:00
vabene1111
00148a2993 made shopping list compatible with SLR entries without a recipe 2024-12-29 13:44:43 +01:00
vabene1111
359fcb24cf fixed social signup form 2024-12-29 13:42:12 +01:00
vabene1111
c1bfa563a3 shopping from meal plan edit 2024-12-28 23:26:22 +01:00
vabene1111
bf4fc9a7aa basic shopping view in MealPlanEditor 2024-12-28 21:56:54 +01:00
vabene1111
4312b5ad65 mobile ingredient edit improvements 2024-12-28 18:36:26 +01:00
vabene1111
6fc078090a improved shopping 2024-12-28 15:24:07 +01:00
vabene1111
a4548abc19 shopping line item number formatting 2024-12-28 15:13:37 +01:00
vabene1111
1a39066b45 Revert "removed more unused stuff"
This reverts commit a0ac379b3c.
2024-12-28 15:11:34 +01:00
vabene1111
9cf1435130 Revert "removed dependency from settings"
This reverts commit f5cb393138.
2024-12-28 15:11:30 +01:00
vabene1111
e895bda80b Revert "remove unneeded dependencies"
This reverts commit b93f8e5e95.
2024-12-28 15:11:27 +01:00
vabene1111
882f18ac29 open edit page after model creation 2024-12-28 15:09:07 +01:00
vabene1111
ebfe5eee6d re added for now 2024-12-28 14:50:54 +01:00
vabene1111
afac08dc01 remove dependency import 2024-12-28 14:45:58 +01:00
vabene1111
a0ac379b3c removed more unused stuff 2024-12-28 14:41:00 +01:00
vabene1111
f5cb393138 removed dependency from settings 2024-12-28 14:33:06 +01:00
vabene1111
b93f8e5e95 remove unneeded dependencies 2024-12-28 14:17:31 +01:00
vabene1111
38c8e1b84f display external recipes 2024-12-28 14:15:44 +01:00
vabene1111
275c879e62 search and recipe improvements 2024-12-28 13:05:48 +01:00
vabene1111
cde632241b meal plan and recipe editor improvements 2024-12-28 12:55:20 +01:00
vabene1111
ea1e47e579 Merge branch 'develop' into feature/vue3 2024-12-28 11:23:12 +01:00
vabene1111
07b399cd80 ignore build staticfiles gitignore 2024-12-28 08:35:28 +01:00
vabene1111
ed20cf3df4 ignore build staticfiles 2024-12-28 08:35:19 +01:00
vabene1111
f5d7919f72 Merge pull request #3448 from igorsantos07/patch-1
Update system.html: Django Recipes > Tandoor
2024-12-28 08:26:53 +01:00
vabene1111
86c4278553 Merge pull request #3454 from TandoorRecipes/dependabot/pip/jinja2-3.1.5
Bump jinja2 from 3.1.4 to 3.1.5
2024-12-28 08:26:44 +01:00
dependabot[bot]
2a5c0bb740 Bump jinja2 from 3.1.4 to 3.1.5
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/3.1.4...3.1.5)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-12-28 07:25:33 +00:00
Igor Santos
432dfa9e86 Update system.html: Django Recipes > Tandoor 2024-12-24 02:28:21 -03:00
vabene1111
8a4e32f05e disable templating for now 2024-12-23 15:18:55 +01:00
vabene1111
5a8b4fb4ce minor tweaks 2024-12-23 14:49:07 +01:00
vabene1111
65034e523f fixed global search dialog manual select 2024-12-23 14:43:34 +01:00
vabene1111
0c6637406a layout fixes 2024-12-23 14:10:38 +01:00
vabene1111
4b0d022db1 meal plan tweaks 2024-12-23 13:53:44 +01:00
vabene1111
7a2b3c2d2e some styling stuff 2024-12-23 12:28:42 +01:00
vabene1111
205eae785e working add to shopping dialog 2024-12-23 12:07:28 +01:00
vabene1111
e0223e0c5c wip shopping dialog 2024-12-22 18:36:56 +01:00
vabene1111
d611391bea recipe context actions 2024-12-22 17:18:47 +01:00
vabene1111
0c547353cd add to shopping from meal plan editor 2024-12-22 15:36:58 +01:00