Commit Graph

303 Commits

Author SHA1 Message Date
f6e0f91565 clear comments from tests 2023-12-28 15:55:13 +03:00
73ad8bb645 added plan index, edit tests 2023-12-28 15:54:16 +03:00
e7fb36de2e fixed image tests plan and recipe 2023-12-28 14:41:41 +03:00
apoloz
518ef61a0d Merge pull request 'Работа с рецептами и с планом' (#42) from alex_chevski/eatvio:workBranchPlanLike into main
Reviewed-on: eatvio/eatvio#42
2023-12-27 13:48:14 +00:00
apoloz
1f6158a089 Merge pull request 'fix plan and recipe create routes' (#45) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#45
2023-12-27 13:44:36 +00:00
Anatoliy Poloz
dda7244d5d fix plan and recipe create routes 2023-12-27 16:43:49 +03:00
6d377ad37b close display like plan show 2023-12-27 16:25:20 +03:00
f62235d525 added index recipe page 2023-12-27 15:38:16 +03:00
1fe0d06322 added plan images to factory plan 2023-12-27 12:49:27 +03:00
d9d64e2feb create two event for plan like 2023-12-27 11:52:28 +03:00
c0c250e041 deleted double field tags and correct show recipe 2023-12-27 11:01:17 +03:00
fc33b6cd8f fix reipe fields cooking_time, steps factory 2023-12-27 10:44:22 +03:00
a3073768d8 deleted unnecessary functionality 2023-12-27 00:02:45 +03:00
1b733aece3 fix like plan 2023-12-26 16:13:12 +03:00
9fdc21d064 Merge branch 'eatvio-main' 2023-12-26 13:45:42 +03:00
apoloz
768048c5d4 Merge pull request 'make recipes visible in public (with out of auth)' (#41) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#41
2023-12-26 10:28:45 +00:00
Anatoliy Poloz
6c5dd9eae9 make recipes visible in public (with out of auth) 2023-12-26 13:28:01 +03:00
apoloz
9813b50e10 Merge pull request 'make plans visible in public (with out of auth)' (#40) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#40
2023-12-26 10:23:30 +00:00
014bd1b808 Merge branch 'eatvio-main' 2023-12-26 13:22:49 +03:00
Anatoliy Poloz
238682c644 make plans visible in public (with out of auth) 2023-12-26 13:22:10 +03:00
apoloz
63499da18b Merge pull request 'comments container layot fix' (#39) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#39
2023-12-26 10:10:43 +00:00
Anatoliy Poloz
fe81470217 comments container layot fix 2023-12-26 13:09:56 +03:00
apoloz
acf052abba Merge pull request 'main' (#38) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#38
2023-12-26 09:17:24 +00:00
Anatoliy Poloz
700e649b3b plan description show unescaped elements in description added 2023-12-26 12:16:36 +03:00
Anatoliy Poloz
4616a8e2d5 recipe slug update artisan command added 2023-12-26 12:15:09 +03:00
15a85784b4 Merge branch 'eatvio-main' 2023-12-26 12:13:49 +03:00
apoloz
853e651e1e Merge pull request 'main' (#37) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#37
2023-12-26 08:53:49 +00:00
Anatoliy Poloz
62bbe4819c plan layout tmp fix 2023-12-26 11:52:31 +03:00
615a0244b6 Merge branch 'eatvio-main' 2023-12-26 01:05:35 +03:00
3574413f39 make visibility images in edit page recipe 2023-12-26 00:56:39 +03:00
5cc19ae4fc change driver filesystem from local to public 2023-12-26 00:24:20 +03:00
544e576d1d added recipe images to factories 2023-12-26 00:23:22 +03:00
apoloz
16eb0cc984 Merge pull request 'main' (#9) from eatvio/eatvio:main into main
Reviewed-on: apoloz/eatvio#9
2023-12-25 14:02:54 +00:00
apoloz
2965f20fc9 Merge pull request 'main' (#35) from alex_chevski/eatvio:main into main
Reviewed-on: eatvio/eatvio#35
2023-12-25 14:02:31 +00:00
f04948e390 rewrite slug on absolute path 2023-12-25 16:46:55 +03:00
apoloz
2130cc5285 Merge pull request 'fix comments tumbsup width' (#34) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#34
2023-12-25 13:42:20 +00:00
Anatoliy Poloz
088bf51201 fix comments tumbsup width 2023-12-25 16:41:36 +03:00
768c4a61f2 Merge branch 'eatvio-main' 2023-12-25 16:08:34 +03:00
apoloz
66af647fcc Merge pull request 'main' (#33) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#33
2023-12-25 13:03:41 +00:00
Anatoliy Poloz
05ca1403a4 diet factory added 2023-12-25 16:02:58 +03:00
Anatoliy Poloz
1e92a31768 WIP fix layout active state 2023-12-25 16:00:37 +03:00
767226cd2b rename css btn to l-btn recipe 2023-12-25 15:49:31 +03:00
Anatoliy Poloz
c7da05694a fix liana btn style in plans + chanche upvote/downwote icon order 2023-12-25 15:28:19 +03:00
d464742c89 Merge branch 'eatvio-main' 2023-12-25 15:23:26 +03:00
apoloz
0e8123f40a Merge pull request 'Plan Accrodion option opened by default' (#32) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#32
2023-12-25 12:20:57 +00:00
Anatoliy Poloz
66b398522e Plan Accrodion option opened by default 2023-12-25 15:20:20 +03:00
bbc030e2a7 Merge branch 'eatvio-main' 2023-12-25 15:01:28 +03:00
apoloz
a91d3d3add Merge pull request 'main' (#31) from apoloz/eatvio:main into main
Reviewed-on: eatvio/eatvio#31
2023-12-25 11:39:10 +00:00
Anatoliy Poloz
5735dc7cfb rename Liana btn style 2023-12-25 14:37:31 +03:00
Anatoliy Poloz
f919864daf Merge branch 'main' of ssh://10.55.5.123:222/apoloz/eatvio into cssFix 2023-12-25 14:35:26 +03:00