Commit Graph

54 Commits

Author SHA1 Message Date
vabene1111
f3593e8151 implemented rule processing in ingredient parser 2021-09-16 18:31:21 +02:00
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
smilerz
5c0fa7cd19 fix inputLookup 2021-09-15 08:13:22 -05:00
smilerz
c9a910daca rebase with develop 2021-09-14 16:14:30 -05:00
smilerz
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
smilerz
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
vabene1111
0e50e4e8a0 meal master tweak and frontend build 2021-09-14 14:48:50 +02:00
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
vabene1111
c1161edc6d build 2021-09-13 21:24:41 +02:00
Kaibu
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
vabene1111
79c1f2eb86
Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
smilerz
c8bff1660b transposed v-model 2021-09-10 14:51:37 -05:00
smilerz
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
smilerz
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
vabene1111
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
smilerz
cd0259ad26 remove console messages 2021-09-04 16:47:12 -05:00
smilerz
b147c975b8 post food_tree bug fixing 2021-09-04 16:41:57 -05:00
vabene1111
b129753d4e
Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02:00
vabene1111
de8ceba3bc compiled and updated javascript resources 2021-09-04 18:17:07 +02:00
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
smilerz
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
smilerz
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
smilerz
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
smilerz
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -05:00
smilerz
bf3feef707 yarn build 2021-08-31 14:58:39 -05:00
smilerz
44aa05fe5c Fix after rebase 2021-08-31 14:58:39 -05:00
smilerz
35dc981713 generic api mixin 2021-08-31 14:58:39 -05:00
smilerz
f7b2af7f97 working WIP 2021-08-31 14:58:39 -05:00
smilerz
d606ea8db3 moved food and keyword to generic cards 2021-08-31 14:58:39 -05:00
smilerz
72b4bd7e5c finished food view 2021-08-31 14:58:39 -05:00
smilerz
d5e9c5d8f8 food layout complete, edit food working 2021-08-31 14:58:38 -05:00
smilerz
b56c2429c7 WIP 2021-08-31 14:58:38 -05:00
smilerz
a605113b00 abstract merge function to handle all related models 2021-08-31 14:58:38 -05:00
smilerz
2808e3033d fixes keyword filter on OR search 2021-08-31 14:58:38 -05:00
vabene1111
7bab07bdaf search filter fix 2021-08-31 10:09:39 +02:00
smilerz
b00c189fd6 add pagination reset on search query change 2021-08-25 16:36:14 -05:00
smilerz
78ebd18ed8 fixes keyword filter on OR search 2021-08-24 22:01:02 -05:00
vabene1111
8b3827e56c small tweaks 2021-08-22 14:28:58 +02:00
vabene1111
c6990ef2d8 fixed fraction issue 2021-07-29 17:11:01 +02:00
vabene1111
8642298eda recipe book context menu 2021-07-29 16:32:15 +02:00
vabene1111
e92dbcd63e compiled javascript 2021-07-13 16:47:45 +02:00
vabene1111
9809f58c28 supermarket view done 2021-07-08 19:00:23 +02:00
vabene1111
da57e656eb several search related improvements 2021-07-07 17:45:05 +02:00
vabene1111
272341f1dc further improvements to search view 2021-06-28 18:35:20 +02:00
vabene1111
a9a0716c45 import response improvements 2021-06-17 14:08:03 +02:00
vabene1111
cdf4476345 recipe share link in modal 2021-06-15 20:57:25 +02:00
vabene1111
5e9ce955bc minor fixes 2021-06-09 18:53:20 +02:00