369 Commits

Author	SHA1	Message	Date
vabene1111	e2ab3a0efb	fixed ingredient parser length issues	2022-04-23 14:15:06 +02:00
vabene1111	e0b7d1a8f0	added support for unit/amount at end of ingredient	2022-04-23 13:53:04 +02:00
vabene1111	012a1a7915	ingredient parser produces expected results again	2022-04-23 13:03:15 +02:00
vabene1111	9b132e71f2	screw up ingredient parser	2022-04-23 01:21:13 +02:00
vabene1111	3cf0395a18	lots of small fixes	2022-04-22 19:26:49 +02:00
vabene1111	57ec6a2b3d	import servings text	2022-04-04 23:21:13 +02:00
vabene1111	090e18e405	paprika importer improvements	2022-04-04 21:30:00 +02:00
vabene1111	85aad42529	added mela recipes importer	2022-04-04 21:09:47 +02:00
vabene1111	a2954554b5	fixed description length limit	2022-04-04 19:26:47 +02:00
vabene1111	5627161c5e	Merge branch 'develop' into feature/importer_to_vue	2022-03-10 15:27:11 +01:00
Matthias Bilger	f040b491d4	Allow img tag (including width/height attribute) ... Allow using img tag in markdown and additionally allowing to specify width and height attribute for elements.	2022-03-10 11:38:08 +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
vabene1111	e27a64f52c	Merge pull request #1623 from gloriousDan/develop ... Improve recipe import for non schema.org recipes	2022-03-04 14:28:34 +01:00
vabene1111	c6e36b802c	Merge pull request #1617 from smilerz/fix_sqlite_search ... remove unaccent from sqlite search	2022-03-04 14:26:32 +01:00
Daniel Schulz	cfcf354d59	Improve recipe import for non schema.org recipes	2022-03-03 23:47:50 +01:00
smilerz	08c1a8f2ab	fix loading children in treeselect	2022-03-02 14:56:33 -06:00
smilerz	f2211da9bb	remove unaccent from sqlite search	2022-03-02 09:42:10 -06:00
smilerz	d6db3fe65b	missing prepTime assignment	2022-03-01 16:31:18 -06:00
MaxJa4	1e3a6fadf0	More localization of recipe search and view	2022-02-28 21:19:00 +01: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
smilerz	18e53aa03f	return distinct shopping entries	2022-02-25 07:59:20 -06:00
vabene1111	f2c543ac15	Merge pull request #1572 from smilerz/export_from_filter ... Export from filter	2022-02-23 17:59:19 +01:00
smilerz	a7d66fa850	export recipes from saved filter	2022-02-22 15:18:39 -06:00
vabene1111	b9597a3333	fixed keyword names including labels during import	2022-02-22 21:21:25 +01:00
smilerz	9b5a9b87e9	fix combined fulltext search and trigram generating error	2022-02-22 11:28:30 -06:00
vabene1111	0d98c77301	some small ui stuff	2022-02-21 18:29:23 +01:00
smilerz	e52054e732	retain original text when parsing ingredients	2022-02-21 09:47:27 -06:00
vabene1111	e04d672750	import with image working	2022-02-21 15:59:30 +01:00
vabene1111	c06c511dc9	changed unit default in ingredient parser to none ... because empty name units are not accepted by unit serializer but null values can be handled by the ingredient serializer (as a unit can be null)	2022-02-21 15:35:36 +01:00
vabene1111	c8fc67fa2b	changed source import to match field structure of recipe model ... first imports working	2022-02-19 17:54:00 +01:00
vabene1111	1b6863683f	rename to prevent shadowing	2022-02-19 08:53:25 +01:00
smilerz	3b08b1406f	filters are automatically shared when part of shared book	2022-02-19 08:51:11 +01:00
smilerz	6dddcadf41	calculate child/sibling subsitutes correctly	2022-02-19 08:50:55 +01:00
smilerz	3e2fb6f814	Update recipe_url_import.py	2022-02-18 16:31:48 -06:00
smilerz	8e28247f17	handle fractions and decimals in get_minutes() during import	2022-02-18 15:31:55 -06:00
vabene1111	e081d823ed	fix book share permission	2022-02-18 17:52:32 +01:00
smilerz	2b5aec5d0a	resolved loading custom filter when not in expert mode	2022-02-18 09:08:36 -06:00
smilerz	bd973ec3a9	always sort count attributes to end	2022-02-15 16:19:41 -06:00
smilerz	b5c6c7cf2b	sort cooked date fix	2022-02-15 12:00:59 -06:00
smilerz	4e8bbefc17	minor cleanup	2022-02-15 06:42:57 -06:00
smilerz	8fa00b50b1	added update_at filter	2022-02-14 15:13:34 -06:00
smilerz	bf54680178	more recipe search tests	2022-02-13 13:53:07 -06:00
smilerz	c2961eede4	stub out receip search tests	2022-02-08 20:23:49 -06:00
smilerz	62adc5a91f	make +/- search fields not clickable	2022-02-08 09:57:23 -06:00
smilerz	dc71260baa	Merge branch 'additional_fixes' into feature/custom_filters	2022-02-08 09:05:07 -06:00
smilerz	88b3ba1427	various fixes	2022-02-08 08:13:16 -06:00
smilerz	1be5889923	tests for makenow filter	2022-02-07 17:46:04 -06:00
Chris Scoggins	ab52bd1a07	fix makenow/fulltext search duplicate results	2022-02-04 08:40:20 -06:00
Chris Scoggins	f9244a93a5	fix MakeNow filter	2022-02-03 17:19:38 -06:00
Chris Scoggins	6ef25b604b	add food substitutions	2022-02-03 15:04:46 -06:00