Commit Graph

287 Commits

Author SHA1 Message Date
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