Commit Graph

1665 Commits

Author SHA1 Message Date
mso7nueh
f145ccb8e0 Merge pull request 'build 22' (#480) from main into test-flight
Reviewed-on: eatvio/eatvio_app#480
2025-05-30 13:10:02 +00:00
mso7nueh
7b05c7bd36 Merge pull request 'fix(profile): education' (#479) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#479
2025-05-30 13:09:42 +00:00
mso7nueh
27cea212b0 fix(profile): education 2025-05-30 16:09:23 +03:00
mso7nueh
252538f52d Merge pull request 'feat(consultations): consultations archive' (#472) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#472
2025-05-30 13:06:33 +00:00
Username1548
88bf79def4 removed unused variable 2025-05-30 20:05:31 +07:00
Username1548
7f29ade548 fixed consultation archive filters issues 2025-05-30 20:04:47 +07:00
Username1548
d405be1ea4 merged upstram/main 2025-05-30 19:49:24 +07:00
Username1548
10ef59f6ea feat(consultations): consultations archive. feat(diary): plan and diet widget 2025-05-30 19:38:33 +07:00
mso7nueh
ee7b03c504 Merge pull request 'fix(consultation): state filter, avatar' (#478) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#478
2025-05-30 12:36:03 +00:00
mso7nueh
9f0ce55d47 fix(consultation): state filter, avatar 2025-05-30 15:33:32 +03:00
mso7nueh
44e3b89875 Merge pull request 'build 21' (#476) from main into test-flight
Reviewed-on: eatvio/eatvio_app#476
2025-05-30 09:59:40 +00:00
mso7nueh
5d1a1dccc8 Merge pull request 'fix: upd ver' (#475) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#475
2025-05-30 09:59:19 +00:00
mso7nueh
a90efa8caa fix: upd ver 2025-05-30 12:58:37 +03:00
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
Username1548
d645910554 fix(analyzer): fixed analyzer issues 2025-05-29 01:00:28 +07:00
Username1548
820b4d0a8b Merge remote-tracking branch 'upstream/main' 2025-05-29 00:57:55 +07:00
Username1548
cd4ca7288c feat(consultations): updated consultations archive screen, and added buisines logic 2025-05-29 00:57:37 +07:00
mso7nueh
c02585b149 Merge pull request 'testflight build ver 20' (#470) from main into test-flight
Reviewed-on: eatvio/eatvio_app#470
2025-05-28 13:57:14 +00: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
69c53321d2 Merge pull request 'testflight build 18' (#464) from mso7nueh/eatvio_app:main into test-flight
Reviewed-on: eatvio/eatvio_app#464
2025-05-26 10:50:34 +00: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
87393726fd Merge pull request 'main' (#461) from main into test-flight
Reviewed-on: eatvio/eatvio_app#461
2025-05-23 09:29:02 +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