Commit Graph

274 Commits

Author SHA1 Message Date
d478f85a2c API 2024-01-09 12:09:37 +03:00
c767d50915 Merge pull request 'main' (#3) from eatvio/eatvio:main into main
Reviewed-on: maxxkim/eatvio#3
2023-12-26 08:37:43 +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
Anatoliy Poloz
a92cab527c cssBugFix 2023-12-25 14:35:18 +03:00
apoloz
5b24fb515c Merge pull request 'main' (#8) from eatvio/eatvio:main into main
Reviewed-on: apoloz/eatvio#8
2023-12-25 11:32:05 +00:00
apoloz
60b70ce6a2 Merge pull request 'Добавить тесты для изменения рецептов' (#28) from alex_chevski/eatvio:recipe-tests into main
Reviewed-on: eatvio/eatvio#28
2023-12-25 11:30:59 +00:00
apoloz
c504ff6415 Merge pull request 'Добавить сидер теги для рецептов' (#30) from alex_chevski/eatvio:seederRecipe into main
Reviewed-on: eatvio/eatvio#30
2023-12-25 11:30:27 +00:00
apoloz
10d103aee9 Merge pull request 'Создание страницы с рецептами' (#29) from alex_chevski/eatvio:create-recipe-page into main
Reviewed-on: eatvio/eatvio#29
2023-12-25 11:29:43 +00:00
c4bd759895 added tag seeder to database seeder 2023-12-25 14:13:25 +03:00
8f9fe36574 added tag seeder 2023-12-25 14:13:06 +03:00
d544d33df9 rename tagFactory 2023-12-25 14:11:43 +03:00
e71ad2e0a0 added tags factory 2023-12-25 13:28:11 +03:00
fdca3f8b56 added slug to recipe 2023-12-25 12:39:40 +03:00
bd4566d078 rename scopes comment 2023-12-25 12:23:13 +03:00
2551aadc7e added edit page recipe 2023-12-25 10:42:40 +03:00
7cefb75bfa deleted EditFormTest and added EditTest 2023-12-24 23:27:17 +03:00
587bcff626 added show recipe page 2023-12-24 22:39:34 +03:00
6bf87ef34f added create recipe page 2023-12-24 20:33:53 +03:00
ba14f7142d fix conflicts files pull requests 2023-12-22 23:49:55 +03:00
apoloz
b2799600b0 Merge pull request 'main' (#7) from eatvio/eatvio:main into main
Reviewed-on: apoloz/eatvio#7
2023-12-22 13:51:57 +00:00
apoloz
dfdbe33ac8 Merge pull request 'Added Seeders factories and tests' (#27) from alex_chevski/eatvio:recipe-tests into main
Reviewed-on: eatvio/eatvio#27
2023-12-22 13:50:24 +00:00
482745181f fixed route tests recipe 2023-12-22 16:47:55 +03:00
4e02272d2c recipe seeder and factories fix code style 2023-12-22 16:39:24 +03:00
abd3b72e2e added recipe seeders to database seeder 2023-12-22 16:39:24 +03:00
182cfeb4b9 added Recipe comment 2023-12-22 16:39:24 +03:00
ae0e76589c added recipe author seeder 2023-12-22 16:39:24 +03:00
15b4d45515 added recipe seeder 2023-12-22 16:39:24 +03:00
1da207eb4f added recipe factories 2023-12-22 16:39:24 +03:00
24c5cfdaac added youtube url faker 2023-12-22 16:38:17 +03:00
dd8e6c3166 fix and correct tests 2023-12-22 15:59:55 +03:00
apoloz
f9b437de2a Merge pull request 'main' (#6) from eatvio/eatvio:main into main
Reviewed-on: apoloz/eatvio#6
2023-12-22 12:42:33 +00:00
apoloz
eb8470ca91 Merge pull request 'Тесты для рецептов' (#26) from alex_chevski/eatvio:recipe-tests into main
Reviewed-on: eatvio/eatvio#26
2023-12-22 12:37:24 +00:00
Anatoliy Poloz
bfa1330f52 :Merge branch 'alex_chevski-recipe-seeders-action' 2023-12-22 15:36:28 +03:00
Anatoliy Poloz
c25e573816 merge Recipe Factory 2023-12-22 15:36:02 +03:00