mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,167 Commits 21 Branches 170 Tags
a1d1cbac5d02705f60f03955f4f01067a9dbc71f
Commit Graph

1531 Commits

Author SHA1 Message Date
vabene1111
781cbc16f7 space create initial name and markup 2021-07-22 16:39:42 +02:00
Jesse
07afa7957a Translated using Weblate (Dutch) 
Currently translated at 100.0% (471 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-07-19 16:40:51 +00:00
Jesse
86a3d87276 Translated using Weblate (Dutch) 
Currently translated at 93.8% (442 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-07-16 09:53:08 +00:00
vabene1111
e92dbcd63e compiled javascript 2021-07-13 16:47:45 +02:00
vabene1111
0c28e7e1b4 recipes as part of recipes/steps 2021-07-13 16:47:39 +02:00
vabene1111
9809f58c28 supermarket view done 2021-07-08 19:00:23 +02:00
vabene1111
da57e656eb several search related improvements 2021-07-07 17:45:05 +02:00
vabene1111
b42e6ac0f6 fixed cook log creation in old search 2021-07-07 17:21:14 +02:00
vabene1111
b661cdcf3e minor fixes keyword tree system 2021-07-05 10:17:14 +02:00
vabene1111
168c6e3938 trying to fix things 2021-07-03 21:31:18 +02:00
vabene1111
554c862e6b better debugging of importer fails 2021-07-01 19:49:39 +02:00
vabene1111
2fe2d9127b Merge branch 'develop' into feature/fulltext-search 2021-07-01 08:37:57 +02:00
vabene1111
a00055ac6e partially working 2021-06-30 16:17:46 +02:00
Kaibu
5518199f64 search and car styling 2021-06-30 15:36:56 +02:00
vabene1111
e964d61691 fixed migration order and dependencies 2021-06-30 15:33:35 +02:00
vabene1111
33b840dbbf working on migrations 2021-06-30 15:14:37 +02:00
vabene1111
5c0bdce37d Merge branch 'feature/keywords-rework' into feature/fulltext-search 
# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/models.py
#	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/templates/sw.js
#	cookbook/views/api.py
#	cookbook/views/views.py
#	vue/src/locales/en.json
#	vue/webpack-stats.json
#	vue/yarn.lock
 2021-06-30 15:06:03 +02:00
vabene1111
28b67a2ba5 Merge branch 'develop' into feature/keywords-rework 
# 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
#	cookbook/templates/sw.js
#	cookbook/views/views.py
#	vue/src/components/RecipeCard.vue
#	vue/src/locales/en.json
 2021-06-30 14:57:33 +02:00
Kaibu
c4905d39c1 minor ui/ux improvements 2021-06-30 04:12:52 +02:00
vabene1111
272341f1dc further improvements to search view 2021-06-28 18:35:20 +02:00
vabene1111
78885987f0 small recipe card tweaks 2021-06-28 16:41:45 +02:00
vabene1111
cdbcc971b1 fixed old search rating 2021-06-28 16:31:48 +02:00
Maximilian J
932211e7f6 Translated using Weblate (German) 
Currently translated at 94.4% (445 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-06-24 15:49:37 +00:00
vabene1111
9658993163 admin filter options and timestamp fields 2021-06-22 18:21:14 +02:00
vabene1111
13e3c98fac actually implemented setting 2021-06-22 17:55:18 +02:00
Jesse
9a9644dc6c Translated using Weblate (Dutch) 
Currently translated at 92.3% (435 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-06-22 09:12:37 +00:00
Kaibu
cc43b2a9b0 minor ui fixes 2021-06-22 01:03:26 +02:00
vabene1111
bcf78aed0a fixed unit test 2021-06-21 13:51:47 +02:00
vabene1111
a7c89cc32e build javascript dependencies 2021-06-21 13:32:26 +02:00
vabene1111
e66502ee8f updated settings env variables 2021-06-21 13:15:21 +02:00
vabene1111
fd1a399d03 more improvements to the ingredient parser + tests 2021-06-21 13:00:03 +02:00
vabene1111
538e45d20c fixed enable signup parameter for social auth 2021-06-21 12:43:52 +02:00
Kaibu
65245234d8 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-06-20 14:59:03 +02:00
Kaibu
a88d7625dc social login buttons 2021-06-20 14:58:56 +02:00
vabene1111
48270197fa Merge pull request #719 from vabene1111/master 
Master
 2021-06-20 13:50:26 +02:00
vabene1111
f5312496e3 fixed url image import 2021-06-20 13:35:05 +02:00
vabene1111
7f57e7ab56 Fixed recipe create space 2021-06-19 14:44:49 +02:00
Oliver Cervera
c8d8dd581e Translated using Weblate (Italian) 
Currently translated at 76.8% (362 of 471 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/it/
 2021-06-18 23:12:35 +00:00
vabene1111
256c1a7d41 improved ingredient parser 2021-06-18 17:36:31 +02:00
vabene1111
7aa71dc744 layering fix 2021-06-18 16:29:46 +02:00
vabene1111
07c34ea7b5 account and social logic/templates 2021-06-18 16:13:28 +02:00
vabene1111
0256864904 social auth stuff 2021-06-17 22:40:33 +02:00
vabene1111
7725665aa4 django needs two files 2021-06-17 16:05:18 +02:00
vabene1111
74e3d09065 moved to new migration 2021-06-17 15:23:39 +02:00
vabene1111
0522fa0236 formatting 2021-06-17 15:15:42 +02:00
vabene1111
38aeb285c5 fixes space migration fo I/N/S 2021-06-17 15:02:06 +02:00
vabene1111
a9a0716c45 import response improvements 2021-06-17 14:08:03 +02:00
vabene1111
afc31b313f Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-06-17 13:38:59 +02:00
vabene1111
151f43b0d5 lots of importer adjustments 2021-06-17 13:38:57 +02:00
Kaibu
a695261b9c share intend 2021-06-17 03:01:22 +02:00