811 Commits

Author	SHA1	Message	Date
vabene1111	2565ab30a4	lots of improvements and bookmarklet import working again	2022-03-05 15:16:58 +01:00
vabene1111	bdccdf0893	Merge branch 'develop' into feature/importer_to_vue ... # Conflicts: # cookbook/helper/recipe_url_import.py	2022-03-04 14:33:59 +01:00
MaxJa4	b393d026f7	Added a few more strings to be localized and fixed one ui alignment	2022-02-27 22:40:03 +01:00
smilerz	56c553c35d	load language_code to new shopping list	2022-02-25 13:52:56 -06:00
vabene1111	fc6268b7ff	Merge pull request #1564 from smilerz/retain_original_ingredient_text ... retain original text when parsing ingredients	2022-02-25 16:17:44 +01:00
MaxJa4	95b63d882b	Fixed member count in space settings.	2022-02-24 19:31:42 +01:00
smilerz	e52054e732	retain original text when parsing ingredients	2022-02-21 09:47:27 -06:00
vabene1111	55b035eaaa	first boilerplate for new import view	2022-02-19 09:34:42 +01:00
smilerz	88b3ba1427	various fixes	2022-02-08 08:13:16 -06:00
vabene1111	c92c3e7d85	improved comment formatting	2022-02-07 17:43:57 +01:00
Kristof Mattei	3b946e512c	Aligned formatting.	2022-02-04 14:04:05 -08:00
Kristof Mattei	d2a6409381	Fixed parsing error, } should've been included	2022-02-04 14:02:50 -08:00
vabene1111	a3fa01d8d3	Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress	2022-02-03 15:59:18 +01:00
vabene1111	3501bcadb1	removed old cook log modal	2022-02-03 15:44:57 +01:00
vabene1111	a0892470e1	Merge branch 'feature/export-progress' into develop	2022-01-28 15:41:49 +01:00
Chris Scoggins	4a48019885	fix duplicate shopping entries when using old list	2022-01-26 14:47:33 -06:00
vabene1111	f274f31e80	fixed unit search on importer page	2022-01-21 16:56:47 +01:00
Sebastian Weber	c20e982fb1	Fix typos	2022-01-20 00:50:41 +01:00
smilerz	2a13a341dd	enable/disable treeselect	2022-01-18 08:17:54 -06:00
vabene1111	edd47873f7	fixed signup button and autofocus on user input fields	2022-01-17 16:51:04 +01:00
smilerz	ddb9e70d31	fix url_import	2022-01-17 09:46:26 -06:00
smilerz	dde350c8af	prettier cleanup	2022-01-17 08:35:19 -06:00
smilerz	37971acb48	refactor recipe search	2022-01-17 08:26:34 -06:00
Tiago Rascazzi	7c48c13dce	Added export from url args	2022-01-08 13:37:26 -05:00
Tiago Rascazzi	9c873127a5	Added loading page	2022-01-08 11:07:33 -05:00
vabene1111	30683fe455	Merge pull request #1252 from smilerz/sw_at_ScriptName ... change manifest paths to be relative	2022-01-07 15:39:49 +01:00
vabene1111	5e2ca250b0	fixed nav and export required recipe	2022-01-07 11:01:53 +01:00
smilerz	983d66c197	change manifest paths to be relative	2022-01-06 15:11:24 -06:00
smilerz	3fafd43e58	merge ignore shopping with onhand	2021-12-29 16:32:19 -06:00
smilerz	3047c09e55	test rest food inheritance	2021-12-28 12:03:34 -06:00
smilerz	7ad088d953	fix after rebase	2021-12-28 12:03:33 -06:00
smilerz	94b2e9b01c	minor updates	2021-12-28 12:03:33 -06:00
smilerz	f245aa8b4f	add to shopping from card context menu	2021-12-28 12:03:32 -06:00
smilerz	a217db5822	add new unit/food from shopping list	2021-12-28 12:03:32 -06:00
smilerz	ecac3f3c2d	related recipes included when adding mealplan to shopping list	2021-12-28 12:03:32 -06:00
smilerz	10a33add75	Fix after rebase	2021-12-28 12:03:31 -06:00
vabene1111	3ff15b6766	added copy me that importer	2021-12-23 15:54:48 +01:00
smilerz	05f2fdecb3	fixes 1123	2021-12-23 07:44:11 -06:00
vabene1111	4d2e7eadb6	Merge branch 'develop' into generic_modal_v2	2021-11-30 17:23:27 +01:00
smilerz	55a0304700	add search debug	2021-11-24 12:10:15 -06:00
smilerz	5b6dd62f8e	generic modal refactored	2021-11-23 19:18:10 -06:00
Kaibu	4288d76afd	added more translations	2021-11-07 17:32:43 +01:00
vabene1111	1fad1d2b8f	improved deletion of recipes	2021-11-04 12:27:21 +01:00
Kaibu	2215e06506	translation fixes	2021-11-03 21:34:18 +01:00
Kaibu	a40c8c3f83	added password reset from key templates	2021-11-03 20:44:36 +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
vabene1111	6949e17a33	possibly fixed sub path hosting issues	2021-10-29 11:29:55 +02:00
vabene1111	0091abd2c0	fixed typo	2021-10-26 14:51:30 +02:00
xeals	c9ff0543e3	Convert nutrition input from KJ to calories with preference	2021-10-25 17:37:31 +11:00