cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,199 Commits 2 Branches 0 Tags 57 MiB
8d24ae9008
Commit Graph

1936 Commits

Author SHA1 Message Date
vabene1111
e1056f9bbe Translated using Weblate (German) 
Currently translated at 97.5% (484 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-11-04 11:29:56 +00:00
vabene1111
1fad1d2b8f improved deletion of recipes 2021-11-04 12:27:21 +01:00
Kaibu
980dc48eb8 Merge branch 'develop_translate_backend' into develop 
# Conflicts:
#	vue/src/locales/de.json
 2021-11-04 11:24:18 +01:00
FrenchAnon
3b612f5c8a Translated using Weblate (French) 
Currently translated at 88.7% (440 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-11-04 09:06:29 +00:00
Kaibu
2215e06506 translation fixes 2021-11-03 21:34:18 +01:00
Kaibu
a40c8c3f83 added password reset from key templates 2021-11-03 20:44:36 +01:00
krial057
c40f6986f1
prepTime and workTime of CookbookApp not imported correctly 2021-11-01 18:01:05 +01:00
vabene1111
4efed9a1d2 improved html importer instruction line break behavior 2021-11-01 11:27:19 +01:00
vabene1111
9a10f866e1 Merge remote-tracking branch 'origin/develop' into develop 2021-11-01 11:10:45 +01:00
vabene1111
66794d619f improved cookbook app importer 2021-11-01 11:10:35 +01:00
Kaibu
bcbd5c1103 Translated using Weblate (German) 
Currently translated at 95.9% (476 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-11-01 08:47:19 +00: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
03cd85537d fixed exporter issue 2021-10-29 13:19:50 +02:00
vabene1111
6949e17a33 possibly fixed sub path hosting issues 2021-10-29 11:29:55 +02:00
vabene1111
78c48cc36b compiled messages and added russian language to selector 2021-10-26 14:52:48 +02:00
vabene1111
2a682892c6 fixed importing of tags 2021-10-26 14:51:37 +02:00
vabene1111
0091abd2c0 fixed typo 2021-10-26 14:51:30 +02:00
vabene1111
20cbc01bb3
Merge pull request #978 from smilerz/patch 
fix 977
 2021-10-26 14:35:14 +02:00
Jesse
8bf588fd34 Translated using Weblate (Dutch) 
Currently translated at 100.0% (496 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-10-26 10:06:21 +00:00
tarek EL SOL
9e3d874322 Translated using Weblate (French) 
Currently translated at 88.5% (439 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-10-26 10:06:21 +00:00
smilerz
a7608de961 fix 977 2021-10-25 11:59:30 -05:00
xeals
34d9f5a1d8
Correct capitalization for KJ in preference form 2021-10-25 17:46:05 +11:00
xeals
c9ff0543e3
Convert nutrition input from KJ to calories with preference 2021-10-25 17:37:31 +11:00
xeals
3d830a4449
Display nutritional energy in KJ with preference 2021-10-25 17:28:52 +11:00
xeals
b1b770c9e5
Add KJ user preference 2021-10-25 17:25:35 +11:00
rustam
e33daf7b3e Translated using Weblate (Russian) 
Currently translated at 8.8% (44 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/ru/
 2021-10-23 09:06:25 +00:00
Tomasz Klimczak
b4a5fee678 Translated using Weblate (Polish) 
Currently translated at 100.0% (362 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pl/
 2021-10-23 09:06:20 +00:00
rustam
f1d856dc72 Added translation using Weblate (Russian) 2021-10-21 20:20:14 +00:00
vabene1111
8363b1925c
Merge pull request #971 from vabene1111/feature/meal_plan_shopping 
Feature/meal plan shopping
 2021-10-21 20:36:44 +02:00
Kaibu
24c1bfa16f shopping and new nav for meal plan 2021-10-21 19:07:12 +02:00
vabene1111
ae12b8111d added debug info to system page 2021-10-20 17:51:23 +02:00
Marco Lütticke
9e3e81936b Translated using Weblate (German) 
Currently translated at 84.0% (417 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-10-20 12:06:19 +00:00
vabene1111
70df8a5ffd show better error message when recipe deletion breaks due to constraints 2021-10-19 18:22:18 +02:00
vabene1111
12b3d3a188 fixed shopping list decimal rounding 2021-10-19 17:03:24 +02:00
Kaibu
2e2b79c093 ical export and tooltips for new meal plan 2021-10-17 15:11:30 +02:00
vabene1111
c0972b1ca1 removed some unused dependencies 2021-10-14 11:27:43 +02:00
vabene1111
54a2a45959 completed migration of file view to generic model list 2021-10-14 11:20:30 +02:00
vabene1111
b214ed0825
Merge pull request #956 from smilerz/serializer_fix 
Update serializer.py
 2021-10-14 08:51:07 +02:00
smilerz
32289d2fdf
Update serializer.py 2021-10-13 20:06:50 -05:00
vabene1111
4324dd61cf Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-13 15:04:03 +02:00
vabene1111
1b1945d954 started migrating file editor page to generic model list 2021-10-13 15:03:59 +02:00
Hrachya Kocharyan
61e8920bf5 Translated using Weblate (Armenian) 
Currently translated at 100.0% (362 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/hy/
 2021-10-13 12:50:53 +00:00
Kaibu
4b1443a705 new meal type edit 2021-10-13 14:50:52 +02:00
vabene1111
38c0d01dc1 fixed old shopping list containing to many decimal places 2021-10-13 11:40:49 +02:00
vabene1111
b0411b986e removing build src files from repo and adding auto build 2021-10-13 10:23:34 +02:00
vabene1111
cae3a35926 added export to nav 2021-10-13 10:03:58 +02:00
vabene1111
22fd499213 build frontend 2021-10-12 18:23:53 +02:00
vabene1111
a7c80d65b1 overview for books 2021-10-12 17:13:43 +02:00
vabene1111
fe99324c38
Merge branch 'develop' into api_performance 2021-10-12 16:28:49 +02:00
vabene1111
9f1351c84a fixed app hook fix_tree 2021-10-11 16:51:41 +02:00
vabene1111
7aafd9829d updated translations 2021-10-11 16:30:12 +02:00
vabene1111
88a2255ed2 fixes 
translation
disabled note rendering when less than 15 characters
fixed step header rendering
fixed image in recipe edit on mobile layout
 2021-10-11 16:29:32 +02:00
Kaibu
37e45bea76 meal plan fixes 
- added translations
- form validation & tagging support for meal types
 2021-10-09 02:25:31 +02:00
vabene1111
f845acded7
Merge pull request #945 from wisdomkhan/wisdomkhan-tandoor-translate-link 
Added link for Tandoor Translate
 2021-10-08 19:11:46 +02:00
vabene1111
15b722345b importer tweaks and default tree sort setting 2021-10-08 10:20:42 +02:00
vabene1111
08ea6268e4 Translated using Weblate (German) 
Currently translated at 82.2% (408 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-10-07 19:06:15 +00:00
vabene1111
053508821f rebuild again 2021-10-06 20:16:29 +02:00
vabene1111
a870ff9325 Merge branch 'beta' into develop 
# Conflicts:
#	cookbook/static/vue/js/checklist_view.js
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/cookbook_view.js
#	cookbook/static/vue/js/edit_internal_recipe.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/meal_plan_view.js
#	cookbook/static/vue/js/model_list_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
#	cookbook/templates/sw.js
 2021-10-06 20:14:35 +02:00
vabene1111
ede7925203 compiled javascript 2021-10-06 20:13:36 +02:00
vabene1111
f6a9d11e3f compiled translations 2021-10-06 20:10:41 +02:00
vabene1111
e952313fec
Merge pull request #948 from smilerz/new_user_fix 
minor change on recent recipe search
 2021-10-06 07:57:02 +02:00
smilerz
613b618533 ExtendedRecipeMixin 2021-10-05 06:28:25 -05:00
smilerz
e14e812c2d a better fix 2021-10-04 16:18:21 -05:00
Tomasz Klimczak
b25d1b648e Translated using Weblate (Polish) 
Currently translated at 100.0% (362 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pl/
 2021-10-02 12:25:51 +00:00
Jesse
85f0ae36cf Translated using Weblate (Dutch) 
Currently translated at 100.0% (496 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-10-02 12:25:51 +00:00
Mohammad Asim Khan
4f435748a7
Added link for Tandoor Translate 2021-10-02 17:24:46 +05:30
vabene1111
93550e2a61
Merge pull request #943 from smilerz/new_user_fix 
fix for #942
 2021-10-02 09:15:40 +02:00
smilerz
ff96e87168 fix for #942 2021-10-01 14:21:50 -05:00
vabene1111
823c5d3975 fixed model list view error for unpaginated lists 2021-10-01 18:55:16 +02:00
vabene1111
d510b521af updated nav 2021-10-01 18:45:59 +02:00
vabene1111
4e78b21ee4 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-10-01 18:39:54 +02:00
vabene1111
0de87cf38d compiled translations IT and PL 2021-10-01 18:39:50 +02:00
vabene1111
b6d878e885 fixed model list error 2021-10-01 18:34:30 +02:00
vabene1111
26ef66f4e1 moved fix tree to apps ready hook and wrapped in catch for non existing models 2021-10-01 15:58:16 +02:00
vabene1111
4ba4eec238 fixed ci and rebuild files 2021-10-01 12:44:37 +02:00
Tomasz Klimczak
76ca27dc5a Translated using Weblate (Polish) 
Currently translated at 73.4% (266 of 362 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pl/
 2021-10-01 07:54:47 +00: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
9bbbd72285 catch IntegrityError caused by mis-sorted tree 2021-09-30 16:17:08 -05: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
smilerz
a140813a67 made add button on ModelList larger 2021-09-30 10:33:47 -05:00
vabene1111
20db5cfd74 search presets 2021-09-30 13:46:49 +02:00
Kaibu
b61512da77 meal plan refactor progress 
- added paginated loading
- tab panes
- default meal type selection
- image placeholder
- drang and drop delete area
 2021-09-30 02:33:40 +02:00
smilerz
d1bed45eb6 added grip indication to supermarket category pills 2021-09-29 16:42:19 -05:00
vabene1111
71a13d33fe update javascript 2021-09-29 15:39:34 +02:00
vabene1111
12afb3eaa6 added search defaults mimicing old search behavior 2021-09-29 09:04:46 +02:00
smilerz
b7b0b9c690 fixed wsgi error 2021-09-28 15:45:54 -05:00
smilerz
39255c93a5 allow admin to enable/disable sorting 2021-09-28 12:51:49 -05:00
vabene1111
856c34a3bf fixed and expanded on trigram search 2021-09-28 19:12:51 +02:00
smilerz
20c2c5cc40 maintain env config when admin sorting tree 2021-09-28 11:41:58 -05:00
smilerz
658e04addb make node_sort_order an .env variable 2021-09-28 11:39:15 -05:00
smilerz
cb330bc6e8 added Admin function to sort trees 2021-09-28 10:09:13 -05:00
vabene1111
a0e9b88062
Merge pull request #919 from smilerz/supermarket_category_fix 
chain supermarket create/update to include categories
 2021-09-28 13:40:44 +02:00
smilerz
c1a22ea2a6 chain supermarket create/update to include categories 2021-09-27 17:55:58 -05: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
Kaibu
b7be5cd325 meal plan fixes 
added the option to create entries from recipe card context menu
 2021-09-26 11:55:50 +02:00
vabene1111
766335425e strip spaces from recipe query 2021-09-24 08:48:43 +02:00
vabene1111
b949fe6a90 removed some deprecated stuff 2021-09-23 15:19:10 +02:00
vabene1111
ea472158f9 some small meal plan fixes 2021-09-23 13:57:47 +02:00
Kaibu
5c85369120 meal plan context menu added, further progress 2021-09-22 20:03:03 +02:00
vabene1111
2012ef9e46 fixed wrong assignment in automation processing 2021-09-21 16:19:53 +02:00
vabene1111
293027a1b6 fixed sharing with new search system 2021-09-20 15:54:56 +02:00
Oliver Cervera
fd9e2ceaf4 Translated using Weblate (Italian) 
Currently translated at 94.3% (468 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-09-18 23:06:07 +00:00
vabene1111
f3593e8151 implemented rule processing in ingredient parser 2021-09-16 18:31:21 +02:00
Oliver Cervera
4dbe7703da Translated using Weblate (Italian) 
Currently translated at 91.9% (456 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-09-16 15:52:16 +00: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
Kaibu
e2def416ab new meal planner basic features implemented 2021-09-15 17:31:25 +02:00
vabene1111
cfaae5b200
Merge branch 'develop' into patch3 2021-09-15 17:28:25 +02:00
vabene1111
1fa9c806a6
Merge branch 'develop' into patch2 2021-09-15 17:28:01 +02:00
vabene1111
60aa384f3c
Merge pull request #901 from smilerz/patch 
fix inputLookup
 2021-09-15 17:27:42 +02:00
vabene1111
c296678eb2 implemented automation on deprecated method 2021-09-15 17:20:44 +02:00
smilerz
6a29c79e5c fix resetList function 2021-09-15 08:50:46 -05:00
smilerz
0680cefbe1 fixed or/and filters 2021-09-15 08:29:49 -05:00
smilerz
5c0fa7cd19 fix inputLookup 2021-09-15 08:13:22 -05:00
Oliver Cervera
137ad47df8 Translated using Weblate (Italian) 
Currently translated at 90.7% (450 of 496 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-09-15 11:07:30 +00:00
vabene1111
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
vabene1111
71ac73ff2a migration various leftover things after PR's 2021-09-15 10:39:33 +02:00
vabene1111
94e357f4f6 cookbookapp importer 2021-09-15 10:26:31 +02:00
vabene1111
aeb5682176 Merge branch 'pr/897' into develop 2021-09-15 09:16:09 +02:00
smilerz
4296e8e44f remove console messages 2021-09-14 16:19:38 -05:00
Kaibu
d9300a9a90 meal planner refactor progress 2021-09-14 23:16:33 +02:00
smilerz
c9a910daca rebase with develop 2021-09-14 16:14:30 -05:00
smilerz
f0cf92eaa3 draggable 2021-09-14 16:10:58 -05:00
smilerz
508284c046 edit SupermarketCategoryRelations 2021-09-14 16:09:48 -05:00
vabene1111
b7fe3e38e6 fixed recipe book api test to reflect api change 2021-09-14 22:59:23 +02:00
vabene1111
70f96d3fe6 plan to eat importer 2021-09-14 22:47:26 +02:00
vabene1111
cbb2c0460c fixed fractional servings breaking importer 2021-09-14 21:54:08 +02:00
vabene1111
aca526a9cd added sharing back to recipe books 2021-09-14 21:07:15 +02:00
vabene1111
26f9d25bd2 fixed some integration issues 2021-09-14 20:31:41 +02:00
vabene1111
3b429c5d84 change iexact to exact for get_or_create tree mixing 2021-09-14 19:26:09 +02:00
vabene1111
5c6f09975b fixed importer rembering old ignored recipes 2021-09-14 15:17:00 +02:00
vabene1111
0e50e4e8a0 meal master tweak and frontend build 2021-09-14 14:48:50 +02:00
vabene1111
b151356bce recipe editor UI improvements 2021-09-14 11:47:00 +02:00
vabene1111
658ef23b42 compile messages 2021-09-13 22:40:53 +02:00
vabene1111
cfdce3de2a make and compile messages 2021-09-13 22:40:47 +02:00
Kaibu
02635b017c more minor drawer fixes 2021-09-13 22:38:24 +02:00
Kaibu
77bd44ad42 minor drawer fixes 2021-09-13 22:30:01 +02:00
Kaibu
659847a949 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 
# Conflicts:
#	cookbook/templates/base.html
 2021-09-13 22:15:24 +02:00
Kaibu
9ace332ba5 drawer added 2021-09-13 22:14:15 +02:00
vabene1111
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
vabene1111
6f44ad760c quick solution for external recipe nav 2021-09-13 21:51:24 +02:00
smilerz
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
Kaibu
0c3dcf143f drawer rework 2021-09-13 21:41:15 +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
22bde0424c delete and create added for books 2021-09-13 20:49:25 +02:00
Kaibu
9efc60232a removed old asset 2021-09-13 19:30:53 +02:00
Kaibu
8b09777b2c Merge branch 'feature/books_refactor' into develop 
# Conflicts:
#	vue/webpack-stats.json
 2021-09-13 19:30:13 +02:00
Kaibu
fd8797e2b7 cookbook view refactored, minor ui fixes 2021-09-13 19:28:16 +02:00
vabene1111
b86c9d295a basic errors fixed 2021-09-13 14:06:19 +02:00
vabene1111
4fbf080e2f basics 2021-09-13 12:39:29 +02:00
Kaibu
0501dd9a0a layout progress 2021-09-12 22:47:31 +02:00
vabene1111
79c1f2eb86
Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
smilerz
c8bff1660b transposed v-model 2021-09-10 14:51:37 -05:00
smilerz
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
smilerz
6888233b6a fixed mispelled parameter 2021-09-10 06:44:09 -05:00
smilerz
cd137f9da3 yarn build 2021-09-09 19:07:16 -05: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
vabene1111
51dd137d96
Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
smilerz
7b3dee4595 fix food facets 2021-09-08 17:07:00 -05:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
vabene1111
6936710093
Merge pull request #869 from smilerz/fixes 
Move/Merge updated to handle object vs id
 2021-09-08 18:29:24 +02:00
smilerz
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05: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
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
vabene1111
76b1ab9e85 fixed food serializer supermarket 2021-09-08 11:40:20 +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
vabene1111
8edc01db26
Merge pull request #861 from smilerz/food_tree_patch 
post food_tree bug fixing
 2021-09-08 09:11:00 +02:00
smilerz
8420995aa8 updated RecipeSearch API 2021-09-07 13:52:14 -05:00
Afaren
f2497b0a52 Translated using Weblate (French) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-09-07 16:06:03 +00: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
84744560e0 infinite loader bug fixing 2021-09-06 12:28:14 -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
cd0259ad26 remove console messages 2021-09-04 16:47:12 -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
vabene1111
de8ceba3bc compiled and updated javascript resources 2021-09-04 18:17:07 +02:00
vabene1111
d6e0faf7f4
Merge pull request #846 from smilerz/food_tree 
Food tree
 2021-09-04 17:47:10 +02:00
Oliver Cervera
27aae26f16 Translated using Weblate (Italian) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-09-02 11:06:01 +00:00
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
Oliver Cervera
32da9e006b Translated using Weblate (Italian) 
Currently translated at 90.8% (437 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-08-31 23:31:40 +00:00
smilerz
09e886958f restrict dev docker builds to vabene1111 2021-08-31 16:58:00 -05:00
smilerz
93d261b529 fixed serializer for food 2021-08-31 15:29:16 -05:00
smilerz
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
smilerz
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
smilerz
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
smilerz
caeb47aee9 bind data in dynamic fields to parent model 2021-08-31 14:58:40 -05:00
smilerz
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -05:00
smilerz
30b513cb58 Squashed commit of the following: 
commit 7e9a8d4d86
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 26 21:56:59 2021 -0500

    test case to detect 833

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
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
07a67684ab WIP 2021-08-31 14:58:40 -05:00
smilerz
4714162c0b WIP 2021-08-31 14:58:40 -05:00
smilerz
d7d552c5c5 fixed migrations 2021-08-31 14:58:40 -05:00
smilerz
bf3feef707 yarn build 2021-08-31 14:58:39 -05:00
smilerz
44aa05fe5c Fix after rebase 2021-08-31 14:58:39 -05:00
smilerz
35dc981713 generic api mixin 2021-08-31 14:58:39 -05:00
smilerz
f7b2af7f97 working WIP 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
72b4bd7e5c finished food view 2021-08-31 14:58:39 -05:00
smilerz
d5e9c5d8f8 food layout complete, edit food working 2021-08-31 14:58:38 -05:00
smilerz
b56c2429c7 WIP 2021-08-31 14:58:38 -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
6ec0c1c71d WIP 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
vabene1111
5ffc97a6a0 fixed importer compatability with new FTS and keyword features 2021-08-31 09:50:16 +02:00
vabene1111
88fb6e32ef
Merge pull request #839 from smilerz/fix_search 
Fix search
 2021-08-31 08:57:14 +02:00
Oliver Cervera
5a696dfe42 Translated using Weblate (Italian) 
Currently translated at 79.2% (381 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-08-30 22:31:00 +00:00
smilerz
7e9a8d4d86 test case to detect 833 2021-08-26 21:56:59 -05:00
smilerz
75e46b8023 fix #883 2021-08-25 21:27:31 -05:00
smilerz
2a1e1953ee consolidated recently viewed into FTS queryset 2021-08-25 21:08:35 -05:00
smilerz
aa2d0eafb1 fixed cookie reactivity 2021-08-25 16:43:52 -05:00
smilerz
b74fdb3825 exact match appears first on keyword/food/unit searches 2021-08-25 16:37:43 -05:00
smilerz
b00c189fd6 add pagination reset on search query change 2021-08-25 16:36:14 -05:00
smilerz
78ebd18ed8 fixes keyword filter on OR search 2021-08-24 22:01:02 -05:00
Jesse
a0a2b57942 Translated using Weblate (Dutch) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-08-24 18:28:19 +00:00
vabene1111
8b3827e56c small tweaks 2021-08-22 14:28:58 +02:00
vabene1111
4a1a45032e small tweaks and fixes 2021-08-22 14:18:46 +02:00
vabene1111
d744da2c3d fixed integration 2021-08-22 13:54:33 +02:00
vabene1111
4b3fa1a4b5 fixed imports 2021-08-22 13:39:53 +02:00
vabene1111
f76dd86f73 fix migration chain 2021-08-22 13:34:34 +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
Danny Tsui
f369883fc0 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 32.4% (156 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
 2021-08-20 19:28:16 +00:00
Danny Tsui
97461e5373 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 23.7% (114 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/zh_Hans/
 2021-08-19 11:28:16 +00:00
Oliver Cervera
f435d1f740 Translated using Weblate (Italian) 
Currently translated at 75.8% (365 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-08-19 11:28:15 +00:00
Afaren
3bd15a60a6 Translated using Weblate (French) 
Currently translated at 100.0% (481 of 481 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/
 2021-08-19 11:28:15 +00:00
vabene1111
848b480edd updated translation files 2021-08-17 08:45:11 +02:00