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,831 Commits 21 Branches 170 Tags
09b0dcb136dc65a038af413a2147915f3a48a839
Commit Graph

409 Commits

Author SHA1 Message Date
smilerz
09b0dcb136 pre-merge 2021-12-15 12:37:03 -06:00
smilerz
5b4867d172 undo move 2021-12-15 12:37:03 -06:00
smilerz
d3d4c210c1 yarn build 2021-12-15 12:37:03 -06:00
smilerz
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
smilerz
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -06:00
smilerz
099a5420d6 update migrations 2021-12-15 12:36:06 -06:00
smilerz
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
smilerz
60d7e63da8 add to shopping from card context menu 2021-12-15 12:36:06 -06:00
smilerz
867e2d4fbf add new unit/food from shopping list 2021-12-15 12:36:06 -06:00
smilerz
757fa5e49c edit supermarket categories 2021-12-15 12:36:06 -06:00
smilerz
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
smilerz
7c6a7ef6a4 alpha shopping list 2021-12-15 12:35:48 -06:00
smilerz
4c506750de autosync 2021-12-15 12:35:48 -06:00
smilerz
b84d77be15 WIP 2021-12-15 12:35:48 -06:00
smilerz
247dd30b20 fade-enter-active 2021-12-15 12:35:48 -06:00
smilerz
5e4e203dfb shopping line item 2021-12-15 12:35:48 -06:00
smilerz
79b6d4817e inheritance works with object moves 2021-12-15 12:35:48 -06:00
smilerz
6075ce50e7 food inherit attributes 2021-12-15 12:35:48 -06:00
smilerz
2ca7722afb Fix after rebase 2021-12-15 12:35:48 -06:00
smilerz
7a9e5b1e3f getUserPreference available for all UserPreferences 2021-12-15 12:35:48 -06:00
smilerz
3d674cfca6 model changes and GenericAutoSchema 2021-12-15 12:35:48 -06:00
smilerz
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
vabene1111
4a747f5cd4 Revert "Revert "fixed vue build"" 
This reverts commit edde015b71.
 2021-12-15 18:02:37 +01:00
vabene1111
2559905a78 fixed empty fields breaking recipe update 2021-12-15 17:45:53 +01:00
vabene1111
edde015b71 Revert "fixed vue build" 
This reverts commit 7e07508a31.
 2021-12-15 17:26:06 +01:00
vabene1111
7e07508a31 fixed vue build 2021-12-03 11:47:04 +01:00
vabene1111
5d6574b8cc Merge pull request #1068 from rose-a/fix-recipe-step-template 
Render separate ingredients flex row for each step
 2021-11-30 17:23:47 +01:00
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
Kaibu
1907223a8a reduced api calls 2021-11-25 12:51:55 +01:00
Kaibu
9b5fe8f4e7 prevent page jump due to href=# 2021-11-25 01:35:12 +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
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
Luka
7b6ca94d49 Translated using Weblate (Slovenian) 
Currently translated at 11.5% (24 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/sl/
 2021-11-14 14:06:36 +00:00
Alexander Rose
4626af3505 render separate flex row for step ingredients 2021-11-13 14:12:10 +01:00
vabene1111
af581bb27c Added translation using Weblate (Slovenian) 2021-11-13 08:08:25 +00:00
Oliver Cervera
64a9f67802 Translated using Weblate (Italian) 
Currently translated at 100.0% (208 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-11-12 20:06:33 +00:00
Flavius Stan
6f0bf886f6 Translated using Weblate (Romanian) 
Currently translated at 8.1% (17 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/ro/
 2021-11-11 16:06:30 +00:00
SMunos
16fbd9fe48 Translated using Weblate (French) 
Currently translated at 93.2% (194 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-11-11 16:06:30 +00:00
vabene1111
ba6c80e04a Added translation using Weblate (Romanian) 2021-11-09 14:27:40 +00:00
Oliver Cervera
1ac4020b3d Translated using Weblate (Italian) 
Currently translated at 96.6% (201 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-11-09 12:06:30 +00:00
Jesse
5da535b8ac Translated using Weblate (Dutch) 
Currently translated at 100.0% (208 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-11-09 12:06:29 +00:00
Maximilian J
b8ed99a59a Translated using Weblate (German) 
Currently translated at 100.0% (208 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2021-11-09 12:06:29 +00:00
vabene1111
df76791e1e fixed setp headers without ingredients loading in central list 2021-11-08 17:15:37 +01:00
vabene1111
5af687364f Merge pull request #1016 from StephenBrown2/patch-1 
Add time unit hint to recipe edit view
 2021-11-08 16:32:44 +01:00
Kaibu
44d535301d Merge branch 'develop-weblate' into develop 
# Conflicts:
#	cookbook/locale/de/LC_MESSAGES/django.po
 2021-11-07 17:38:49 +01:00
Kaibu
15e36cc03f Translated using Weblate (German) 
Currently translated at 100.0% (208 of 208 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
 2021-11-07 16:34:53 +00:00