Commit Graph

1609 Commits

Author SHA1 Message Date
mso7nueh
8dcfa6ee6a feat(verify): phone + email 2025-05-22 18:05:32 +03: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
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
mso7nueh
b2b2253f06 feat(recipe): edit recipe 2025-05-19 15:40:00 +03:00
mso7nueh
8fbd8c987e Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-19 09:36:40 +00:00
mso7nueh
dd6a287eba Merge pull request 'Пароли перенесены в переменные gitea' (#451) from main into test-flight
Reviewed-on: eatvio/eatvio_app#451
2025-05-19 09:14:41 +00:00
mso7nueh
05127a8a4a Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-19 09:06:54 +00:00
mso7nueh
476d4d2069 Merge pull request 'main' (#449) from main into test-flight
Reviewed-on: eatvio/eatvio_app#449
2025-05-18 14:00:06 +00:00
mso7nueh
8a3ac2d668 Merge pull request 'fix(testflight): remove code sync' (#450) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#450
2025-05-16 13:54:32 +00:00
mso7nueh
2a1c1dc56d fix(testflight): remove code sync 2025-05-16 16:54:10 +03:00
mso7nueh
b3bf2d12a7 Merge pull request 'fix(testflight): upd proj ver' (#448) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#448
2025-05-16 12:55:00 +00:00
mso7nueh
19d44b54b8 fix(testflight): upd proj ver 2025-05-16 15:54:32 +03:00
mso7nueh
b908fbbfb0 Merge pull request 'main' (#445) from main into test-flight
Reviewed-on: eatvio/eatvio_app#445
2025-05-16 12:18:19 +00:00
mso7nueh
77293eb614 Merge pull request 'feat(Issue-446): start screen profileScreen -> feedScreen' (#447) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#447
2025-05-16 12:18:04 +00:00
mso7nueh
083feec4ef feat(Issue-446): start screen profileScreen -> feedScreen 2025-05-16 15:17:18 +03:00
mso7nueh
49ede10a06 Merge pull request 'upd proj version' (#444) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#444
2025-05-16 11:23:38 +00:00
mso7nueh
b1516d6062 fix(testflight): upd proj version 2025-05-16 14:22:40 +03:00
mso7nueh
c2bc2f5260 Merge pull request 'main' (#40) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#40
2025-05-16 11:19:33 +00:00
mso7nueh
c4a8ba1cef Merge pull request 'Обновить .gitea/workflows/test-flight-cd.yaml' (#443) from main into test-flight
Reviewed-on: eatvio/eatvio_app#443
2025-05-16 11:19:06 +00:00
mso7nueh
659586c2ea Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-16 11:14:29 +00:00
mso7nueh
5c636206dd Merge pull request 'Consultant profile info' (#442) from main into test-flight
Reviewed-on: eatvio/eatvio_app#442
2025-05-16 11:08:49 +00:00
mso7nueh
983eb91d28 Merge pull request 'Issue-998: Исправление профиля консультанта, исправление экрана подписчиков' (#438) from mso7nueh/eatvio_app:Issue-998 into main
Reviewed-on: eatvio/eatvio_app#438
2025-05-16 11:08:14 +00:00
mso7nueh
5c223f7d70 fix(Issue-998): consultant profile info 2025-05-15 22:51:21 +03:00
mso7nueh
a1abe94fc2 fix(subs): fix subscribers screen error 2025-05-15 19:42:46 +03:00
mso7nueh
8a02138b32 Merge pull request 'fix(ios): upd project version' (#437) from mso7nueh/eatvio_app:main into test-flight
Reviewed-on: eatvio/eatvio_app#437
2025-05-14 14:47:19 +00:00
mso7nueh
14b676d667 fix(ios): upd project version 2025-05-14 17:46:49 +03:00
mso7nueh
d714884cfc Merge pull request 'fix(screens): welcome and update screen issue' (#436) from main into test-flight
Reviewed-on: eatvio/eatvio_app#436
2025-05-14 14:39:24 +00:00
mso7nueh
bd81647e83 Merge pull request 'fix(screens): welcome and update screen issue' (#435) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#435
2025-05-14 14:38:15 +00:00
mso7nueh
e18ec6036d fix(screens): welcome and update screen issue 2025-05-14 17:37:38 +03:00
mso7nueh
802f593b04 Merge pull request 'fix(ci/cd): java version 17 >> 21.x' (#434) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#434
2025-05-14 14:24:22 +00:00
mso7nueh
82c8ee492a fix(ci/cd): java version 17 >> 21.x 2025-05-14 17:23:53 +03:00
mso7nueh
e99471615b Merge pull request 'Merge pull request 'main' (#39) from eatvio/eatvio_app:main into main' (#433) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#433
2025-05-14 14:18:59 +00:00
mso7nueh
571e07f8e0 Merge pull request 'main' (#39) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#39
2025-05-14 14:18:40 +00:00
mso7nueh
d7fd0a9613 Merge pull request 'Merge pull request 'main' (#37) from eatvio/eatvio_app:main into main' (#432) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#432
2025-05-14 14:18:23 +00:00
mso7nueh
0c61d1679d Обновить .gitea/workflows/test.yml 2025-05-14 14:18:08 +00:00
mso7nueh
5cd4346da9 Merge pull request 'Обновить .gitea/workflows/test.yml' (#38) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#38
2025-05-14 14:14:13 +00:00
mso7nueh
feec4813d8 Обновить .gitea/workflows/test.yml 2025-05-14 14:14:00 +00:00
mso7nueh
6a3f35822a Merge pull request 'main' (#37) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#37
2025-05-14 14:12:22 +00:00
mso7nueh
41d1c17426 Обновить .gitea/workflows/test.yml 2025-05-14 14:11:46 +00:00