AquaticLava
|
693b43af2e
|
Merge remote-tracking branch 'origin/develop' into Auto-Planner
# Conflicts:
# vue/src/apps/MealPlanView/MealPlanView.vue
|
2023-05-17 21:22:26 -06:00 |
|
vabene1111
|
0539e1ea15
|
food edit modal done
|
2023-05-11 17:13:35 +02:00 |
|
vabene1111
|
6030fa1d68
|
property scaling and ui
|
2023-05-08 12:09:55 +02:00 |
|
vabene1111
|
54a5c145cc
|
comonent in generic form trial
|
2023-05-05 17:04:20 +02:00 |
|
vabene1111
|
86fd0dcab1
|
made the open data importer its own component
|
2023-05-05 16:33:30 +02:00 |
|
vabene1111
|
071926aada
|
improved importer merging behavior
|
2023-05-04 15:29:06 +02:00 |
|
vabene1111
|
89e3e85d1e
|
Merge branch 'develop' into feature/unit-conversion
# Conflicts:
# requirements.txt
|
2023-04-30 21:51:56 +02:00 |
|
vabene1111
|
dfde340447
|
basic import working
|
2023-04-30 21:51:28 +02:00 |
|
smilerz
|
323ded1814
|
fix touchable
|
2023-04-22 17:57:15 -05:00 |
|
smilerz
|
595de0c5a1
|
fixed pytests
|
2023-04-22 17:56:01 -05:00 |
|
smilerz
|
8c3195937b
|
fix food tests
|
2023-04-21 13:14:23 -05:00 |
|
vabene1111
|
b275c53e5a
|
first ideas of property editor
|
2023-04-11 17:27:10 +02:00 |
|
vabene1111
|
7d9fcac0c7
|
basic food property viewer in recipe view
|
2023-04-11 16:48:38 +02:00 |
|
vabene1111
|
a60f1a3e92
|
added section headers to bottom nav create
|
2023-03-14 22:12:39 +01:00 |
|
vabene1111
|
f0f12ca83f
|
removed use_plural space setting
remove because i dont see the need and it was causing issues
|
2023-02-24 23:32:30 +01:00 |
|
vabene1111
|
b14d8f0051
|
fixed plural showing in lists where it does not make sense
|
2023-02-24 23:27:20 +01:00 |
|
vabene1111
|
0c8c74c0ac
|
context menu working for mobile mealplan view
|
2023-02-24 20:24:28 +01:00 |
|
vabene1111
|
d4b8190f55
|
increased right/left padding in bottom nav
|
2023-02-24 11:16:12 +01:00 |
|
vabene1111
|
2781730778
|
fixed mess
|
2023-02-19 21:09:06 +01:00 |
|
vabene1111
|
dff9f91d4c
|
properly integrated bottom nav
|
2023-02-19 13:54:16 +01:00 |
|
vabene1111
|
59d1c1dcdc
|
improved bottom nav with slots and more
|
2023-02-19 10:02:31 +01:00 |
|
vabene1111
|
2cff936b5b
|
improved showing of meal plan and bottom nav widget
|
2023-02-19 08:50:40 +01:00 |
|
vabene1111
|
d9dc644cb6
|
fixed meal plan edit id handling
|
2023-02-19 08:44:36 +01:00 |
|
vabene1111
|
2280d04fd2
|
search view meal plan working
|
2023-02-19 08:42:23 +01:00 |
|
vabene1111
|
1c8cb69cf3
|
wip integrating mealplan edit into search
|
2023-02-18 22:27:17 +01:00 |
|
vabene1111
|
e33c3789b7
|
fixed add to shopping when using ingredient headers
|
2023-02-18 21:56:21 +01:00 |
|
vabene1111
|
c08c1d30ad
|
fixed review shopping before save, improved meal plan edit modal independece
|
2023-02-18 21:55:17 +01:00 |
|
vabene1111
|
3c00e1ecdb
|
made meal plan edit modal mostely independent
|
2023-02-18 21:15:08 +01:00 |
|
vabene1111
|
57fae34ff6
|
playing with bottom nav
|
2023-02-17 17:02:50 +01:00 |
|
vabene1111
|
961578385d
|
new meal plan widget
|
2023-02-16 23:38:14 +01:00 |
|
vabene1111
|
c78c615372
|
Merge branch 'develop' into feature/card_ui_2
|
2023-02-16 22:51:30 +01:00 |
|
vabene1111
|
04bdec3889
|
Merge branch 'feature/improved-offline' into develop
|
2023-02-16 22:51:21 +01:00 |
|
vabene1111
|
73be817c10
|
moved context menu and re added descripotion to detailed view
|
2023-02-16 21:30:30 +01:00 |
|
vabene1111
|
2c85c370e6
|
description fade
|
2023-02-16 20:52:11 +01:00 |
|
vabene1111
|
3a38a095d8
|
nicer card working
|
2023-02-16 20:38:40 +01:00 |
|
vabene1111
|
e754b13340
|
quite nice
|
2023-02-16 20:23:46 +01:00 |
|
vabene1111
|
900c28caba
|
playing around with the recipe card
|
2023-02-16 19:10:19 +01:00 |
|
vabene1111
|
f554963ae7
|
ugly but working import to my tandoor instance button
|
2023-02-16 18:16:01 +01:00 |
|
vabene1111
|
50429207c5
|
import between tandoor instances WIP
|
2023-02-12 23:09:30 +01:00 |
|
vabene1111
|
3af7e98216
|
basic pinia store
|
2023-02-12 16:06:00 +01:00 |
|
vabene1111
|
39656152d3
|
fixed disabling shopping auto sync not working
|
2023-02-12 12:55:26 +01:00 |
|
vabene1111
|
924d1cb71b
|
improved search food api performance
|
2023-02-11 16:27:41 +01:00 |
|
vabene1111
|
44236f611e
|
removed unnecessary api calles in MealPlanEditModal
|
2023-02-11 15:56:11 +01:00 |
|
vabene1111
|
90e389f2fa
|
fixed add to shopping modal layout
|
2023-01-27 15:43:22 +01:00 |
|
vabene1111
|
d8bcb8bcb6
|
emoji picker offline
|
2023-01-16 20:28:42 +01:00 |
|
vabene1111
|
5cb0f1761a
|
fixed emoji picker
|
2023-01-16 20:23:36 +01:00 |
|
AquaticLava
|
785dc15cd9
|
Merge branch 'TandoorRecipes:develop' into Auto-Planner
|
2023-01-05 16:27:27 -07:00 |
|
AquaticLava
|
31f3425354
|
Menu for auto planner, menu sets auto planner settings. delete method no longer deletes all records for testing the auto planner.
|
2023-01-05 16:25:42 -07:00 |
|
vabene1111
|
6176eeb024
|
basics
|
2023-01-03 23:12:00 +01:00 |
|
vabene1111
|
1a6e677c06
|
allow filter in add to shopping modal
|
2022-12-31 17:35:16 +01:00 |
|