Commit Graph

113 Commits

Author SHA1 Message Date
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
37e45bea76 meal plan fixes
- added translations
- form validation & tagging support for meal types
2021-10-09 02:25:31 +02:00
053508821f rebuild again 2021-10-06 20:16:29 +02:00
ede7925203 compiled javascript 2021-10-06 20:13:36 +02:00
64b2e21747 Merge branch 'develop' into draggable_pill_update 2021-10-01 07:53:35 +00:00
17cedf17b5 stubbed out new shopping list 2021-09-30 14:56:59 -05:00
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
c1a22ea2a6 chain supermarket create/update to include categories 2021-09-27 17:55:58 -05:00
b3cffa4a38 cached facet results 2021-09-26 16:44:12 -05:00
b7be5cd325 meal plan fixes
added the option to create entries from recipe card context menu
2021-09-26 11:55:50 +02:00
5c85369120 meal plan context menu added, further progress 2021-09-22 20:03:03 +02:00
f3593e8151 implemented rule processing in ingredient parser 2021-09-16 18:31:21 +02:00
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
cfaae5b200 Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
1fa9c806a6 Merge branch 'develop' into patch2 2021-09-15 17:28:01 +02:00
6a29c79e5c fix resetList function 2021-09-15 08:50:46 -05:00
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
5c0fa7cd19 fix inputLookup 2021-09-15 08:13:22 -05:00
c9a910daca rebase with develop 2021-09-14 16:14:30 -05:00
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
0e50e4e8a0 meal master tweak and frontend build 2021-09-14 14:48:50 +02:00
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
c1161edc6d build 2021-09-13 21:24:41 +02:00
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
79c1f2eb86 Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
c8bff1660b transposed v-model 2021-09-10 14:51:37 -05:00
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
6888233b6a fixed mispelled parameter 2021-09-10 06:44:09 -05:00
cd137f9da3 yarn build 2021-09-09 19:07:16 -05:00
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
51dd137d96 Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05:00
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
cd0259ad26 remove console messages 2021-09-04 16:47:12 -05:00
b147c975b8 post food_tree bug fixing 2021-09-04 16:41:57 -05:00
b129753d4e Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02:00
de8ceba3bc compiled and updated javascript resources 2021-09-04 18:17:07 +02:00
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -05:00
30b513cb58 Squashed commit of the following:
commit 7e9a8d4d86
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 26 21:56:59 2021 -0500

    test case to detect 833

commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
2021-08-31 14:58:40 -05:00
ba07e98cae Squashed commit of the following:
commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
2021-08-31 14:58:40 -05:00
07a67684ab WIP 2021-08-31 14:58:40 -05:00
bf3feef707 yarn build 2021-08-31 14:58:39 -05:00