vabene1111
|
30e4ee855c
|
switch space method signature change and test
|
2022-06-09 18:18:57 +02:00 |
|
vabene1111
|
d5b7d440fe
|
fixed user preference api endpoint
|
2022-06-08 17:48:23 +02:00 |
|
vabene1111
|
e368488933
|
deprecated all old vue stuff and working on tests
|
2022-06-07 20:08:32 +02:00 |
|
vabene1111
|
e2b887b449
|
lots of fixes and stuff
|
2022-06-06 18:21:15 +02:00 |
|
vabene1111
|
ded092ed23
|
baiscs of space edit page
|
2022-05-31 21:52:59 +02:00 |
|
vabene1111
|
007b7294d9
|
join and leave spaces
|
2022-05-31 20:38:53 +02:00 |
|
vabene1111
|
151461508f
|
multi space membership basics
|
2022-05-31 17:38:12 +02:00 |
|
vabene1111
|
cac72df7ba
|
refactored recipe from source endpoint
|
2022-05-31 15:22:27 +02:00 |
|
vabene1111
|
0fe06cf2df
|
fixed random search ordering
|
2022-05-18 15:54:02 +02:00 |
|
vabene1111
|
f872f994f1
|
fixed import failure with leading commas in input strings
|
2022-05-18 15:29:03 +02:00 |
|
Daniel Schulz
|
2a7475c435
|
Call scrape_me first when scraping from url
|
2022-05-10 00:08:37 +02:00 |
|
vabene1111
|
8f4c00df0b
|
use old property as other sometimes fails
|
2022-05-02 15:52:15 +02:00 |
|
vabene1111
|
825b7b7cf9
|
ingredient editor and parser
|
2022-04-23 19:58:40 +02:00 |
|
vabene1111
|
b9fb78c24d
|
Merge pull request #1739 from ndbeals/develop
Fix image upload handler to use content-type
|
2022-04-23 19:55:08 +02:00 |
|
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 |
|
Nathan Beals
|
2af36a3db4
|
Merge branch 'develop' of github.com:ndbeals/tandoor_recipes into develop
|
2022-04-23 00:11:08 -04:00 |
|
Nathan Beals
|
8df3009cb2
|
Update image upload handler to be content-type aware
Update handle_image: made filetype required and not optional
Updated handle_image usage to reflect changes
|
2022-04-23 00:11:04 -04: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 |
|
Chris Scoggins
|
04c4182b24
|
WIP
|
2022-02-03 12:14:42 -06:00 |
|
Chris Scoggins
|
583aee204e
|
fix view recipes in Model View
|
2022-02-03 12:14:18 -06:00 |
|
Chris Scoggins
|
c45bf3a994
|
WIP
|
2022-02-03 12:14:17 -06:00 |
|
Chris Scoggins
|
07d5ead128
|
load RecipeFilter cookbook entries
|
2022-02-03 12:14:04 -06:00 |
|
Chris Scoggins
|
fcb8e520b7
|
WIP
|
2022-02-03 12:11:32 -06:00 |
|
Chris Scoggins
|
5959914932
|
makenow filter
|
2022-02-03 12:11:32 -06:00 |
|
Chris Scoggins
|
8d78d15e21
|
implement sort order via API
|
2022-02-03 12:09:32 -06:00 |
|
Chris Scoggins
|
d0549bcb6d
|
complex book filters
|
2022-02-03 12:07:51 -06:00 |
|
Chris Scoggins
|
5e36bd0c27
|
complex food filters
|
2022-02-03 12:07:51 -06:00 |
|
Chris Scoggins
|
28d3d8a1e0
|
complex keyword filters
|
2022-02-03 12:07:50 -06:00 |
|
Chris Scoggins
|
bb226a221e
|
WIP
|
2022-02-03 12:07:14 -06:00 |
|
smilerz
|
ab68a60480
|
WIP
|
2022-02-03 12:04:10 -06:00 |
|
Chris Scoggins
|
e00794bbdf
|
review shopping list in MealPlan modal
|
2022-01-29 14:10:14 -06:00 |
|
Chris Scoggins
|
a7796cbf5c
|
fix shopping list sharing
|
2022-01-29 11:59:06 -06:00 |
|
Chris Scoggins
|
e2f8f29ec8
|
refactor list_from_recipe as class RecipeShoppingEditor
|
2022-01-29 10:28:01 -06:00 |
|
Chris Scoggins
|
8d424d668d
|
fix #1426
|
2022-01-27 16:46:46 -06:00 |
|
Chris Scoggins
|
47823132f0
|
add ignore_shopping && additional help
|
2022-01-26 12:57:29 -06:00 |
|
Sebastian Weber
|
c20e982fb1
|
Fix typos
|
2022-01-20 00:50:41 +01:00 |
|
smilerz
|
530b1a8986
|
fix sort by new
|
2022-01-19 08:39:40 -06:00 |
|
smilerz
|
2a13a341dd
|
enable/disable treeselect
|
2022-01-18 08:17:54 -06:00 |
|
smilerz
|
4e0cc34d41
|
better fix for counting facets
|
2022-01-17 17:18:43 -06:00 |
|
smilerz
|
cc5be844d5
|
force list params to list
|
2022-01-17 13:13:26 -06:00 |
|
smilerz
|
85ecac3a17
|
Update recipe_search.py
|
2022-01-17 10:10:38 -06:00 |
|
smilerz
|
37971acb48
|
refactor recipe search
|
2022-01-17 08:26:34 -06:00 |
|
smilerz
|
e313481fc8
|
WIP
|
2022-01-13 16:00:59 -06:00 |
|
smilerz
|
3aa7f6a367
|
Merge branch 'develop' into feature/custom_filters
|
2022-01-13 14:41:53 -06:00 |
|
smilerz
|
8b1233be62
|
facets cache-only on initial load
|
2022-01-13 12:02:28 -06:00 |
|
smilerz
|
798aa7f179
|
detect empty queryset
|
2022-01-12 16:55:39 -06:00 |
|
smilerz
|
22953b0591
|
trees in recipe search loaded asynchronously
|
2022-01-12 16:21:36 -06:00 |
|
smilerz
|
20d61160ba
|
refactor get_facets as RecipeFacets class
|
2022-01-12 12:21:28 -06:00 |
|
smilerz
|
f7cb067b52
|
construct values in queryset instead of serializer methods
|
2022-01-11 07:24:59 -06:00 |
|
smilerz
|
25ccea90e0
|
WIP
|
2022-01-10 15:05:56 -06:00 |
|
vabene1111
|
6053b1419c
|
fixed undefined var
|
2022-01-06 16:57:17 +01:00 |
|
vabene1111
|
5c98f06208
|
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
|
2022-01-06 16:34:53 +01:00 |
|
vabene1111
|
c141dc850f
|
Merge pull request #1245 from TandoorRecipes/fix_scopes_subfolder
added prefix to request.path.startswith() conditionals
|
2022-01-06 16:30:27 +01:00 |
|
vabene1111
|
063a0dec24
|
Merge branch 'master' into develop
# Conflicts:
# requirements.txt
|
2022-01-06 16:08:06 +01:00 |
|
smilerz
|
6a1fcabae0
|
added prefix to request.path.startswith() conditionals
|
2022-01-06 07:37:02 -06:00 |
|
smilerz
|
13115a1e53
|
fixes 1176
|
2022-01-05 17:49:38 -06:00 |
|
smilerz
|
2c76fb7b69
|
make food onhand when complete shopping entry
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
214db80dac
|
add category context menu
|
2022-01-05 15:20:10 -06:00 |
|
smilerz
|
3fafd43e58
|
merge ignore shopping with onhand
|
2021-12-29 16:32:19 -06:00 |
|
smilerz
|
63fe174070
|
fix add to shopping from MealPlan Modal
|
2021-12-28 12:03:35 -06:00 |
|
smilerz
|
453b1eb5b9
|
rebase and fixes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
ee4ab41c1c
|
test shoppingFood API
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
3047c09e55
|
test rest food inheritance
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
35e81f6247
|
update
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
a51eb7a2cb
|
pytest edit shopping list recipes
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
262387da3e
|
pytest shopping list from recipe methods
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
0693d31550
|
WIP
|
2021-12-28 12:03:33 -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
|
7c598720d0
|
WIP
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
f400c7cd7c
|
shopping line item
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
e243e089cc
|
WIP
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
10a33add75
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
5d33d82d70
|
fixes 1129
|
2021-12-23 07:38:30 -06:00 |
|
vabene1111
|
5941022b5e
|
fixed markdown table extension
|
2021-12-15 17:46:01 +01:00 |
|
vabene1111
|
7c985cec23
|
Merge pull request #1088 from smilerz/search_troubleshooting
add search debug
|
2021-11-30 17:21:40 +01:00 |
|
vabene1111
|
57a967b91d
|
fixed view log user filter
|
2021-11-30 16:07:31 +01:00 |
|
smilerz
|
55a0304700
|
add search debug
|
2021-11-24 12:10:15 -06:00 |
|
vabene1111
|
3fe5340592
|
updated middleware
|
2021-11-18 16:43:44 +01:00 |
|
vabene1111
|
9233cb9cf9
|
fixed token auth request space variable
|
2021-11-18 13:08:29 +01:00 |
|
vabene1111
|
695cab29a1
|
fixed book sharing and added step page
|
2021-11-14 15:33:25 +01:00 |
|
vabene1111
|
9ae076e426
|
fixed png scaling algortihm
|
2021-11-09 17:59:31 +01:00 |
|
vabene1111
|
f346022d8b
|
improved image compression and added it to import
|
2021-11-09 17:38:32 +01:00 |
|
vabene1111
|
4efed9a1d2
|
improved html importer instruction line break behavior
|
2021-11-01 11:27:19 +01:00 |
|
smilerz
|
e14e812c2d
|
a better fix
|
2021-10-04 16:18:21 -05:00 |
|
smilerz
|
ff96e87168
|
fix for #942
|
2021-10-01 14:21:50 -05:00 |
|
vabene1111
|
856c34a3bf
|
fixed and expanded on trigram search
|
2021-09-28 19:12:51 +02:00 |
|
smilerz
|
7eaeb0d03e
|
bug fix
|
2021-09-27 07:28:53 -05:00 |
|
smilerz
|
b3cffa4a38
|
cached facet results
|
2021-09-26 16:44:12 -05:00 |
|
vabene1111
|
766335425e
|
strip spaces from recipe query
|
2021-09-24 08:48:43 +02:00 |
|
vabene1111
|
293027a1b6
|
fixed sharing with new search system
|
2021-09-20 15:54:56 +02:00 |
|
vabene1111
|
f3593e8151
|
implemented rule processing in ingredient parser
|
2021-09-16 18:31:21 +02:00 |
|
vabene1111
|
a7dc23194e
|
converted ingredient parser to class and added automation beta hint
|
2021-09-16 17:52:11 +02:00 |
|
smilerz
|
aae3b679aa
|
filter by recipe
|
2021-09-09 18:55:47 -05:00 |
|
smilerz
|
249557f8ef
|
filter by rating
|
2021-09-09 15:23:46 -05:00 |
|
smilerz
|
7b3dee4595
|
fix food facets
|
2021-09-08 17:07:00 -05:00 |
|
vabene1111
|
68b64ba8e2
|
Merge branch 'pr/865' into develop
|
2021-09-08 09:42:16 +02:00 |
|
smilerz
|
c9d1a9b551
|
finished unit page
|
2021-09-06 14:00:32 -05:00 |
|
vabene1111
|
16d125a243
|
fixed search facets and sub recipe
|
2021-09-04 19:26:42 +02:00 |
|
vabene1111
|
b129753d4e
|
Merge branch 'develop' into keyword_todo
|
2021-09-04 18:30:49 +02:00 |
|
smilerz
|
ac08ede464
|
refactored genericAPI as ApiMixin
|
2021-09-01 12:28:33 -05:00 |
|
smilerz
|
70089998fe
|
Fix after rebase
|
2021-08-31 14:59:00 -05:00 |
|