2086 Commits

Author	SHA1	Message	Date
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
vabene1111	55539c83c9	fixed supermarket category creation	2022-03-01 16:26:36 +01:00
MaxJa4	1e3a6fadf0	More localization of recipe search and view	2022-02-28 21:19:00 +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
vabene1111	028ee4a861	fixed file filter regex for importers	2022-02-27 11:37:12 +01:00
vabene1111	561c2106ce	fixed nextcloud import first item	2022-02-27 11:27:23 +01:00
smilerz	56c553c35d	load language_code to new shopping list	2022-02-25 13:52:56 -06:00
vabene1111	90d477a0fd	small change to be able to retain large texts	2022-02-25 16:19:49 +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
vabene1111	425a38f030	Merge pull request #1584 from smilerz/fix_duplicate_entry ... return distinct shopping entries	2022-02-25 16:15:41 +01:00
vabene1111	e824c9bff2	improved rezkonv parser	2022-02-25 15:51:37 +01:00
vabene1111	1bde4e81b7	fixed duplicate returns from tree manager get or create	2022-02-25 15:42:33 +01:00
smilerz	18e53aa03f	return distinct shopping entries	2022-02-25 07:59:20 -06:00
MaxJa4	95b63d882b	Fixed member count in space settings.	2022-02-24 19:31:42 +01:00
vabene1111	bedbc255b3	Merge pull request #1574 from smilerz/export_from_filter ... fix serializer using food name instead of supermarket name	2022-02-24 07:50:18 +01:00
smilerz	c8dcca8630	fix recipe search in export form (converted to change safe genericAPI)	2022-02-23 17:24:06 -06:00
smilerz	abeeac838b	fix serializer using food name instead of supermarket name	2022-02-23 14:31:43 -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	081edfd2d6	fix errors on Tandoor recipe import	2022-02-22 16:33:09 -06: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	52c16ab7dd	all types bascially working (lacking bookmark)	2022-02-22 17:00:30 +01: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	89348f69f1	basics of new import page	2022-02-19 16:55:17 +01:00
vabene1111	55b035eaaa	first boilerplate for new import view	2022-02-19 09:34:42 +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
vabene1111	d6fa02cc9e	Merge branch 'develop' into feature/custom_filters	2022-02-18 17:25:15 +01:00
smilerz	2b5aec5d0a	resolved loading custom filter when not in expert mode	2022-02-18 09:08:36 -06:00
smilerz	6b5a099ba0	removed case insensitive get_or_create for units	2022-02-17 12:49:41 -06:00
smilerz	f1fa5e32bf	fix case insensitive get_or_create	2022-02-17 10:50:38 -06:00
smilerz	d49818ae6a	change default trigram threshold	2022-02-17 10:27:15 -06:00
smilerz	1b7f97dc64	case insensitive get_or_create	2022-02-17 10:23:31 -06:00
vabene1111	7e5019eed3	fixed share write permission for meal plan	2022-02-17 14:57:28 +01:00
smilerz	4c9ddee55c	restrict get_or_create to name & space	2022-02-16 10:50:01 -06:00