159 Commits

Author	SHA1	Message	Date
smilerz	508284c046	edit SupermarketCategoryRelations	2021-09-14 16:09:48 -05:00
vabene1111	1c661c9baf	recipe edit view hotkeys and small tweaks	2021-09-14 12:36:04 +02:00
vabene1111	b151356bce	recipe editor UI improvements	2021-09-14 11:47:00 +02:00
Kaibu	77bd44ad42	minor drawer fixes	2021-09-13 22:30:01 +02:00
vabene1111	bbc6015898	Merge branch 'pr/891' into develop	2021-09-13 22:11:41 +02:00
smilerz	85aca8acf6	shopping_list_category	2021-09-13 14:30:03 -05:00
vabene1111	6350d0e9c5	Merge branch 'feature/recipe-edit-vue' into develop ... # Conflicts: # vue/vue.config.js # vue/webpack-stats.json	2021-09-13 21:14:45 +02:00
vabene1111	234e27c4c1	recipe editor	2021-09-13 21:13:43 +02:00
Kaibu	22bde0424c	delete and create added for books	2021-09-13 20:49:25 +02:00
Kaibu	8b09777b2c	Merge branch 'feature/books_refactor' into develop ... # Conflicts: # vue/webpack-stats.json	2021-09-13 19:30:13 +02:00
Kaibu	fd8797e2b7	cookbook view refactored, minor ui fixes	2021-09-13 19:28:16 +02:00
vabene1111	b752541302	added markdown editor for instructions	2021-09-13 17:25:39 +02:00
vabene1111	f009e105ec	recipe search fixed	2021-09-13 15:21:15 +02:00
vabene1111	b9ff4387ad	first rendering version	2021-09-13 14:26:54 +02:00
vabene1111	b86c9d295a	basic errors fixed	2021-09-13 14:06:19 +02:00
vabene1111	4fbf080e2f	basics	2021-09-13 12:39:29 +02:00
Kaibu	0501dd9a0a	layout progress	2021-09-12 22:47:31 +02:00
vabene1111	79c1f2eb86	Merge branch 'develop' into generic_card_fix	2021-09-11 13:09:02 +02:00
smilerz	f6eb1b69cb	card loading fixes	2021-09-10 11:37:27 -05:00
smilerz	6888233b6a	fixed mispelled parameter	2021-09-10 06:44:09 -05:00
smilerz	cd137f9da3	yarn build	2021-09-09 19:07:16 -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
vabene1111	51dd137d96	Merge branch 'develop' into create_inputList	2021-09-09 05:44:43 +02:00
smilerz	83a747739a	add new from ListInput	2021-09-08 14:01:21 -05:00
smilerz	5f37af5710	Move/Merge updated to handle object vs id	2021-09-08 09:16:58 -05:00
Kaibu	9bdcf09f60	started reworking books	2021-09-08 16:15:33 +02:00
vabene1111	04c047bd31	fixed keyword url parameter type in search view	2021-09-08 15:44:36 +02:00
vabene1111	19d152461c	various fixes food serializer	2021-09-08 15:05:54 +02:00
vabene1111	68b64ba8e2	Merge branch 'pr/865' into develop	2021-09-08 09:42:16 +02:00
vabene1111	8edc01db26	Merge pull request #861 from smilerz/food_tree_patch ... post food_tree bug fixing	2021-09-08 09:11:00 +02:00
smilerz	8420995aa8	updated RecipeSearch API	2021-09-07 13:52:14 -05:00
smilerz	c9d1a9b551	finished unit page	2021-09-06 14:00:32 -05:00
smilerz	84744560e0	infinite loader bug fixing	2021-09-06 12:28:14 -05:00
smilerz	f12558951a	moved keyword Vue to generic components	2021-09-05 16:26:01 -05:00
smilerz	638dd96812	finished making FoodList completely generic	2021-09-05 14:15:58 -05:00
smilerz	d33a49538e	Squashed commit of the following:	2021-09-05 11:18:57 -05:00
smilerz	d1556f69c2	WIP	2021-09-05 11:17:28 -05:00
smilerz	b147c975b8	post food_tree bug fixing	2021-09-04 16:41:57 -05:00
vabene1111	16d125a243	fixed search facets and sub recipe	2021-09-04 19:26:42 +02:00
vabene1111	d70f1f9fc7	several small fixes to new components	2021-09-04 18:11:50 +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	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
smilerz	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
smilerz	4714162c0b	WIP	2021-08-31 14:58:40 -05:00