Commit Graph

1645 Commits

Author SHA1 Message Date
mso7nueh
1db528838b Merge pull request 'fix(consultation): some fixes' (#474) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#474
2025-05-29 14:15:09 +00:00
mso7nueh
3addd9d238 fix(consultation): some fixes 2025-05-29 17:14:02 +03:00
mso7nueh
ac46cd159b Merge pull request 'fix(feed): blogPosts' (#469) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#469
2025-05-28 13:56:49 +00:00
mso7nueh
dc1e8d5b71 fix(feed): blogPosts overflow 2025-05-28 16:56:04 +03:00
mso7nueh
db73865278 Merge pull request 'main' (#3) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#3
2025-05-28 13:11:11 +00:00
mso7nueh
2cd4054f29 Merge pull request 'feat(diary): New state for future days with diet in diary' (#465) from misha/eatvio_app:diary into main
Reviewed-on: eatvio/eatvio_app#465
2025-05-28 13:10:50 +00:00
mso7nueh
b9611bb5a1 Merge pull request 'feat(notifications): unread notifications handling' (#467) from misha/eatvio_app:notifications into main
Reviewed-on: eatvio/eatvio_app#467
2025-05-28 13:10:47 +00:00
mso7nueh
036aca7d08 Merge pull request 'recipes, plans, email and phone verify' (#463) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#463
2025-05-28 12:59:21 +00:00
mso7nueh
8f9aeb7b63 Merge branch 'main' into main 2025-05-28 12:59:12 +00:00
mso7nueh
38031c89c2 feat(recipe): my recipes screen complete 2025-05-28 15:56:40 +03:00
64bf6e33d7 Merge pull request 'feat(consultations): added new data fields to consultations model' (#462) from misha/eatvio_app:consultations into main
Reviewed-on: eatvio/eatvio_app#462
2025-05-28 12:04:09 +00:00
Username1548
b80b4e3a9e added logic of unread notifications 2025-05-28 00:30:05 +07:00
Username1548
19d08cac66 Merge remote-tracking branch 'upstream/main' into diary 2025-05-27 23:38:41 +07:00
Username1548
c36aabd9a4 added diets to diary 2025-05-27 23:30:36 +07:00
mso7nueh
566a96b18e feat(recipe): my recipes screen 2025-05-27 17:38:46 +03:00
mso7nueh
242cb474cc feat(email): add alert for phone verify and email verify after registration 2025-05-27 16:50:36 +03:00
mso7nueh
67bf7b0510 feat(email): verify screen 2025-05-26 17:56:29 +03:00
Username1548
b4dd9b3a3a feat(diary): added state for future days with diet 2025-05-26 21:37:06 +07:00
mso7nueh
51d3c1ad2f fix: avatars 2025-05-26 14:26:12 +03:00
mso7nueh
f38eead280 fix: consultant profile 2025-05-26 13:48:55 +03:00
mso7nueh
cf5b459756 fix: phone-verify redirect 2025-05-26 13:37:33 +03:00
mso7nueh
29b3de325c fix: analyzer 2025-05-24 16:52:23 +03:00
mso7nueh
1e1005a09c feat(email) add email verify screen, add my recipe screen, plans/index -> my_plans 2025-05-23 16:52:50 +03:00
Username1548
7df1323f7d Merge remote-tracking branch 'upstream/main' into consultations 2025-05-23 20:36:13 +07:00
Username1548
8f70e9620b Merge remote-tracking branch 'upstream/main' into consultations 2025-05-23 20:35:13 +07:00
mso7nueh
50b63fea7d Merge pull request 'main' (#2) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#2
2025-05-23 10:15:12 +00:00
mso7nueh
963ff78c25 Merge pull request 'feat(notifications)' (#459) from misha/eatvio_app:notifications into main
Reviewed-on: eatvio/eatvio_app#459
2025-05-23 09:28:14 +00:00
Username1548
e13ae888ab Merge remote-tracking branch 'upstream/main' into notifications 2025-05-23 16:09:18 +07:00
Username1548
089bfc23b7 Merge branch 'main' of ssh://10.55.5.123:222/misha/eatvio_app into notifications 2025-05-23 16:08:18 +07:00
mso7nueh
1173c8445e Merge pull request 'fix(recipe): tags error, feat(diet): add editing' (#457) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#457
2025-05-23 09:04:36 +00:00
mso7nueh
b59190e4e8 fix: analyzer 2025-05-23 12:03:04 +03:00
Username1548
1dfaa7cd93 feat(consultations): added new data to consultation model 2025-05-23 12:52:20 +07:00
Username1548
b4f00a9868 fixed analyzer issue 2025-05-23 11:58:18 +07:00
mso7nueh
8dcfa6ee6a feat(verify): phone + email 2025-05-22 18:05:32 +03:00
Username1548
3485e1fe5d added notifications layoute 2025-05-22 22:00:01 +07:00
Username1548
272637078a feat(notifications): added json parsing for notifications and tested impplementation of notifications layoute 2025-05-21 21:45:22 +07:00
mso7nueh
067e0929ed feat(verify): phone 2025-05-21 17:42:43 +03:00
mso7nueh
cb9fff9327 Merge pull request 'main' (#1) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#1
2025-05-21 08:29:58 +00:00
mso7nueh
5a863b2520 Merge pull request 'Recipes and plans creation' (#456) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#456
2025-05-21 08:29:31 +00:00
mso7nueh
941cfb04cc feat(diet): add diet editing 2025-05-20 18:28:32 +03:00
Username1548
2d836002b7 fix: fixed analyzer issue 2025-05-20 22:25:34 +07:00
Username1548
c1e2b1c312 created notifications model and logic of type based parsing 2025-05-20 22:21:10 +07:00
mso7nueh
42deaea426 fix(testflight): upd ver 2025-05-19 17:53:00 +03:00
mso7nueh
06de6c5d1c fix(recipe): tags error 2025-05-19 17:50:52 +03:00
Username1548
aeedc35c42 Merge remote-tracking branch 'upstream/main' 2025-05-19 21:38:20 +07:00
Username1548
b942168167 fix(plans, recipes): added new end points for plans and recipes creation 2025-05-19 21:23:13 +07:00
mso7nueh
2e83e2fdec Merge pull request 'test-flight' (#454) from test-flight into main
Reviewed-on: eatvio/eatvio_app#454
2025-05-19 12:47:06 +00:00
mso7nueh
9c75fd7c9e Merge pull request 'fix(testflight): upd ver' (#453) from mso7nueh/eatvio_app:Issue-329 into main
Reviewed-on: eatvio/eatvio_app#453
2025-05-19 12:42:25 +00:00
mso7nueh
ae85a7eabf fix(testflight): upd ver 2025-05-19 15:42:08 +03:00
mso7nueh
023ad06403 Merge pull request 'feat(recipe): edit recipe' (#452) from mso7nueh/eatvio_app:Issue-329 into main
Reviewed-on: eatvio/eatvio_app#452
2025-05-19 12:41:24 +00:00