smilerz
|
4377505b14
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
10a33add75
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
vabene1111
|
4d2e7eadb6
|
Merge branch 'develop' into generic_modal_v2
|
2021-11-30 17:23:27 +01:00 |
|
Kaibu
|
1907223a8a
|
reduced api calls
|
2021-11-25 12:51:55 +01:00 |
|
Kaibu
|
9b5fe8f4e7
|
prevent page jump due to href=#
|
2021-11-25 01:35:12 +01:00 |
|
Kaibu
|
d76fdd090a
|
meal plan hotkeys and sharing
|
2021-11-25 01:28:07 +01:00 |
|
smilerz
|
5b6dd62f8e
|
generic modal refactored
|
2021-11-23 19:18:10 -06:00 |
|
vabene1111
|
695cab29a1
|
fixed book sharing and added step page
|
2021-11-14 15:33:25 +01:00 |
|
vabene1111
|
0e55fe162c
|
renamed components to match recommended naming
|
2021-11-01 11:39:10 +01:00 |
|
vabene1111
|
355f2d30a6
|
-a
|
2021-11-01 11:37:55 +01:00 |
|
vabene1111
|
e4924f9d27
|
improved recipe card time pill
|
2021-11-01 11:24:28 +01:00 |
|
krial057
|
1a814aa9d1
|
Also show working/waiting time if only one of both is set
|
2021-11-01 10:40:03 +01:00 |
|
vabene1111
|
c9bd3ccae8
|
Merge branch 'develop' into feature/kilojoules
|
2021-11-01 09:46:04 +01:00 |
|
Kaibu
|
31720927b1
|
deprecated old meal plan
|
2021-10-31 18:08:37 +01:00 |
|
xeals
|
6dfd3ae1d7
|
Localize nutritional energy headings
|
2021-10-25 17:39:04 +11:00 |
|
xeals
|
15eec9d373
|
Set calories heading based on user preference
|
2021-10-25 17:38:41 +11:00 |
|
xeals
|
3d830a4449
|
Display nutritional energy in KJ with preference
|
2021-10-25 17:28:52 +11:00 |
|
Kaibu
|
24c1bfa16f
|
shopping and new nav for meal plan
|
2021-10-21 19:07:12 +02:00 |
|
Kaibu
|
d62557b804
|
calender selector
|
2021-10-19 18:53:35 +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
|
e784074ac8
|
meal plan icons, rating spacing
|
2021-10-17 16:36:45 +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
|
92f0f44a3d
|
fixed foods not linking to recipe in ingredient lists
|
2021-10-14 09:00:45 +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 |
|
Kaibu
|
b6c17f3bf3
|
books lazy loading details
|
2021-10-12 18:20:14 +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 |
|
vabene1111
|
64b2e21747
|
Merge branch 'develop' into draggable_pill_update
|
2021-10-01 07:53:35 +00:00 |
|
Kaibu
|
b61512da77
|
meal plan refactor progress
- added paginated loading
- tab panes
- default meal type selection
- image placeholder
- drang and drop delete area
|
2021-09-30 02:33:40 +02:00 |
|
smilerz
|
d1bed45eb6
|
added grip indication to supermarket category pills
|
2021-09-29 16:42:19 -05:00 |
|
smilerz
|
c1a22ea2a6
|
chain supermarket create/update to include categories
|
2021-09-27 17:55:58 -05:00 |
|
Kaibu
|
b7be5cd325
|
meal plan fixes
added the option to create entries from recipe card context menu
|
2021-09-26 11:55:50 +02:00 |
|
Kaibu
|
5c85369120
|
meal plan context menu added, further progress
|
2021-09-22 20:03:03 +02:00 |
|
vabene1111
|
a7dc23194e
|
converted ingredient parser to class and added automation beta hint
|
2021-09-16 17:52:11 +02:00 |
|
Kaibu
|
e2def416ab
|
new meal planner basic features implemented
|
2021-09-15 17:31:25 +02:00 |
|
vabene1111
|
cfaae5b200
|
Merge branch 'develop' into patch3
|
2021-09-15 17:28:25 +02:00 |
|
vabene1111
|
60aa384f3c
|
Merge pull request #901 from smilerz/patch
fix inputLookup
|
2021-09-15 17:27:42 +02:00 |
|
smilerz
|
6a29c79e5c
|
fix resetList function
|
2021-09-15 08:50:46 -05:00 |
|
smilerz
|
5c0fa7cd19
|
fix inputLookup
|
2021-09-15 08:13:22 -05:00 |
|
vabene1111
|
dbfa27e4b9
|
automatic rule creation
|
2021-09-15 14:58:55 +02:00 |
|
vabene1111
|
d6f7aade46
|
basics for automation
|
2021-09-15 13:07:25 +02:00 |
|
vabene1111
|
aeb5682176
|
Merge branch 'pr/897' into develop
|
2021-09-15 09:16:09 +02:00 |
|
Kaibu
|
d9300a9a90
|
meal planner refactor progress
|
2021-09-14 23:16:33 +02:00 |
|
smilerz
|
f0cf92eaa3
|
draggable
|
2021-09-14 16:10:58 -05:00 |
|
smilerz
|
508284c046
|
edit SupermarketCategoryRelations
|
2021-09-14 16:09:48 -05:00 |
|