mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-06 22:58:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,849 Commits 22 Branches 170 Tags
c32a96fd6f1ff914a543f8731400388d490e98fb
Commit Graph

1834 Commits

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