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
|
2cd33ee40a
|
fixed several tests
|
2021-11-30 17:20:36 +01:00 |
|
vabene1111
|
57a967b91d
|
fixed view log user filter
|
2021-11-30 16:07:31 +01:00 |
|
vabene1111
|
7f22e0a275
|
fixed duplicate results on cook book view api
|
2021-11-27 16:03:08 +01:00 |
|
Kaibu
|
1907223a8a
|
reduced api calls
|
2021-11-25 12:51:55 +01:00 |
|
Kaibu
|
d76fdd090a
|
meal plan hotkeys and sharing
|
2021-11-25 01:28:07 +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
|
6faabe3759
|
compiled messages
|
2021-11-23 18:18:07 +01:00 |
|
vabene1111
|
9d8c08341f
|
fixed doc links
|
2021-11-23 18:09:04 +01:00 |
|
vabene1111
|
d488559e42
|
added setting to disable tree fix
|
2021-11-23 18:02:44 +01: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 |
|
Luka
|
fd9f6f6dca
|
Translated using Weblate (Slovenian)
Currently translated at 5.5% (28 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/sl/
|
2021-11-16 06:06:32 +00:00 |
|
vabene1111
|
ecd4ce603c
|
Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
|
2021-11-14 15:33:44 +01:00 |
|
vabene1111
|
695cab29a1
|
fixed book sharing and added step page
|
2021-11-14 15:33:25 +01:00 |
|
Job Putters
|
35e04f94c6
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (509 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
|
2021-11-14 14:06:36 +00:00 |
|
vabene1111
|
7c4cd02dfa
|
fixed startup failing if fix tree fails
|
2021-11-14 10:33:33 +01:00 |
|
vabene1111
|
5ae440d5c9
|
fixed image on url importer
|
2021-11-13 12:30:23 +01:00 |
|
vabene1111
|
885c8982c1
|
Added translation using Weblate (Slovenian)
|
2021-11-13 08:07:56 +00:00 |
|
Henrique Silva
|
df45e1d523
|
Translated using Weblate (Portuguese)
Currently translated at 31.4% (160 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pt/
|
2021-11-12 20:06:33 +00:00 |
|
Oliver Cervera
|
03d7aa37da
|
Translated using Weblate (Italian)
Currently translated at 95.6% (487 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
|
2021-11-12 20:06:33 +00:00 |
|
A. L
|
dd3d28ec75
|
Translated using Weblate (German)
Currently translated at 100.0% (509 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2021-11-12 20:06:29 +00:00 |
|
vabene1111
|
1e6ba924ab
|
fixed plan to eat and mealmaster imports
|
2021-11-10 08:45:13 +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
|
c9cd5325c4
|
improved nextcloud importer
|
2021-11-09 16:38:50 +01:00 |
|
vabene1111
|
be3f860ba1
|
Added translation using Weblate (Romanian)
|
2021-11-09 14:27:23 +00:00 |
|
Jesse
|
c199536fca
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (509 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
|
2021-11-09 12:06:29 +00:00 |
|
Oliver Cervera
|
d60a9f0379
|
Translated using Weblate (Italian)
Currently translated at 95.8% (488 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
|
2021-11-09 12:06:29 +00:00 |
|
vabene1111
|
b72919dd42
|
compiled translations
|
2021-11-08 18:44:24 +01:00 |
|
vabene1111
|
086f8b4d62
|
made messages
|
2021-11-08 17:10:03 +01:00 |
|
vabene1111
|
409594a73a
|
fixed rezkonv importer
|
2021-11-08 17:09:57 +01:00 |
|
vabene1111
|
fd8752b298
|
fixed nextcloud image import
|
2021-11-07 22:19:46 +01:00 |
|
Kaibu
|
301f1cede4
|
updated translations
|
2021-11-07 18:17:49 +01:00 |
|
Kaibu
|
3f7aed995a
|
Translated using Weblate (German)
Currently translated at 100.0% (509 of 509 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2021-11-07 17:14:14 +00:00 |
|
Kaibu
|
4288d76afd
|
added more translations
|
2021-11-07 17:32:43 +01:00 |
|
vabene1111
|
f0335ebe40
|
updated translations
|
2021-11-07 13:48:18 +01:00 |
|
vabene1111
|
7fd2817014
|
fixed nextcloiud importer
|
2021-11-07 13:47:54 +01:00 |
|
Nicklas Yli-Länttä
|
372a2e480e
|
Translated using Weblate (Finnish)
Currently translated at 2.8% (14 of 493 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fi/
|
2021-11-06 14:06:29 +00:00 |
|
retmas gh
|
e426cae091
|
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-11-06 14:06:29 +00:00 |
|
Jan Brach
|
56e44ee3ff
|
Translated using Weblate (German)
Currently translated at 94.7% (467 of 493 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2021-11-06 14:06:29 +00:00 |
|
vabene1111
|
dda2529f6f
|
fixed plan share space filter
|
2021-11-05 19:42:41 +01:00 |
|
vabene1111
|
1eac80942c
|
Added translation using Weblate (Finnish)
|
2021-11-05 11:19:59 +00:00 |
|
vabene1111
|
d681e3ced3
|
disable external recipes in hosted version
|
2021-11-04 15:56:22 +01:00 |
|
vabene1111
|
e11d24b8c4
|
updated translations again
|
2021-11-04 14:57:00 +01:00 |
|
Kaibu
|
04822103c3
|
Merge branch 'develop_translate_backend' into develop
# Conflicts:
# cookbook/locale/de/LC_MESSAGES/django.po
|
2021-11-04 14:55:09 +01:00 |
|
Kaibu
|
8041e092f7
|
Translated using Weblate (German)
Currently translated at 100.0% (496 of 496 strings)
Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
|
2021-11-04 13:53:39 +00:00 |
|
vabene1111
|
4c87440691
|
updated translations
|
2021-11-04 12:31:32 +01:00 |
|
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 |
|