smilerz
3b072d5dd9
check for scrape.schema before using it
2021-03-04 14:59:56 -06:00
smilerz
bfaed434cc
refactored url_import to use recipe-scraper
2021-03-03 21:08:34 -06:00
vabene1111
c99c944130
fixed normal django test running with scopes
2021-02-25 22:19:51 +01:00
vabene1111
29ab6cfb2d
Merge branch 'develop' into feature/spaces
...
# Conflicts:
# cookbook/views/data.py
# cookbook/views/views.py
2021-02-25 15:59:32 +01:00
vabene1111
24b5cdff85
Merge pull request #459 from smilerz/fix-456
...
Fix 456
2021-02-25 08:14:55 +01:00
smilerz
21740522bc
fixed URL import when ingredient is a string
2021-02-24 20:13:06 -06:00
smilerz
cc62b088fd
fix URL import when recipeYield is a list
2021-02-24 17:52:40 -06:00
vabene1111
46fb02376e
recipe share basics
2021-02-21 16:37:04 +01:00
vabene1111
24e43e3e2e
updated migrations + setup process update
2021-02-21 15:34:35 +01:00
vabene1111
846c660811
usr signup and more
2021-02-21 15:08:43 +01:00
vabene1111
beb4aa634f
forms
2021-02-20 23:42:44 +01:00
vabene1111
d7675d4b80
ingredients and helpers
2021-02-20 21:26:16 +01:00
vabene1111
e2b1115b3b
fixed servings blank
2021-02-20 18:50:28 +01:00
vabene1111
96c963795e
more spaces work
2021-02-20 18:47:14 +01:00
vabene1111
ad163509b4
updated edit and added space find methods
2021-02-19 18:09:42 +01:00
vabene1111
fb58d35029
space stuff partially working
2021-02-19 15:50:55 +01:00
vabene1111
777f4518be
servings default to 1 on import
2021-02-15 15:16:15 +01:00
Aaron
87d6ca0200
Fix ingredient parsing for fractions using '/'
...
Even though ingredients like '1 1/2 something' already worked fine and got converted to 1.5 something
I just came across a recipe using '1/2' as the whole amount without any whole number before that.
Apparently I overlooked that case before so I now also fixed that.
2021-02-14 18:43:38 +01:00
vabene1111
79da8db889
added paprika import
2021-02-08 13:47:06 +01:00
vabene1111
086570ce90
using new import/export module
2021-02-08 11:38:38 +01:00
vabene1111
63cfa14a21
allauth working and integrated
2021-01-28 13:40:07 +01:00
vabene1111
ca728b45ca
made it possible to disable signup
2021-01-24 16:41:25 +01:00
vabene1111
098f88e0b8
super basic working example
2021-01-21 20:54:55 +01:00
vabene1111
c41c319d25
added servings to url import
2021-01-21 19:39:06 +01:00
vabene1111
b563447674
ingredient linking fixed + tests fixed
2021-01-19 21:26:20 +01:00
vabene1111
523a2b41d1
fixed keyboard import edit
2021-01-19 21:11:02 +01:00
vabene1111
99f06955dc
corrected servings factor
2021-01-13 21:35:39 +01:00
vabene1111
1bb412e007
sanitize inputs of jinja so that output does not need to be
2021-01-13 01:34:21 +01:00
vabene1111
0eebd438ca
commit
2021-01-13 01:08:51 +01:00
Tobias Lindenberg
ff8e431630
helper/init
2021-01-10 13:59:27 +01:00
Tobias Lindenberg
eb9b2ac6fe
helper/template_helper
2021-01-10 13:57:51 +01:00
Tobias Lindenberg
1ad468e652
helper/recipe_url_import
2021-01-10 13:57:06 +01:00
Tobias Lindenberg
986bda0c81
helper/permission_helper
2021-01-10 13:51:55 +01:00
Tobias Lindenberg
bb361001b9
helper/permissions_config
2021-01-10 13:47:23 +01:00
Tobias Lindenberg
26aa0207aa
helper/mdx_urlize
2021-01-10 13:46:53 +01:00
Tobias Lindenberg
8b1bd3c555
helper/ingredient_parser
2021-01-10 13:45:33 +01:00
Tobias Lindenberg
b59c7288b1
helper/ingredient_parser
2021-01-10 13:44:55 +01:00
Tobias Lindenberg
f5b456018d
helper/dal
2021-01-10 13:41:09 +01:00
vabene1111
4b719af4e1
fixed broken microdata blowing up ingredient lists
2021-01-07 23:09:37 +01:00
vabene1111
78fa5338d3
fixed ingredient dropping on parser fail
2021-01-07 22:56:05 +01:00
vabene1111
e9f2b875b9
formatting
2021-01-07 22:47:53 +01:00
Jakob Wenzel
29903af085
catch error when trying to parse into ingredient/note
2021-01-07 19:49:02 +01:00
Jakob Wenzel
8ed2562454
allow plural-suffixes in ingredient parser
2021-01-07 19:30:07 +01:00
vabene1111
320d94a223
fixed incorrect redirects for unauthenticated users
2021-01-05 23:24:58 +01:00
vabene1111
fdeede5717
updated vue and vue bootrap + template improvements
2021-01-05 22:53:08 +01:00
vabene1111
738b601462
templating working
2021-01-05 22:07:46 +01:00
vabene1111
ee707eba5c
super basic templating working
2021-01-05 21:46:24 +01:00
vabene1111
566eea1d75
Merge pull request #277 from l0c4lh057/master
...
Improve text to ingredient parsing
2020-12-26 13:52:24 +01:00
vabene1111
592bd4f11e
fixed some english translations
2020-12-26 13:46:55 +01:00
Aaron
79396cec9e
switch from double to single quotes
2020-12-21 22:42:27 +01:00
Aaron
5e07c6130f
Switch to 4-space indentation
2020-12-21 20:14:32 +01:00
Aaron
94e1fdfbff
Improve text to ingredient parsing
...
The previous implementation of parsing ingredients was very simple. I now wrote a parser
that I would consider good. It takes care of several edge cases and notations.
- Supports fraction unicode (½, ¼, ⅜, ...)
- Supports notations like `1½` and `1 1/2`
- Supports unit directly after the amount without space inbetween (`2g`, `2½g`)
- Supports notes (`5g onion (cubed)` -> amount: 5, unit: g, ingredient: onion, note: cubed)
- Supports notes (`5g onion, cubed` -> amount: 5, unit: g, ingredient: onion, note: cubed)
- Does not break when both commas and brackets exist
2020-12-21 20:00:46 +01:00
vabene1111
4ec313f752
fixed another importer issue
2020-12-15 21:59:34 +01:00
vabene1111
dd07c56ede
fixed issue with new fraction importer
2020-12-15 21:52:56 +01:00
vabene1111
9ea90f1c87
fraction import
2020-12-14 19:56:21 +01:00
vabene1111
72bea14c3a
added sharing
2020-10-16 00:01:14 +02:00
vabene1111
cd46203d55
added permission classes for sharing + tests
2020-10-15 23:41:38 +02:00
vabene1111
312c364797
fixed wrongly changed permission check order
2020-09-22 12:19:30 +02:00
vabene1111
678cfaca12
fixed several shopping list issues
2020-09-22 12:01:11 +02:00
vabene1111
0b948618f3
improved website parser
2020-08-26 11:37:59 +02:00
vabene1111
4ffc4dc248
updates german translation
2020-07-15 19:26:41 +02:00
vabene1111
e0dac67b84
fixed recipe api permissions when using shared recipes
2020-07-14 00:22:39 +02:00
vabene1111
5bad507845
fixed and improved URL import
2020-07-05 21:11:25 +02:00
vabene1111
8b814669af
fixed API permission denied error
...
forgot a return in the custom permissions wich prevent authorized useres to access certain endpoints
2020-06-25 23:23:12 +02:00
vabene1111
f685253645
renamed ingredient to food
2020-06-25 21:24:03 +02:00
vabene1111
2c5e44d73c
improved recipe parser, added tests, cleaned up resources
2020-06-24 21:22:23 +02:00
vabene1111
b6d98397b5
improved recipe import
2020-06-24 20:21:48 +02:00
vabene1111
752854028a
more recipe import fixes
2020-06-23 18:48:22 +02:00
vabene1111
73f2240763
fixed import error
2020-06-23 14:00:07 +02:00
vabene1111
5ed369ba69
recipe import unit/ingredeitn selection
2020-06-23 12:34:00 +02:00
vabene1111
98c278fe60
importing improvements
2020-06-23 11:04:49 +02:00
vabene1111
8594346488
basic importing working
2020-06-23 10:34:04 +02:00
vabene1111
f066b7097c
microdata import
2020-06-22 22:47:33 +02:00
vabene1111
71b41a9ca2
refactor json ld code into helper
2020-06-22 21:35:56 +02:00
vabene1111
14a5d43dc8
added complete test for user preference api
2020-06-17 14:33:55 +02:00
vabene1111
bea079dd05
further permission cleanup
2020-06-17 13:23:04 +02:00
vabene1111
df8170fa55
improved permission handlin
2020-06-17 13:18:28 +02:00
vabene1111
4ee5a4fd9f
testing with user permission
2020-06-17 11:06:08 +02:00
vabene1111
d012385088
WIP api stuff
2020-06-16 20:32:41 +02:00
vabene1111
dee7249347
added sharing links and appropriate tests
2020-06-16 11:23:58 +02:00
vabene1111
1617fa7a3f
fixed permissions comments, books
2020-04-27 16:50:05 +02:00
vabene1111
ad467fae28
added basic group permission system
2020-04-26 17:21:44 +02:00
vabene1111
c7046bc705
fixed markdown urlize
2020-04-26 15:52:07 +02:00
vabene1111
a9952b8f57
improved markdown rendering of tables and images
2020-02-28 21:53:27 +01:00
vabene1111
7d4630e3af
normalized ingredients
2020-02-16 23:22:44 +01:00
vabene1111
f77aa7c8f0
migrating ingredients
2020-02-16 23:12:16 +01:00
vabene1111
a2348f531b
basics of ingredient unit normalization
2020-01-30 12:26:47 +01:00
vabene1111
7449380434
meal plan WIP
2020-01-17 16:02:14 +01:00
vabene1111
53ee5b8124
dal ingredient endpoint
2019-11-19 21:16:31 +01:00
vabene1111
2114ed037a
refactored storage backend
2019-11-14 10:29:24 +01:00
vabene1111
be32b3f63e
share link fixed
2018-06-07 00:29:00 +02:00
vabene1111
8b6f7bd7cb
fixed link creation and updated model
2018-06-06 23:31:47 +02:00
vabene1111
2e2144a9e3
added file id
2018-06-06 23:05:22 +02:00
vabene1111
4871b6194c
storage backend reworked
2018-05-25 16:49:10 +02:00
vabene1111
9b2d2bea4d
renamed models + new migrations + initial data
2018-05-06 23:50:40 +02:00
vabene1111
4be125353f
import
2018-05-06 21:33:24 +02:00
vabene1111
eac41d6869
basic multiselect working
2018-03-31 11:29:18 +02:00
vabene1111
b7fb7e8e9b
basic import management page
2018-03-30 23:56:49 +02:00
vabene1111
e09b4d3074
sync working
2018-03-30 23:37:31 +02:00
vabene1111
ede7ddac0b
modal + link caching
2018-02-05 23:18:57 +01:00
vabene1111
eea37b9af5
stuff working
2018-02-05 21:12:29 +01:00
vabene1111
35d8d50861
dropbox integration stuff
2018-02-05 19:57:32 +01:00
