vabene1111
|
9adc1f7266
|
small fixes and tests
|
2022-04-22 22:27:17 +02:00 |
|
vabene1111
|
1740913a14
|
improve experience when importing multiple recipes
|
2022-04-22 20:19:39 +02:00 |
|
vabene1111
|
3cf0395a18
|
lots of small fixes
|
2022-04-22 19:26:49 +02:00 |
|
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 |
|
Kaibu
|
45a86a22e3
|
recipe switcher and navbar fixes
also added left_hand to global preferences
|
2022-04-18 14:13:23 +02:00 |
|
vabene1111
|
f0d59a8c9c
|
added ability to open ingredient editor from food/unit list
|
2022-04-17 22:43:33 +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
|
48e9f3f8a9
|
added cookmate importer
|
2022-04-04 22:49:50 +02:00 |
|
vabene1111
|
85aad42529
|
added mela recipes importer
|
2022-04-04 21:09:47 +02:00 |
|
vabene1111
|
e901c6708c
|
Merge branch 'develop' into feature/importer_to_vue
|
2022-03-15 13:02:10 +01:00 |
|
vabene1111
|
4cf8b72e3f
|
removed OT from sle
|
2022-03-15 12:50:41 +01:00 |
|
vabene1111
|
96bd66f9e6
|
fixed telegram bot
|
2022-03-15 11:48:12 +01:00 |
|
vabene1111
|
5627161c5e
|
Merge branch 'develop' into feature/importer_to_vue
|
2022-03-10 15:27:11 +01:00 |
|
Cameron Grant
|
53518f4c47
|
Fixed typos and grammatical issues.
|
2022-03-08 12:12:20 -08: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
|
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
|
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
|
c8dcca8630
|
fix recipe search in export form (converted to change safe genericAPI)
|
2022-02-23 17:24:06 -06:00 |
|
smilerz
|
a7d66fa850
|
export recipes from saved filter
|
2022-02-22 15:18:39 -06:00 |
|
vabene1111
|
52c16ab7dd
|
all types bascially working (lacking bookmark)
|
2022-02-22 17:00:30 +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
|
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
|
55b035eaaa
|
first boilerplate for new import view
|
2022-02-19 09:34:42 +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
|
4e8bbefc17
|
minor cleanup
|
2022-02-15 06:42:57 -06:00 |
|
smilerz
|
19708dbc64
|
paste list of ingredients
|
2022-02-14 17:28:16 -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
|
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 |
|
vabene1111
|
39ca3ac1ad
|
no system page for non superuser
|
2022-02-07 13:08:18 +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
|
d45e3b8e60
|
some tweaks for new exporter
|
2022-02-03 18:00:02 +01: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 |
|
vabene1111
|
d01cb26c4a
|
length filter for add to old shopping list
|
2022-02-03 15:46:59 +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 |
|
vabene1111
|
ba1f10cd3a
|
Merge branch 'develop' into facet-fix
|
2022-01-18 07:59:32 +01:00 |
|
smilerz
|
4e0cc34d41
|
better fix for counting facets
|
2022-01-17 17:18:43 -06:00 |
|
vabene1111
|
54721a0a62
|
also added space to bot
|
2022-01-17 22:37:14 +01:00 |
|
vabene1111
|
d04e9518cb
|
fixed telegram shopping bot
|
2022-01-17 22:13:36 +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
|
16b357e11e
|
Added printReady selector
|
2022-01-08 14:44:28 -05:00 |
|
Tiago Rascazzi
|
7c48c13dce
|
Added export from url args
|
2022-01-08 13:37:26 -05:00 |
|
Tiago Rascazzi
|
9c873127a5
|
Added loading page
|
2022-01-08 11:07:33 -05:00 |
|
vabene1111
|
d506952602
|
small PDF export tweaks
|
2022-01-07 10:55:27 +01:00 |
|
vabene1111
|
0a6abf9688
|
Merge pull request #1211 from TiagoRascazzi/develop
Added Saffron and PDF export format
|
2022-01-07 10:31:13 +01: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 |
|
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 |
|
Tiago Rascazzi
|
578154510b
|
Merge shopping_list develop
|
2022-01-04 13:19:34 -05:00 |
|
Tiago Rascazzi
|
0aafd8d8b2
|
Added Saffron export format
|
2022-01-03 13:28:21 -05:00 |
|
Tiago Rascazzi
|
ba032e9353
|
Added PDF export format
|
2022-01-03 00:58:02 -05:00 |
|
smilerz
|
582e145a9f
|
Fix after rebase
|
2021-12-30 13:55:38 -06:00 |
|
smilerz
|
79b4bc387e
|
change ingore_inherit to inherit_fields
|
2021-12-30 12:54:39 -06:00 |
|
vabene1111
|
bddaa77f71
|
fixed space not honourd in invite link
|
2021-12-30 17:37:10 +01:00 |
|
smilerz
|
e257a8d29b
|
fix responsive display of shopping list
|
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
|
1364f75f21
|
test userpreference food_inherit defaults
|
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
|
ab968f225b
|
test recent shopping list
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
24b0643765
|
copy shopping as markdown
|
2021-12-28 12:03:34 -06:00 |
|
smilerz
|
0693d31550
|
WIP
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
1d224d8658
|
yarn build
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
2b41fbc9f8
|
Fix after rebase
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
b92c027919
|
food inherit tests
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
94b2e9b01c
|
minor updates
|
2021-12-28 12:03:33 -06:00 |
|
smilerz
|
f245aa8b4f
|
add to shopping from card context menu
|
2021-12-28 12:03:32 -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
|
7a0b395107
|
alpha shopping list
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
7c598720d0
|
WIP
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
fbe748db62
|
food inherit attributes
|
2021-12-28 12:03:32 -06:00 |
|
smilerz
|
c5c76cadea
|
getUserPreference available for all UserPreferences
|
2021-12-28 12:03:31 -06:00 |
|
smilerz
|
10a33add75
|
Fix after rebase
|
2021-12-28 12:03:31 -06:00 |
|
vabene1111
|
3ff15b6766
|
added copy me that importer
|
2021-12-23 15:54:48 +01:00 |
|
smilerz
|
3516505dd1
|
fix bug in get_facet_api
|
2021-12-16 09:08:32 -06:00 |
|
vabene1111
|
3bc1daa72e
|
fixed import
|
2021-11-30 18:48:07 +01:00 |
|
vabene1111
|
4d2e7eadb6
|
Merge branch 'develop' into generic_modal_v2
|
2021-11-30 17:23:27 +01:00 |
|
vabene1111
|
7c985cec23
|
Merge pull request #1088 from smilerz/search_troubleshooting
add search debug
|
2021-11-30 17:21:40 +01:00 |
|
vabene1111
|
7f22e0a275
|
fixed duplicate results on cook book view api
|
2021-11-27 16:03:08 +01:00 |
|
smilerz
|
55a0304700
|
add search debug
|
2021-11-24 12:10:15 -06:00 |
|
smilerz
|
5b6dd62f8e
|
generic modal refactored
|
2021-11-23 19:18:10 -06:00 |
|
vabene1111
|
695cab29a1
|
fixed book sharing and added step page
|
2021-11-14 15:33:25 +01:00 |
|
vabene1111
|
5ae440d5c9
|
fixed image on url importer
|
2021-11-13 12:30:23 +01:00 |
|
vabene1111
|
dda2529f6f
|
fixed plan share space filter
|
2021-11-05 19:42:41 +01:00 |
|
vabene1111
|
d681e3ced3
|
disable external recipes in hosted version
|
2021-11-04 15:56:22 +01:00 |
|
vabene1111
|
1fad1d2b8f
|
improved deletion of recipes
|
2021-11-04 12:27:21 +01:00 |
|
vabene1111
|
c9bd3ccae8
|
Merge branch 'develop' into feature/kilojoules
|
2021-11-01 09:46:04 +01:00 |
|
Kaibu
|
31720927b1
|
deprecated old meal plan
|
2021-10-31 18:08:37 +01:00 |
|
vabene1111
|
2a682892c6
|
fixed importing of tags
|
2021-10-26 14:51:37 +02:00 |
|
xeals
|
b1b770c9e5
|
Add KJ user preference
|
2021-10-25 17:25:35 +11:00 |
|
vabene1111
|
70df8a5ffd
|
show better error message when recipe deletion breaks due to constraints
|
2021-10-19 18:22:18 +02:00 |
|
vabene1111
|
54a2a45959
|
completed migration of file view to generic model list
|
2021-10-14 11:20:30 +02:00 |
|
vabene1111
|
1b1945d954
|
started migrating file editor page to generic model list
|
2021-10-13 15:03:59 +02:00 |
|
smilerz
|
613b618533
|
ExtendedRecipeMixin
|
2021-10-05 06:28:25 -05:00 |
|
vabene1111
|
64b2e21747
|
Merge branch 'develop' into draggable_pill_update
|
2021-10-01 07:53:35 +00:00 |
|
vabene1111
|
e8ce040df6
|
Merge pull request #920 from smilerz/sort_tree
Sort tree enhancements
|
2021-10-01 07:48:47 +00:00 |
|
smilerz
|
96d7cc42a5
|
fix automation in url_import
|
2021-09-30 15:34:28 -05:00 |
|
smilerz
|
17cedf17b5
|
stubbed out new shopping list
|
2021-09-30 14:56:59 -05:00 |
|
vabene1111
|
20db5cfd74
|
search presets
|
2021-09-30 13:46:49 +02:00 |
|
vabene1111
|
856c34a3bf
|
fixed and expanded on trigram search
|
2021-09-28 19:12:51 +02:00 |
|
smilerz
|
658e04addb
|
make node_sort_order an .env variable
|
2021-09-28 11:39:15 -05:00 |
|
smilerz
|
b3cffa4a38
|
cached facet results
|
2021-09-26 16:44:12 -05:00 |
|
vabene1111
|
b949fe6a90
|
removed some deprecated stuff
|
2021-09-23 15:19:10 +02:00 |
|
vabene1111
|
2012ef9e46
|
fixed wrong assignment in automation processing
|
2021-09-21 16:19:53 +02:00 |
|
vabene1111
|
a7dc23194e
|
converted ingredient parser to class and added automation beta hint
|
2021-09-16 17:52:11 +02:00 |
|
vabene1111
|
ecd300d2db
|
Merge pull request #907 from smilerz/performance
Performance
|
2021-09-16 12:37:58 +02:00 |
|
smilerz
|
7a01e8b1d3
|
fix tests
|
2021-09-15 17:19:04 -05:00 |
|
smilerz
|
aa6b8be647
|
removed node sort on trees and added better indexes
|
2021-09-15 16:28:07 -05:00 |
|
vabene1111
|
c296678eb2
|
implemented automation on deprecated method
|
2021-09-15 17:20:44 +02:00 |
|
vabene1111
|
d6f7aade46
|
basics for automation
|
2021-09-15 13:07:25 +02:00 |
|
vabene1111
|
94e357f4f6
|
cookbookapp importer
|
2021-09-15 10:26:31 +02:00 |
|
Kaibu
|
d9300a9a90
|
meal planner refactor progress
|
2021-09-14 23:16:33 +02:00 |
|
vabene1111
|
70f96d3fe6
|
plan to eat importer
|
2021-09-14 22:47:26 +02:00 |
|
vabene1111
|
26f9d25bd2
|
fixed some integration issues
|
2021-09-14 20:31:41 +02:00 |
|
vabene1111
|
bbc6015898
|
Merge branch 'pr/891' into develop
|
2021-09-13 22:11:41 +02:00 |
|
smilerz
|
85aca8acf6
|
shopping_list_category
|
2021-09-13 14:30:03 -05:00 |
|
vabene1111
|
c1161edc6d
|
build
|
2021-09-13 21:24:41 +02:00 |
|
vabene1111
|
6350d0e9c5
|
Merge branch 'feature/recipe-edit-vue' into develop
# Conflicts:
# vue/vue.config.js
# vue/webpack-stats.json
|
2021-09-13 21:14:45 +02:00 |
|
vabene1111
|
234e27c4c1
|
recipe editor
|
2021-09-13 21:13:43 +02:00 |
|
Kaibu
|
8b09777b2c
|
Merge branch 'feature/books_refactor' into develop
# Conflicts:
# vue/webpack-stats.json
|
2021-09-13 19:30:13 +02:00 |
|
vabene1111
|
4fbf080e2f
|
basics
|
2021-09-13 12:39:29 +02:00 |
|
Kaibu
|
9bdcf09f60
|
started reworking books
|
2021-09-08 16:15:33 +02:00 |
|
vabene1111
|
2df8ed8e80
|
filter distinct on some queries with shared models
|
2021-09-08 15:58:27 +02:00 |
|
vabene1111
|
68b64ba8e2
|
Merge branch 'pr/865' into develop
|
2021-09-08 09:42:16 +02:00 |
|
vabene1111
|
b3477332e7
|
Merge pull request #866 from smilerz/log_pagination
implemented pagination on Log apis
|
2021-09-08 09:32:51 +02:00 |
|
smilerz
|
4d27a80cd5
|
implemented pagination on Log apis
|
2021-09-07 07:35:17 -05:00 |
|
smilerz
|
c9d1a9b551
|
finished unit page
|
2021-09-06 14:00:32 -05:00 |
|
smilerz
|
7053a857c2
|
reworked MergeMixin to handle non-trees
|
2021-09-06 10:45:16 -05:00 |
|
smilerz
|
f12558951a
|
moved keyword Vue to generic components
|
2021-09-05 16:26:01 -05:00 |
|
smilerz
|
638dd96812
|
finished making FoodList completely generic
|
2021-09-05 14:15:58 -05:00 |
|
smilerz
|
d33a49538e
|
Squashed commit of the following:
|
2021-09-05 11:18:57 -05:00 |
|
smilerz
|
d1556f69c2
|
WIP
|
2021-09-05 11:17:28 -05:00 |
|
smilerz
|
ab316236f9
|
allow deleting of Food part of Ingredient, but not recipe
|
2021-09-05 10:10:42 -05:00 |
|
smilerz
|
b147c975b8
|
post food_tree bug fixing
|
2021-09-04 16:41:57 -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
|
65fbbabec5
|
finished food view
|
2021-08-31 14:58:41 -05:00 |
|
smilerz
|
a1d1cbac5d
|
refactored Generic API
|
2021-08-31 14:58:40 -05:00 |
|
smilerz
|
ba07e98cae
|
Squashed commit of the following:
commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 21:27:31 2021 -0500
fix #883
commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 21:08:35 2021 -0500
consolidated recently viewed into FTS queryset
commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 16:43:52 2021 -0500
fixed cookie reactivity
commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 16:37:43 2021 -0500
exact match appears first on keyword/food/unit searches
commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date: Wed Aug 25 16:36:14 2021 -0500
add pagination reset on search query change
|
2021-08-31 14:58:40 -05:00 |
|
smilerz
|
4714162c0b
|
WIP
|
2021-08-31 14:58:40 -05:00 |
|
smilerz
|
44aa05fe5c
|
Fix after rebase
|
2021-08-31 14:58:39 -05:00 |
|
smilerz
|
d606ea8db3
|
moved food and keyword to generic cards
|
2021-08-31 14:58:39 -05:00 |
|
smilerz
|
aba2e66163
|
passed all tests
|
2021-08-31 14:58:39 -05:00 |
|
smilerz
|
0559143f0e
|
initial Vue components
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
a605113b00
|
abstract merge function to handle all related models
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
24a575c2d5
|
food to tree (model, api, serializer)
|
2021-08-31 14:58:38 -05:00 |
|
smilerz
|
2808e3033d
|
fixes keyword filter on OR search
|
2021-08-31 14:58:38 -05:00 |
|
vabene1111
|
7bab07bdaf
|
search filter fix
|
2021-08-31 10:09:39 +02:00 |
|
smilerz
|
7e9a8d4d86
|
test case to detect 833
|
2021-08-26 21:56:59 -05:00 |
|
smilerz
|
2a1e1953ee
|
consolidated recently viewed into FTS queryset
|
2021-08-25 21:08:35 -05:00 |
|
smilerz
|
b74fdb3825
|
exact match appears first on keyword/food/unit searches
|
2021-08-25 16:37:43 -05:00 |
|
smilerz
|
78ebd18ed8
|
fixes keyword filter on OR search
|
2021-08-24 22:01:02 -05:00 |
|
vabene1111
|
4b3fa1a4b5
|
fixed imports
|
2021-08-22 13:39:53 +02:00 |
|
vabene1111
|
31cb9e283a
|
Merge branch 'develop' into feature/fulltext-search
# Conflicts:
# cookbook/static/vue/js/chunk-vendors.js
# cookbook/static/vue/js/import_response_view.js
# cookbook/static/vue/js/offline_view.js
# cookbook/static/vue/js/recipe_search_view.js
# cookbook/static/vue/js/recipe_view.js
# cookbook/static/vue/js/supermarket_view.js
# cookbook/static/vue/js/user_file_view.js
# requirements.txt
# vue/src/apps/RecipeSearchView/RecipeSearchView.vue
# vue/src/components/GenericMultiselect.vue
# vue/src/locales/en.json
|
2021-08-22 13:28:57 +02:00 |
|
vabene1111
|
43dbb1d973
|
Merge branch 'search_and_keywords' of https://github.com/smilerz/recipes into smilerz-search_and_keywords
# Conflicts:
# cookbook/admin.py
# cookbook/helper/recipe_search.py
# cookbook/integration/chowdown.py
# cookbook/integration/integration.py
# cookbook/management/commands/rebuildindex.py
# cookbook/managers.py
# cookbook/migrations/0142_build_full_text_index.py
# cookbook/models.py
# cookbook/schemas.py
# cookbook/serializer.py
# cookbook/static/vue/css/keyword_list_view.css
# cookbook/static/vue/js/chunk-vendors.js
# cookbook/static/vue/js/keyword_list_view.js
# cookbook/tests/api/test_api_keyword.py
# cookbook/views/api.py
# cookbook/views/data.py
# cookbook/views/views.py
# recipes/settings.py
# vue/package.json
# vue/src/apps/KeywordListView/KeywordListView.vue
# vue/src/components/KeywordCard.vue
# vue/src/locales/en.json
# vue/src/utils/openapi/api.ts
# vue/yarn.lock
|
2021-08-22 13:14:23 +02:00 |
|
smilerz
|
080b4d328d
|
review feedback incorporated
|
2021-08-16 09:31:02 -05:00 |
|
smilerz
|
ed49f19fe9
|
fixed url_import
|
2021-08-14 07:55:22 -05:00 |
|
smilerz
|
7b4123462d
|
ran and fixed tests
|
2021-08-13 15:22:22 -05:00 |
|
smilerz
|
170673f467
|
hierarchical keyword filtering in recipe search
|
2021-08-13 09:58:02 -05:00 |
|
smilerz
|
2da0f5c478
|
keyword update, tests sqlite and PG
|
2021-07-30 14:00:09 -05:00 |
|
smilerz
|
2f91c2f86e
|
Fix after rebase
|
2021-07-29 16:38:33 -05:00 |
|