587 Commits

Author	SHA1	Message	Date
vabene1111	19c2d3bcf1	shopping description	2022-05-01 13:03:36 +02:00
vabene1111	9259f306ec	final importer touches	2022-05-01 12:51:37 +02:00
vabene1111	4f33101319	fixed empty step time error	2022-04-29 21:57:05 +02:00
Kaibu	d931feadf5	supermarkets rework mostly done	2022-04-24 12:52:00 +02:00
Kaibu	54af76e9cf	Merge branch 'develop' of https://github.com/vabene1111/recipes into develop ... # Conflicts: # vue/src/apps/ShoppingListView/ShoppingListView.vue	2022-04-23 20:45:35 +02:00
Kaibu	fcfef255c1	shopping list supermarket rework	2022-04-23 20:44:46 +02:00
vabene1111	825b7b7cf9	ingredient editor and parser	2022-04-23 19:58:40 +02:00
vabene1111	9f90306f6c	at least basic ui for ingredient editor	2022-04-23 17:13:27 +02:00
vabene1111	1fb6f96571	minor shopping tweaks	2022-04-23 16:51:04 +02:00
vabene1111	0b8dd63510	small fixes	2022-04-23 15:27:21 +02:00
Kaibu	8149192455	shopping list and import view ux	2022-04-23 14:47:10 +02:00
Kaibu	161ae9879a	import app view refactor	2022-04-23 03:02:46 +02:00
vabene1111	b4ebd98ee8	ingredient editor paginatio	2022-04-23 02:28:26 +02:00
vabene1111	78c0c5c213	ingredient editor improve merge/delete add edit	2022-04-23 02:17:40 +02:00
vabene1111	30d5587fbe	added err msg to all standard toasts	2022-04-23 01:41:08 +02:00
vabene1111	e4223787be	updated standard toast function	2022-04-23 01:31:15 +02:00
Kaibu	7fae95e248	Merge branch 'develop' of https://github.com/vabene1111/recipes into develop	2022-04-23 01:28:25 +02:00
Kaibu	b037203b8f	ui improvements (shopping and meal plan) ... - fixed content scaling for meal plan and shopping - style fixes on shopping list - touch based swipe actions for shopping list - better mobile experience overall	2022-04-23 01:28:20 +02:00
vabene1111	9adc1f7266	small fixes and tests	2022-04-22 22:27:17 +02:00
vabene1111	6953f763d2	improved source url field rendering	2022-04-22 21:13:00 +02:00
vabene1111	4ecf77f431	Merge branch 'feature/importer_to_vue' into develop ... # Conflicts: # vue/src/apps/RecipeView/RecipeView.vue	2022-04-22 21:07:02 +02:00
vabene1111	c4f5b160a6	show original text in recipe editor	2022-04-22 21:05:23 +02:00
vabene1111	d8f6dbc58f	import list to textarea	2022-04-22 21:00:59 +02:00
vabene1111	1740913a14	improve experience when importing multiple recipes	2022-04-22 20:19:39 +02:00
vabene1111	3cf0395a18	lots of small fixes	2022-04-22 19:26:49 +02:00
Kaibu	42dfc9d126	source url added	2022-04-22 18:53:23 +02:00
Kaibu	dc8ce0f6a4	recipe image max-width based on ingredient table	2022-04-22 17:33:27 +02:00
vabene1111	2ddb0c719a	Merge branch 'develop' into feature/importer_to_vue ... # Conflicts: # vue/src/apps/RecipeEditView/RecipeEditView.vue # vue/src/utils/openapi/api.ts	2022-04-22 16:41:13 +02:00
vabene1111	d9dd0a594e	show recipe and allow delete in ingredient editor	2022-04-17 23:25:22 +02:00
vabene1111	f0d59a8c9c	added ability to open ingredient editor from food/unit list	2022-04-17 22:43:33 +02:00
vabene1111	297a8d4c8b	ingredient editor basics done	2022-04-14 22:45:31 +02:00
vabene1111	976bce5fdd	add merge capability to ingredient editor	2022-04-14 22:10:48 +02:00
vabene1111	8c89438b97	allow delete in ingredient editor	2022-04-14 14:40:15 +02:00
vabene1111	7ca7bd6111	improve generic form delete	2022-04-14 14:31:34 +02:00
vabene1111	3159868ba4	moved generic multiselect create function into component	2022-04-14 14:08:16 +02:00
vabene1111	7befa4a084	added basic ingredient editor	2022-04-14 13:01:27 +02:00
Kaibu	82c2cc0f40	ui improvements	2022-04-04 22:53:26 +02:00
vabene1111	5bd9a15e4b	small fixes	2022-04-04 20:11:22 +02:00
vabene1111	528ada7d32	Merge branch 'develop' into feature/importer_to_vue ... # Conflicts: # vue/package.json	2022-04-04 19:16:20 +02:00
vabene1111	60bb3fd4aa	Merge pull request #1633 from smilerz/recipe_as_food ... allow marking recipe as food	2022-04-04 19:06:10 +02:00
vabene1111	0c841ec686	another improvement to shopping list item	2022-03-16 09:21:09 +01:00
vabene1111	e901c6708c	Merge branch 'develop' into feature/importer_to_vue	2022-03-15 13:02:10 +01:00
vabene1111	4dd3ba29b6	improved shopping v2 layout a little bit	2022-03-15 12:35:13 +01:00
smilerz	b9289e2685	fix sql debug button in search	2022-03-11 07:27:42 -06:00
vabene1111	7426bb4e76	auto import multiple urls	2022-03-10 17:35:11 +01:00
smilerz	486d197854	allow marking recipe as food	2022-03-06 23:12:59 -06:00
vabene1111	22ca482458	super very basics of manual mapping page working	2022-03-05 16:02:42 +01:00
vabene1111	2565ab30a4	lots of improvements and bookmarklet import working again	2022-03-05 15:16:58 +01:00
vabene1111	1caabef56a	step functions	2022-03-04 16:54:59 +01:00
vabene1111	6d8fe3c162	wip	2022-03-04 15:54:11 +01:00