Commit Graph

198 Commits

Author SHA1 Message Date
smilerz
79b4bc387e change ingore_inherit to inherit_fields 2021-12-30 12:54:39 -06:00
smilerz
3fafd43e58 merge ignore shopping with onhand 2021-12-29 16:32:19 -06:00
smilerz
ab968f225b test recent shopping list 2021-12-28 12:03:34 -06:00
smilerz
2af7b64d4f visual indicator meal plan in shopping 2021-12-28 12:03:34 -06:00
smilerz
24b0643765 copy shopping as markdown 2021-12-28 12:03:34 -06:00
smilerz
df54b10610 download as CSV 2021-12-28 12:03:33 -06:00
smilerz
fdd86b0c2d download shopping list PDF 2021-12-28 12:03:33 -06:00
smilerz
cae3773d5a Fix after rebase 2021-12-28 12:03:33 -06:00
smilerz
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00
smilerz
dcfe4de61f Fix after rebase 2021-12-28 12:03:32 -06:00
smilerz
a217db5822 add new unit/food from shopping list 2021-12-28 12:03:32 -06:00
smilerz
6e9d609fe0 edit supermarket categories 2021-12-28 12:03:32 -06:00
smilerz
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
smilerz
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
smilerz
2d01a2af47 implemented quick switch 2021-12-22 14:43:00 -06:00
smilerz
0866d21fa5 test recent shopping list 2021-12-15 12:37:40 -06:00
smilerz
c2e84c1fa4 visual indicator meal plan in shopping 2021-12-15 12:37:04 -06:00
smilerz
ca93920f04 copy shopping as markdown 2021-12-15 12:37:04 -06:00
smilerz
903a721a1d download as CSV 2021-12-15 12:37:04 -06:00
smilerz
2d7d160d1b download shopping list PDF 2021-12-15 12:37:03 -06:00
smilerz
7c0d1236c2 Fix after rebase 2021-12-15 12:37:03 -06:00
smilerz
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
smilerz
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
smilerz
867e2d4fbf add new unit/food from shopping list 2021-12-15 12:36:06 -06:00
smilerz
757fa5e49c edit supermarket categories 2021-12-15 12:36:06 -06:00
smilerz
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
smilerz
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
vabene1111
4d2e7eadb6 Merge branch 'develop' into generic_modal_v2 2021-11-30 17:23:27 +01:00
smilerz
55a0304700 add search debug 2021-11-24 12:10:15 -06:00
smilerz
5b6dd62f8e generic modal refactored 2021-11-23 19:18:10 -06:00
Kaibu
dd5509f5b4 translating new mealtypes 2021-11-03 23:55:39 +01:00
Kaibu
2215e06506 translation fixes 2021-11-03 21:34:18 +01:00
vabene1111
c9bd3ccae8 Merge branch 'develop' into feature/kilojoules 2021-11-01 09:46:04 +01:00
vabene1111
4927f8bf4d fixed nutrition form 2021-10-29 14:25:20 +02:00
xeals
6dfd3ae1d7 Localize nutritional energy headings 2021-10-25 17:39:04 +11:00
Kaibu
24c1bfa16f shopping and new nav for meal plan 2021-10-21 19:07:12 +02:00
Kaibu
dc2a65bd18 Update en.json 2021-10-17 19:10:20 +02:00
Kaibu
9694560deb Merge branch 'develop' into feature/minor_ui_improvements 2021-10-17 19:09:23 +02:00
Kaibu
bfbf932f6b setting starting day in meal plan 2021-10-17 17:31:52 +02:00
Kaibu
2e2b79c093 ical export and tooltips for new meal plan 2021-10-17 15:11:30 +02:00
vabene1111
54a2a45959 completed migration of file view to generic model list 2021-10-14 11:20:30 +02:00
vabene1111
4324dd61cf Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-13 15:04:03 +02:00
vabene1111
1b1945d954 started migrating file editor page to generic model list 2021-10-13 15:03:59 +02:00
Kaibu
4b1443a705 new meal type edit 2021-10-13 14:50:52 +02:00
vabene1111
88a2255ed2 fixes
translation
disabled note rendering when less than 15 characters
fixed step header rendering
fixed image in recipe edit on mobile layout
2021-10-11 16:29:32 +02:00
Kaibu
37e45bea76 meal plan fixes
- added translations
- form validation & tagging support for meal types
2021-10-09 02:25:31 +02:00
vabene1111
1fb1becfcf added translations to book view 2021-10-06 20:09:54 +02:00
smilerz
17cedf17b5 stubbed out new shopping list 2021-09-30 14:56:59 -05:00
vabene1111
a7dc23194e converted ingredient parser to class and added automation beta hint 2021-09-16 17:52:11 +02:00
vabene1111
4f3a364f13 translation 2021-09-15 14:26:40 +02:00