mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-08 23:58:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,047 Commits 22 Branches 170 Tags
724217f1423bb541926ac1742001b5eb986c16d3
Commit Graph

191 Commits

Author SHA1 Message Date
Oliver Cervera
9cdc31691d Translated using Weblate (Italian) 
Currently translated at 98.1% (156 of 159 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/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
803a25a75f Merge branch 'develop' of https://github.com/vabene1111/recipes into develop 2021-09-15 14:26:43 +02:00
vabene1111
4f3a364f13 translation 2021-09-15 14:26:40 +02:00
Oliver Cervera
90dc445c45 Translated using Weblate (Italian) 
Currently translated at 100.0% (151 of 151 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-15 11:07:30 +00:00
vabene1111
d6f7aade46 basics for automation 2021-09-15 13:07:25 +02:00
vabene1111
1c661c9baf recipe edit view hotkeys and small tweaks 2021-09-14 12:36:04 +02:00
Jesse
0055f02f14 Translated using Weblate (Dutch) 
Currently translated at 84.5% (126 of 149 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-09-13 20:11:59 +00:00
vabene1111
bbc6015898 Merge branch 'pr/891' into develop 2021-09-13 22:11:41 +02:00
smilerz
5e1ae1d877 add shopping_category and supermarkets 2021-09-13 14:41:50 -05:00
smilerz
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
Oliver Cervera
37b2a95797 Translated using Weblate (Italian) 
Currently translated at 92.2% (119 of 129 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-13 19:24:47 +00:00
vabene1111
234e27c4c1 recipe editor 2021-09-13 21:13:43 +02:00
vabene1111
b86c9d295a basic errors fixed 2021-09-13 14:06:19 +02:00
vabene1111
1be24e80de Merge pull request #878 from smilerz/filter_by_rating 
Filter by rating
 2021-09-11 13:08:14 +02:00
Oliver Cervera
882075199c Translated using Weblate (Italian) 
Currently translated at 85.8% (109 of 127 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-11 09:06:06 +00:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
vabene1111
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +02:00
Oliver Cervera
5c4bf20c6f Translated using Weblate (Italian) 
Currently translated at 83.1% (99 of 119 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-07 16:06:03 +00:00
Afaren
e32813281a Translated using Weblate (French) 
Currently translated at 100.0% (119 of 119 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-09-07 16:06:03 +00: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
vabene1111
d6e0faf7f4 Merge pull request #846 from smilerz/food_tree 
Food tree
 2021-09-04 17:47:10 +02:00
Oliver Cervera
a4707c09f9 Translated using Weblate (Italian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-04 08:06:02 +00:00
Oliver Cervera
4360289b56 Translated using Weblate (Italian) 
Currently translated at 95.9% (94 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-02 11:06:01 +00:00
Oliver Cervera
47946332f4 Translated using Weblate (Italian) 
Currently translated at 73.4% (72 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-08-31 23:32:11 +00: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
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -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
72b4bd7e5c finished food view 2021-08-31 14:58:39 -05:00
smilerz
b56c2429c7 WIP 2021-08-31 14:58:38 -05:00
Oliver Cervera
1e330e8ff7 Translated using Weblate (Italian) 
Currently translated at 43.8% (43 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-08-30 22:31:01 +00:00
Oliver Cervera
8c6cc2edcd Added translation using Weblate (Italian) 2021-08-29 22:19:54 +00:00
Jesse
16e8b24947 Translated using Weblate (Dutch) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-08-24 18:28:20 +00: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
Afaren
3f848b42af Translated using Weblate (French) 
Currently translated at 100.0% (78 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-08-12 13:09:43 +00:00
Afaren
36a0693b49 Translated using Weblate (French) 
Currently translated at 2.5% (2 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-08-11 16:51:30 +00:00
Afaren
f3fd087b81 Added translation using Weblate (French) 2021-08-10 15:08:26 +00:00
Danny Tsui
8e8d25071c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 73.0% (57 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2021-08-10 08:51:29 +00:00
Danny Tsui
0e48ee60cb Translated using Weblate (Chinese (Simplified)) 
Currently translated at 57.6% (45 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2021-08-04 21:51:26 +00:00
Danny Tsui
314d8d41d1 Added translation using Weblate (Chinese (Simplified)) 2021-08-03 16:27:47 +00:00
Danny Tsui
02fd73f43e Added translation using Weblate (Chinese (Traditional)) 2021-08-03 15:59:53 +00: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