smilerz
8411537f87
filtered automations to tokens present
2023-08-25 07:54:05 -05:00
smilerz
479cf1a042
create Transpose Words automation
2023-08-25 07:54:05 -05:00
smilerz
8fa00972bd
add NEVER_UNIT automation
2023-08-25 07:53:53 -05:00
vabene1111
92d648c3a3
added ability to order property types
2023-08-24 12:50:17 +02:00
vabene1111
2f0929e90e
Merge pull request #2539 from srwareham/hide-step-ingredients
...
Added option: Hide step ingredients
2023-08-24 10:33:57 +02:00
srwareham
6785033a21
Add step-level configuration whether an ingredients table should be shown. User-level default added to settings
2023-08-23 21:46:09 -07:00
vabene1111
1ecb57e795
removed dependency and upgraded bleach clean
2023-08-16 07:22:09 +02:00
smilerz
7853357065
fix error when filtering on rating in saved filters
2023-07-25 17:48:19 -05:00
smilerz
6f1befc43c
fixed rating sort order and updated tests
2023-07-25 11:37:48 -05:00
smilerz
cf9d599536
fixed sort by rating so that unrated are always last
2023-07-20 15:39:35 -05:00
vabene1111
a8f1cd26cd
change guest recipe permission
2023-07-18 10:54:20 +02:00
vabene1111
ac1d641bd5
added RO DRF permission and internal_note filters for invite/userspace
2023-07-03 21:59:15 +02:00
vabene1111
1306c7381c
fixed keyword import error
2023-06-22 10:11:00 +02:00
vabene1111
23bfc3c3b0
re-added property imports for open data importer
2023-06-20 15:42:25 +02:00
vabene1111
813c7a46f1
added additonal verification of imported images
2023-06-20 13:35:34 +02:00
vabene1111
053ff9506a
fixed open data import store error
2023-06-20 13:03:18 +02:00
vabene1111
4875b158fd
fixed open data importer
2023-06-13 13:23:57 +02:00
vabene1111
6bb04dc56d
improved property functions
2023-06-12 17:20:00 +02:00
vabene1111
2dc038edc7
fixed url import array in name
2023-06-12 16:18:24 +02:00
vabene1111
a65e93a9b3
fixed property helper bug with non food ingredients
2023-05-29 12:43:14 +02:00
vabene1111
256b7b1543
Merge branch 'develop' into feature/unit-conversion
...
# Conflicts:
# cookbook/helper/recipe_url_import.py
2023-05-26 16:11:11 +02:00
vabene1111
aeb944b281
dont show properties if no reference amout is given
2023-05-26 15:32:55 +02:00
vabene1111
3302dacdc3
properties structure imporioved
2023-05-25 16:13:16 +02:00
vabene1111
4c69a0b721
fixed json import missing source url attribute
2023-05-24 20:32:47 +02:00
vabene1111
2a5cba0178
improvements to property calculation
2023-05-07 00:30:32 +02:00
vabene1111
9a77089c6d
improved unit conversion and tests
2023-05-06 23:57:45 +02:00
vabene1111
19f5da77b2
cleanup migrations, remove pint to speed up base conversion and calculate properties on converted ingredients
2023-05-06 22:21:27 +02:00
vabene1111
2cc7278865
extremly innefficent WIP
2023-05-06 20:54:36 +02:00
vabene1111
60f31608b9
added recipe properties
2023-05-06 19:14:25 +02:00
vabene1111
86fd0dcab1
made the open data importer its own component
2023-05-05 16:33:30 +02:00
vabene1111
12da77f037
beser response and stuff
2023-05-04 17:12:49 +02:00
vabene1111
071926aada
improved importer merging behavior
2023-05-04 15:29:06 +02:00
vabene1111
33d048e623
improve importer
2023-05-04 08:43:36 +02:00
vabene1111
274fce5236
fixed importer
2023-05-02 16:27:03 +02:00
vabene1111
1046065f46
fixed load bulk
2023-05-01 22:36:39 +02:00
vabene1111
60243ad901
load bulk
2023-05-01 13:39:09 +02:00
vabene1111
d62c49eb2f
not yet fully working food import
2023-05-01 13:29:14 +02:00
vabene1111
1bb6eb7141
import open data content
2023-04-30 22:30:56 +02:00
vabene1111
89e3e85d1e
Merge branch 'develop' into feature/unit-conversion
...
# Conflicts:
# requirements.txt
2023-04-30 21:51:56 +02:00
smilerz
595de0c5a1
fixed pytests
2023-04-22 17:56:01 -05:00
vabene1111
7d9fcac0c7
basic food property viewer in recipe view
2023-04-11 16:48:38 +02:00
smilerz
9db5e45c26
added keyword automation to url import
2023-04-05 15:46:10 -05:00
vabene1111
2a6fc723d0
first food property UI prototype
2023-04-04 13:13:51 +02:00
vabene1111
25c914606e
improved converters and helpers
2023-04-02 10:54:57 +02:00
vabene1111
44cb2d9807
improved tests and limited conversion to existing units
2023-04-02 10:05:28 +02:00
Ignas Poklad
78f1ee175b
Add ability to set maximum missing ingredient count
2023-03-30 00:47:21 +02:00
vabene1111
7e350b2f90
improved property calculator
2023-03-25 07:59:07 +01:00
vabene1111
6d5592c1be
basic food property calculation
2023-03-25 07:46:06 +01:00
vabene1111
9241638686
Merge branch 'develop' into feature/unit-conversion
2023-03-25 06:23:56 +01:00
vabene1111
84a1c560cc
Merge pull request #2270 from MarcusWolschon/features/upstream/1552_Import_Recipes_from_Cookidoo
...
#1552 import recipes from cookidoo
2023-03-25 05:51:18 +01:00
Jérôme Wiedemann
332c4bd94a
add: support to scale numbers/amounts
2023-03-21 18:04:03 +01:00
vabene1111
cb518a0cca
many more unit conversions
2023-03-16 17:07:46 +01:00
vabene1111
6efe4ab08d
base unit conversions
2023-03-15 17:30:23 +01:00
vabene1111
b10be8d321
playing around with pint
2023-02-26 11:56:48 +01:00
vabene1111
8a648a5e41
unit conversion cleanups
2023-02-26 09:12:16 +01:00
vabene1111
2781730778
fixed mess
2023-02-19 21:09:06 +01:00
vabene1111
985e98c699
fixed shopping list meal plan logic
2023-02-19 17:05:39 +01:00
vabene1111
c08c1d30ad
fixed review shopping before save, improved meal plan edit modal independece
2023-02-18 21:55:17 +01:00
vabene1111
5dad6b8b17
enable cross tandoor importing
2023-02-16 17:32:43 +01:00
vabene1111
3c527fd112
allow infiinit sharing as space setting
2023-02-12 18:16:43 +01:00
vabene1111
9846c4df18
added support for rezeptsuite.de imports
2023-02-11 17:51:44 +01:00
vabene1111
820c9b704f
improved servings parser
2023-02-11 09:04:05 +01:00
Marcus Wolschon
bce44866c2
add translations, go back to using scraper.instructions()
2023-01-30 16:49:38 +01:00
vabene1111
dfa0794281
Merge pull request #2272 from MarcusWolschon/features/upstream/ingredients_special_cases
...
handle 2 more special cases in ingredients
2023-01-27 15:14:47 +01:00
Marcus Wolschon
b4c26682c7
simplify
2023-01-17 15:20:59 +01:00
vabene1111
3b9d221258
fixed importer loading empty ingredients
2023-01-16 20:41:29 +01:00
Marcus Wolschon
c690bc18a0
Fix CodeQL issue with regular expression
2023-01-15 14:27:55 +01:00
Marcus Wolschon
394f24c29f
handle special cases in ingredients
2023-01-15 13:50:06 +01:00
Marcus Wolschon
f43ef3ad59
another typo
2023-01-15 13:04:29 +01:00
Marcus Wolschon
4c71c5b088
fix typo
2023-01-15 13:03:51 +01:00
Marcus Wolschon
54d0b70f01
#1552 use instructions_list() instead of instructions() and move Thermomix-Handling to clean_instruction_string()
2023-01-15 12:55:03 +01:00
Marcus Wolschon
5a0f07a6b2
handle steps
2023-01-13 22:21:31 +01:00
Marcus Wolschon
77feb0db3a
#1552 Import Recipes from Cookidoo
2023-01-13 21:31:49 +01:00
Marcus Wolschon
be24e25ae4
#1552 Import Recipes from Cookidoo
2023-01-13 21:19:49 +01:00
vabene1111
3e82199c44
added author keyword import
2023-01-06 21:22:02 +01:00
vabene1111
798457e7e2
translated, documented and implemented instruction replace
2023-01-04 16:36:03 +01:00
vabene1111
6176eeb024
basics
2023-01-03 23:12:00 +01:00
vabene1111
1df0ad202f
fixed urlize markdown 3.4 compatibility
2022-11-24 22:29:29 +01:00
Niklas Schwarz
b1ad5ef205
Add option to space to enable plural name usage
...
* Add option to space to enable usage of plural name
for food and unit per space
* Respect option per space to use the plural name
2022-11-11 18:15:57 +01:00
Niklas Schwarz
9994b6f9c2
Add plural name for unit and food
...
Add an optional plural name for unit and food.
Additional options to show always the plural name for unit and food
for an ingredient is added.
2022-11-11 18:15:57 +01:00
vabene1111
24f331c208
improved ingredient parser handling of amount unit without space
2022-11-09 14:24:12 +01:00
vabene1111
409b438776
fixed vue template compiler version and removed debug print from permission helper
2022-10-01 18:18:00 +02:00
vabene1111
12a8582a9a
fixed importer and copy recipe
2022-09-23 16:43:22 +02:00
vabene1111
b49393357a
fixed tests
2022-09-21 16:54:41 +02:00
vabene1111
cc1a69eac0
fixed cache key uniqueness even in tests
2022-09-21 16:28:54 +02:00
vabene1111
54c9e200a0
Merge pull request #2044 from ambroisie/fix/markdown_md_globals_deprecated
...
Fix 'markdown' 3.4 version incompatibility
2022-09-17 07:14:03 +02:00
Bruno BELANYI
37e292cab9
Fix 'markdown' 3.4 version incompatibility
2022-09-16 19:11:52 +02:00
vabene1111
e391abd23d
moved annotation to default query manager
2022-09-16 18:18:59 +02:00
vabene1111
b2a10f269c
permission and search preference caching
2022-09-16 14:35:35 +02:00
vabene1111
dc076d25d6
improved hash generation time
2022-09-16 13:31:00 +02:00
vabene1111
845408244b
optimized recipe search query annotation performance
2022-09-16 13:24:57 +02:00
vabene1111
eb119b7443
remove "favorite" as default sort order due to performacne issues
2022-09-15 18:31:22 +02:00
vabene1111
b315d6e171
adding debug toolbar
2022-09-12 17:58:20 +02:00
Andrew Jayne
cffa731106
fix: ingredient parsing for non-latin languages
...
Before this change the ingredient string for non-latin
languages was not being parsed into the correct amount
or units when the food is found at the start of the
ingredient string.
This was because the regex being used was restricted to
latin characters.
With this change the amount and units are correctly
parsed from such a string.
Fixes https://github.com/TandoorRecipes/recipes/issues/1983
2022-08-07 21:37:59 +01:00
vabene1111
6605b87c5c
new settings page finished
2022-08-05 16:54:53 +02:00
vabene1111
e9a1a06bda
fixed recipe share permission
2022-08-05 14:28:17 +02:00
vabene1111
3ec4afb02f
fixed scoping and permissions for tokens
2022-08-04 18:33:45 +02:00
vabene1111
5e77adf7e6
fixed mail send
2022-08-01 16:56:18 +02:00
vabene1111
ce1f55ffd1
settings wip
2022-07-15 17:12:01 +02:00
vabene1111
e91790f5ac
added ability to mark recipes as private
2022-07-13 15:46:39 +02:00