vabene1111
|
2ddb0c719a
|
Merge branch 'develop' into feature/importer_to_vue
# Conflicts:
# vue/src/apps/RecipeEditView/RecipeEditView.vue
# vue/src/utils/openapi/api.ts
|
2022-04-22 16:41:13 +02:00 |
|
vabene1111
|
3159868ba4
|
moved generic multiselect create function into component
|
2022-04-14 14:08:16 +02:00 |
|
vabene1111
|
7befa4a084
|
added basic ingredient editor
|
2022-04-14 13:01:27 +02:00 |
|
vabene1111
|
22ca482458
|
super very basics of manual mapping page working
|
2022-03-05 16:02:42 +01:00 |
|
vabene1111
|
2565ab30a4
|
lots of improvements and bookmarklet import working again
|
2022-03-05 15:16:58 +01:00 |
|
vabene1111
|
6d8fe3c162
|
wip
|
2022-03-04 15:54:11 +01:00 |
|
vabene1111
|
e04d672750
|
import with image working
|
2022-02-21 15:59:30 +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
|
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 |
|
vabene1111
|
7e5019eed3
|
fixed share write permission for meal plan
|
2022-02-17 14:57:28 +01: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
|
baa2aa51da
|
more recipe search tests
|
2022-02-09 16:18:45 -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 |
|
vabene1111
|
4c5994ee7f
|
Merge branch 'develop' into feature/custom_filters
# Conflicts:
# cookbook/serializer.py
# cookbook/views/api.py
# vue/src/utils/openapi/api.ts
|
2022-02-07 18:56:19 +01:00 |
|
vabene1111
|
969df37e28
|
fixed sharing and added additional tests
|
2022-02-07 15:43:06 +01: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
|
c45bf3a994
|
WIP
|
2022-02-03 12:14:17 -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
|
890e9e7242
|
created CustomFilter model and api
|
2022-02-03 12:09:14 -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 |
|
vabene1111
|
a3fa01d8d3
|
Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress
|
2022-02-03 15:59:18 +01:00 |
|
Chris Scoggins
|
f45e09a5a5
|
add units to search fields
|
2022-01-31 14:41:18 -06:00 |
|
Chris Scoggins
|
e00794bbdf
|
review shopping list in MealPlan modal
|
2022-01-29 14:10:14 -06:00 |
|
Chris Scoggins
|
e2f8f29ec8
|
refactor list_from_recipe as class RecipeShoppingEditor
|
2022-01-29 10:28:01 -06:00 |
|
vabene1111
|
a0892470e1
|
Merge branch 'feature/export-progress' into develop
|
2022-01-28 15:41:49 +01:00 |
|
smilerz
|
7104b5b109
|
sort SupermarketCategory queryset
fixes #1422
|
2022-01-26 17:31:22 -06:00 |
|
Chris Scoggins
|
2e2080d8d1
|
fix Recipe Counts on food/keyword/unit serializer
|
2022-01-25 16:48:30 -06:00 |
|
Sebastian Weber
|
c20e982fb1
|
Fix typos
|
2022-01-20 00:50:41 +01:00 |
|
smilerz
|
cc5be844d5
|
force list params to list
|
2022-01-17 13:13:26 -06:00 |
|
smilerz
|
dde350c8af
|
prettier cleanup
|
2022-01-17 08:35:19 -06:00 |
|
smilerz
|
37971acb48
|
refactor recipe search
|
2022-01-17 08:26:34 -06:00 |
|
smilerz
|
8b1233be62
|
facets cache-only on initial load
|
2022-01-13 12:02:28 -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
|
f9b04a3f1e
|
bug fix
|
2022-01-11 08:33:42 -06:00 |
|
smilerz
|
f7cb067b52
|
construct values in queryset instead of serializer methods
|
2022-01-11 07:24:59 -06:00 |
|
Tiago Rascazzi
|
9c873127a5
|
Added loading page
|
2022-01-08 11:07:33 -05:00 |
|
vabene1111
|
6c4b1e76eb
|
Merge pull request #1251 from smilerz/fail_connection_gracefully
ConnectError fail gracefully during URL import
|
2022-01-07 10:19:00 +01:00 |
|
vabene1111
|
5c98f06208
|
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
|
2022-01-06 16:34:53 +01:00 |
|
vabene1111
|
063a0dec24
|
Merge branch 'master' into develop
# Conflicts:
# requirements.txt
|
2022-01-06 16:08:06 +01:00 |
|
smilerz
|
b09acefa6a
|
fix 1244
|
2022-01-06 07:49:53 -06:00 |
|
smilerz
|
13115a1e53
|
fixes 1176
|
2022-01-05 17:49:38 -06:00 |
|