Commit Graph

89 Commits

Author SHA1 Message Date
5f9820ed30 Merge pull request #1469 from benscobie/issue/1434
Keep screen awake when viewing recipe
2022-02-07 14:48:21 +01:00
a3fa01d8d3 Merge branch 'feature/export-progress' of https://github.com/vabene1111/recipes into feature/export-progress 2022-02-03 15:59:18 +01:00
74e88218d5 Keep screen awake when viewing recipe 2022-02-01 21:05:04 +00:00
b2a415b333 Merge pull request #1447 from smilerz/mealplan_shopping_useability
Mealplan shopping useability
2022-02-01 08:28:59 +01:00
5b3a0a6e29 refactor IngredientComponent, move shopping logic to card 2022-01-31 14:05:01 -06:00
a0892470e1 Merge branch 'feature/export-progress' into develop 2022-01-28 15:41:49 +01:00
381a7e76be Use custom input component in recipe view 2022-01-25 22:04:21 +01:00
e1c7305c07 switcher basically working again 2022-01-17 20:22:37 +01:00
d23158839b Revert "temporarily disable recipe switcher"
This reverts commit d2b796ddd2.
2022-01-17 17:58:09 +01:00
d2b796ddd2 temporarily disable recipe switcher 2022-01-17 17:58:04 +01:00
16b357e11e Added printReady selector 2022-01-08 14:44:28 -05:00
0a6abf9688 Merge pull request #1211 from TiagoRascazzi/develop
Added Saffron and PDF export format
2022-01-07 10:31:13 +01:00
578154510b Merge shopping_list develop 2022-01-04 13:19:34 -05:00
1c30e643c3 Print format avoid breaking Ingredient and step 2022-01-02 22:28:16 -05:00
045a0b7d4f persist servings changes 2021-12-30 15:33:47 -06:00
957c659a62 Squashed commit of shoppinglist_v2 2021-12-30 15:33:34 -06:00
2d94cb70ab fix shopping list api 2021-12-28 12:03:35 -06:00
a20a877dc7 fix after rebase 2021-12-28 12:03:35 -06:00
8f0c5e21ad basic tests with new factories 2021-12-28 12:03:34 -06:00
0693d31550 WIP 2021-12-28 12:03:33 -06:00
2b41fbc9f8 Fix after rebase 2021-12-28 12:03:33 -06:00
6eec3d18fe more fixes after rebase 2021-12-28 12:03:33 -06:00
dcfe4de61f Fix after rebase 2021-12-28 12:03:32 -06:00
ecac3f3c2d related recipes included when adding mealplan to shopping list 2021-12-28 12:03:32 -06:00
10a33add75 Fix after rebase 2021-12-28 12:03:31 -06:00
2d01a2af47 implemented quick switch 2021-12-22 14:43:00 -06:00
132c48a490 fix shopping list api 2021-12-20 12:27:25 -06:00
a313039b65 fix after rebase 2021-12-15 15:48:55 -06:00
b146e75daa basic tests with new factories 2021-12-15 12:37:40 -06:00
a972a757b2 WIP 2021-12-15 12:37:03 -06:00
6cffee57fe Fix after rebase 2021-12-15 12:36:33 -06:00
e229a70360 more fixes after rebase 2021-12-15 12:36:33 -06:00
5a9543b4d8 Fix after rebase 2021-12-15 12:36:06 -06:00
8b682c33f3 related recipes included when adding mealplan to shopping list 2021-12-15 12:35:48 -06:00
9827c3ffd5 Fix after rebase 2021-12-15 12:35:48 -06:00
4a747f5cd4 Revert "Revert "fixed vue build""
This reverts commit edde015b71.
2021-12-15 18:02:37 +01:00
edde015b71 Revert "fixed vue build"
This reverts commit 7e07508a31.
2021-12-15 17:26:06 +01:00
7e07508a31 fixed vue build 2021-12-03 11:47:04 +01:00
4626af3505 render separate flex row for step ingredients 2021-11-13 14:12:10 +01:00
df76791e1e fixed setp headers without ingredients loading in central list 2021-11-08 17:15:37 +01:00
0e55fe162c renamed components to match recommended naming 2021-11-01 11:39:10 +01:00
629a6d21e7 fixed ingredient rendering glitch 2021-10-19 17:26:56 +02:00
e784074ac8 meal plan icons, rating spacing 2021-10-17 16:36:45 +02:00
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
85aca8acf6 shopping_list_category 2021-09-13 14:30:03 -05:00
c4905d39c1 minor ui/ux improvements 2021-06-30 04:12:52 +02:00
272341f1dc further improvements to search view 2021-06-28 18:35:20 +02:00
2b7769e92f fixed report abuse button showing even if not shared 2021-06-15 09:04:05 +02:00
0b3e86f6fd imprioved recipe print view 2021-06-13 17:04:52 +02:00
08bc87960b added abuse prevention for share links 2021-06-12 21:15:23 +02:00