sync main #2

Merged
apoloz merged 559 commits from eatvio/eatvio_app:main into main 2025-06-30 07:23:35 +00:00

559 Commits

Author SHA1 Message Date
mso7nueh
300a708dfc Merge pull request 'fix(chat): multi images' (#535) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#535
2025-06-27 13:48:59 +00:00
mso7nueh
693260afb6 fix(chat): multi images 2025-06-27 16:48:12 +03:00
mso7nueh
9b4328a2ee Merge pull request 'feat(chat): add chat images/files preview' (#533) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#533
2025-06-27 12:07:41 +00:00
mso7nueh
591a8a597d feat(chat): add chat images/files preview 2025-06-27 15:06:46 +03:00
mso7nueh
2e5e1b3af4 Merge pull request 'Issue-440: chat(s) screen' (#530) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#530
2025-06-26 13:12:38 +00:00
mso7nueh
c103d214c4 feat(testflight): new version 2025-06-26 16:11:31 +03:00
mso7nueh
9946abc0be feat(chat): add refresh when new message 2025-06-26 16:10:34 +03:00
mso7nueh
87bf277248 feat(chat): add refresh in chats screen 2025-06-26 15:49:06 +03:00
mso7nueh
535dd595b7 Merge pull request 'fix: black screen Issue-514' (#528) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#528
2025-06-25 12:38:06 +00:00
mso7nueh
80afcd8949 upd ver to 32 2025-06-25 15:36:27 +03:00
mso7nueh
8c7c7f51cf fix: auth 2025-06-25 15:32:37 +03:00
mso7nueh
9c168d37ce fix: black screen 2025-06-25 14:56:59 +03:00
mso7nueh
55bc361b05 fix(qr+menu): text 2025-06-25 14:47:49 +03:00
mso7nueh
d14fbbb8d3 Merge pull request 'feat(chat+qr+devtools): fix chat first message, add pick images from gallery, qrcode, devtools' (#526) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#526
2025-06-25 09:24:28 +00:00
mso7nueh
7530270a2e feat(qr+devtools): scan qr code and dev tools 2025-06-25 12:22:14 +03:00
mso7nueh
f7e40e654d merge upstream 2025-06-24 17:28:49 +00:00
mso7nueh
75fa9ebc5c feat(chat): fix chat first message, add pick images from gallery 2025-06-23 19:46:23 +03:00
mso7nueh
c3647288a6 Merge pull request 'fix(chat): change sendChatMessage method' (#524) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#524
2025-06-22 15:29:47 +00:00
mso7nueh
85d67ba9c4 fix(chat): change sendChatMessage method 2025-06-22 18:27:25 +03:00
mso7nueh
15ffb4a3ec Merge pull request 'feat(testflight): update version' (#521) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#521
2025-06-20 12:46:11 +00:00
mso7nueh
2a705fdb66 feat(testflight): update version 2025-06-20 15:45:50 +03:00
mso7nueh
41ca97d030 Merge pull request 'feat(auth): reset password' (#520) from mso7nueh/eatvio_app:Issue-497 into main
Reviewed-on: eatvio/eatvio_app#520
2025-06-20 11:14:49 +00:00
mso7nueh
84b88282ad feat(auth): reset password 2025-06-20 14:12:54 +03:00
mso7nueh
84d52de935 Merge pull request 'fix(chat): Issue-440 chat v2' (#519) from mso7nueh/eatvio_app:Issue-440 into main
Reviewed-on: eatvio/eatvio_app#519
2025-06-20 08:48:07 +00:00
mso7nueh
fee92801b8 Merge pull request 'Issue-514 and Issue-497' (#516) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#516
2025-06-20 08:41:24 +00:00
mso7nueh
3b25e30b41 fix(chat): Issue-440 chat v2 2025-06-20 11:38:31 +03:00
mso7nueh
b0c29345a2 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	lib/main.dart
2025-06-18 16:57:22 +03:00
mso7nueh
7682859d32 fix: Issue-514 BlackScreens + info for apple 2025-06-18 16:56:42 +03:00
mso7nueh
d0426f6e1e merge upstream 2025-06-18 06:56:09 +00:00
mso7nueh
ca296040f2 fix: Issue-514 and Issue-497 2025-06-18 09:55:33 +03:00
mso7nueh
0581da038a feat(chat): Issue-440 add photo/file picker, fix black screen 2025-06-16 17:33:17 +03:00
mso7nueh
fa1192c5e5 Merge pull request 'upd ver -> 28' (#510) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#510
2025-06-16 11:33:55 +00:00
mso7nueh
41f948c8f7 upd ver -> 28 2025-06-16 14:33:32 +03:00
mso7nueh
896b2783ae Merge pull request 'feat(consultantFinances), feat(userPurchases)' (#494) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#494
2025-06-16 11:31:05 +00:00
mso7nueh
9c004f8593 Merge pull request 'fix(diary): fixed app review issues' (#502) from misha/eatvio_app:diaryFixes into main
Reviewed-on: eatvio/eatvio_app#502
2025-06-16 11:30:56 +00:00
mso7nueh
a577a8d58a Merge pull request 'fix(chat): time Issue-440' (#509) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#509
2025-06-16 11:25:29 +00:00
mso7nueh
3b2c4fdff5 fix(chat): time 2025-06-16 13:41:39 +03:00
mso7nueh
44d6487709 Merge pull request 'fix: testflight' (#507) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#507
2025-06-11 13:35:40 +00:00
mso7nueh
319fd2dfe3 fix: testflight 2025-06-11 16:35:21 +03:00
mso7nueh
a98043758b Merge pull request 'fix: testflight' (#506) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#506
2025-06-11 13:28:49 +00:00
mso7nueh
a84d2d7daa fix: testflight 2025-06-11 16:28:27 +03:00
Username1548
4acb861b69 merged upstram/main 2025-06-11 20:24:18 +07:00
Username1548
f163608a90 feat(permissions): added galery and camera permisshion checker 2025-06-11 20:13:26 +07:00
6bbec1f022 Merge pull request 'Issue-440 & Issue-194 & build 27' (#503) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#503
2025-06-11 12:49:09 +00:00
mso7nueh
c0311bf213 feat(chat&notifications): Issue-191 and Issue-440 and auth screen policy 2025-06-11 15:34:31 +03:00
mso7nueh
9d1e621769 feat(chat&notifications): Issue-191 and Issue-440 and auth screen policy 2025-06-11 15:34:16 +03:00
mso7nueh
11b695cefd feat(dev-tools): Issue-441 2025-06-10 17:04:29 +03:00
Username1548
926f0de450 feat(userPurchases, consultantFinances): added status to models and layout for status 2025-06-10 19:57:20 +07:00
mso7nueh
dc81085ae4 fix(chat&reg): fix chat screen, reg email valid 2025-06-09 17:57:10 +03:00
mso7nueh
8c0efc1a34 fix(chat&reg): fix chat screen, reg email valid 2025-06-09 17:57:01 +03:00
Username1548
2c3cc199c0 fix: change baseUrl 2025-06-09 19:53:26 +07:00
Username1548
2584a70a09 fix(diary): fixed app review issues 2025-06-09 19:51:32 +07:00
Username1548
483cf6d8ee feat(userPurchases): added user purchases, fix(consultations): fixed consultations bug 2025-06-09 14:01:05 +07:00
mso7nueh
87d3f058f6 Merge pull request 'Issue-329' (#500) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#500
2025-06-06 12:41:37 +00:00
mso7nueh
7a3c6e6b07 Merge remote-tracking branch 'origin/main' 2025-06-06 15:40:37 +03:00
mso7nueh
e6bad9d35d fix(blogPost): Issue-329 2025-06-06 15:40:27 +03:00
mso7nueh
72cf203658 Merge pull request 'build 26 + 1.1.3+33' (#495) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#495
2025-06-06 08:33:16 +00:00
Username1548
086fd1cac4 Merge remote-tracking branch 'upstream/main' 2025-06-05 22:43:50 +07:00
88e33765d3 Merge pull request 'feat(chats): added refresh timer for chat room, feat(diary): fixed plan duration in plan widget and added date to app bar)' (#492) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#492
2025-06-05 15:43:21 +00:00
Username1548
6fa4bffd7e feat(consultantFinaces): added consultant finaces screen 2025-06-05 22:42:50 +07:00
mso7nueh
70620d8d9e fix(blogPost): update without image 2025-06-05 17:36:49 +03:00
mso7nueh
0b2464ea19 fix(blogPost): update without image 2025-06-05 17:36:15 +03:00
Username1548
69359b01c5 Merge remote-tracking branch 'upstream/main' 2025-06-05 04:29:06 +07:00
Username1548
ff40e74491 feat(chats): added refresh timer for chat room, feat(diary): fixed plan duration in plan widget and added date to app bar) 2025-06-05 04:28:43 +07:00
mso7nueh
0270c940fe Merge pull request 'fix: email verify + consultant registration' (#490) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#490
2025-06-04 12:27:15 +00:00
mso7nueh
cacfaff4cf fix: email verify + consultant registration 2025-06-04 15:26:34 +03:00
mso7nueh
e728b0951a Merge pull request 'fix: upd ver to 23' (#488) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#488
2025-06-04 09:14:42 +00:00
mso7nueh
cf6ad1eafe fix: upd ver to 23 2025-06-04 12:14:09 +03:00
mso7nueh
bbba15b3c7 Merge pull request 'Issue-483' (#484) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#484
2025-06-04 08:28:44 +00:00
mso7nueh
c5e0d233f0 Merge pull request 'feat(plans): fixed plans price field in CreatePlanScreen, feat(menu): removed dev tools, feat(chats,notifications): added ws reconection' (#486) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#486
2025-06-04 08:28:34 +00:00
Username1548
da8d21bb08 feat(plans): fixed plans price field in CreatePlanScreen, feat(menu): removed dev tools, feat(chats,notifications): added ws reconection 2025-06-03 23:19:15 +07:00
mso7nueh
c361e12d35 Issue-483: WIP* moderation consultant request status and message 2025-06-03 18:17:03 +03:00
mso7nueh
7c354cc0a3 feat(consultant): ***WIP: consultant request status in settings 2025-06-02 17:51:27 +03:00
mso7nueh
f0a184b800 feat(consultant): update consultant info 2025-06-02 16:05:47 +03:00
mso7nueh
8a9a913420 fix(recipe): infinity loading recipe edit 2025-06-02 13:38:19 +03:00
mso7nueh
74ecbbdbff fix: plan widget in profile image size overflow 2025-06-02 13:31:00 +03:00
mso7nueh
c95b610c35 Merge pull request 'fix(notifications): fixed consultantLeftComment notifications issue' (#482) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#482
2025-06-02 07:18:59 +00:00
Username1548
35fc032d31 fix(notifications): fixed consultantLeftComment notifications issue 2025-05-30 21:19:49 +07:00
mso7nueh
1cb824573b Merge pull request 'fix: upd ver' (#481) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#481
2025-05-30 14:01:21 +00:00
mso7nueh
77c52a50e1 fix: upd ver 2025-05-30 17:00:01 +03: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
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
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
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
mso7nueh
88916a570a Merge pull request 'test-flight' (#431) from test-flight into main
Reviewed-on: eatvio/eatvio_app#431
2025-05-14 14:04:41 +00:00
mso7nueh
d1cb7fb998 Merge pull request 'Merge pull request 'main' (#36) from eatvio/eatvio_app:main into main' (#430) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#430
2025-05-14 13:43:52 +00:00
mso7nueh
6e8701e629 Обновить .gitea/workflows/test.yml 2025-05-14 13:43:35 +00:00
mso7nueh
2f9d6a46dd Обновить .gitea/workflows/test.yml 2025-05-14 13:36:34 +00:00
mso7nueh
8ec29f0b32 Merge pull request 'main' (#36) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#36
2025-05-14 13:26:44 +00:00
mso7nueh
b1f5165566 Merge pull request 'try to fix cicd' (#429) from misha/eatvio_app:main into test-flight
Reviewed-on: eatvio/eatvio_app#429
2025-05-14 13:24:34 +00:00
mso7nueh
10cf3bea6f Merge pull request 'Try to fix TestFlight ci/cd' (#426) from main into test-flight
Reviewed-on: eatvio/eatvio_app#426
2025-05-14 13:24:21 +00:00
Username1548
cffa48d2ca removed cert downloading 2025-05-14 20:13:49 +07:00
Username1548
ad5a9b50e9 sudo password added to secrets 2025-05-14 20:08:38 +07:00
Username1548
5895983178 removed sudo 2025-05-14 19:59:02 +07:00
Username1548
a7c89d342c ci/cd fix 2025-05-14 19:46:58 +07:00
mso7nueh
27bad2e902 fix 2025-05-14 15:01:39 +03:00
mso7nueh
46773c91b9 fix(testflight): ci/cd 2025-05-14 14:08:45 +03:00
mso7nueh
75be1012c9 Обновить .gitea/workflows/test.yml 2025-05-14 09:12:32 +00:00
mso7nueh
2429d6b5cd Merge pull request 'Issue-412: Исправление вёрсткий Update Screen' (#425) from mso7nueh/eatvio_app:Issue-412 into main
Reviewed-on: eatvio/eatvio_app#425
2025-05-14 08:02:12 +00:00
mso7nueh
159bb296d1 Merge pull request 'Issue-203: Исправление вёрстки Welcome Screen' (#424) from mso7nueh/eatvio_app:Issue-203 into main
Reviewed-on: eatvio/eatvio_app#424
2025-05-14 08:02:08 +00:00
mso7nueh
7683f2b099 fix(Issue-412): update screen 2025-05-14 09:43:10 +03:00
mso7nueh
67e7abb8a3 fix(Issue-203): welcome screen 2025-05-14 09:40:49 +03:00
mso7nueh
1a9c0a16ec Merge pull request 'main' (#35) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#35
2025-05-12 14:53:54 +00:00
mso7nueh
badfa352f9 Merge pull request 'main' (#421) from main into test-flight
Reviewed-on: eatvio/eatvio_app#421
2025-05-12 14:53:35 +00:00
mso7nueh
ef53ad45d6 Обновить ios/fastlane/Fastfile 2025-05-12 14:44:44 +00:00
mso7nueh
5929196004 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 14:44:17 +00:00
mso7nueh
cdfd2769f0 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 14:43:35 +00:00
mso7nueh
21e8a7cedf Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 14:37:57 +00:00
mso7nueh
dca3257386 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 14:36:41 +00:00
mso7nueh
39708e1782 feat(testflight): ci/cd 2025-05-12 17:17:30 +03:00
mso7nueh
8cd9972112 feat(testflight): change to distribution 2025-05-12 17:14:36 +03:00
mso7nueh
82fffec5f5 Обновить .gitea/workflows/test.yml 2025-05-12 13:31:40 +00:00
mso7nueh
8c0d8cc976 Merge pull request 'feat(comments): onTap to profile' (#422) from mso7nueh/eatvio_app:Issue-317 into main
Reviewed-on: eatvio/eatvio_app#422
2025-05-12 12:51:54 +00:00
mso7nueh
2c5931eea0 Merge pull request 'main' (#34) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#34
2025-05-12 12:51:19 +00:00
mso7nueh
2adedf16ae feat(comments): onTap to profile 2025-05-12 15:50:42 +03:00
mso7nueh
b1884e7863 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 11:41:09 +00:00
mso7nueh
d92f511aa5 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 11:25:16 +00:00
mso7nueh
76f73a77c3 Обновить ios/fastlane/Fastfile 2025-05-12 11:23:43 +00:00
mso7nueh
0c68482f21 Обновить ios/fastlane/Fastfile 2025-05-12 11:21:13 +00:00
mso7nueh
23fe075bfd Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 11:18:32 +00:00
mso7nueh
5fa1ca6bf2 Обновить ios/fastlane/Fastfile 2025-05-12 11:14:45 +00:00
mso7nueh
5e89c5e9c6 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 11:13:07 +00:00
mso7nueh
84c8cb0fc1 Обновить ios/fastlane/Fastfile 2025-05-12 11:11:41 +00:00
mso7nueh
17e0d53c1b Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 11:11:23 +00:00
mso7nueh
6e29a2f92c Обновить ios/fastlane/Fastfile 2025-05-12 11:01:54 +00:00
mso7nueh
d3a1c2fe26 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 10:44:59 +00:00
mso7nueh
f5577e00e7 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 10:40:48 +00:00
mso7nueh
e52feae03a Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 10:36:53 +00:00
mso7nueh
737bb3b1e5 Обновить ios/fastlane/Fastfile 2025-05-12 10:35:44 +00:00
mso7nueh
305d103eb7 Обновить ios/fastlane/Fastfile 2025-05-12 10:33:07 +00:00
mso7nueh
31712f3c40 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 10:17:06 +00:00
mso7nueh
2480f20563 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 10:12:50 +00:00
mso7nueh
457ae25dc8 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 09:34:32 +00:00
mso7nueh
d2ac34e6d7 feat(fastlane): complete 2025-05-12 12:31:35 +03:00
mso7nueh
c887ec4b59 feat(fastlane): add checkout 2025-05-12 12:08:08 +03:00
mso7nueh
5a22b74544 Merge branch 'main' of http://gitea.office.local:3000/eatvio/eatvio_app 2025-05-12 12:05:37 +03:00
mso7nueh
028230003e feat(fastlane): add fastlane 2025-05-12 12:04:51 +03:00
mso7nueh
c84af71020 Merge pull request 'fix: test-flight' (#405) from main into test-flight
Reviewed-on: eatvio/eatvio_app#405
2025-05-12 09:01:21 +00:00
mso7nueh
c0f66b7a93 Обновить .gitea/workflows/test-flight-cd.yaml 2025-05-12 09:00:58 +00:00
mso7nueh
03ea191c7a Merge pull request 'Issue-329 Реализация функционала удаления и снятия с публикации контента (диеты, планы, рецепты, посты)' (#417) from mso7nueh/eatvio_app:Issue-329 into main
Reviewed-on: eatvio/eatvio_app#417
2025-05-07 10:01:39 +00:00
mso7nueh
b2d9e808fe feat(more_options): delete recipe, diet, plans, move to draft diets and plans 2025-05-07 12:48:52 +03:00
mso7nueh
037fc3d529 Merge pull request 'main' (#33) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#33
2025-05-06 10:39:20 +00:00
mso7nueh
3c97c91bb4 Merge pull request 'fix(welcomeScreen): remove emoji' (#413) from mso7nueh/eatvio_app:Issue-412 into main
Reviewed-on: eatvio/eatvio_app#413
2025-05-06 10:38:30 +00:00
mso7nueh
045bf365ec Merge pull request 'feat(chat, consutations): fixed chat screen and consultations screen' (#415) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#415
2025-05-06 10:38:13 +00:00
Username1548
c790214a26 fix(chat): fixed chat screen 2025-05-06 17:22:45 +07:00
Username1548
5852a67654 fix(consultations): fixed consultations screen 2025-05-06 17:20:36 +07:00
mso7nueh
acc88470f1 fix(welcomeScreen): remove emoji 2025-05-05 15:47:25 +03:00
mso7nueh
33628951dc Merge pull request 'fix(support): link' (#411) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#411
2025-04-30 15:09:50 +00:00
mso7nueh
60d244aac2 fix(support): link 2025-04-30 18:09:19 +03:00
mso7nueh
801760a093 Merge pull request 'main' (#32) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#32
2025-04-30 14:34:42 +00:00
mso7nueh
849e3cde72 Обновить .gitea/workflows/test.yml 2025-04-30 14:34:17 +00:00
7b412a9eba Merge pull request 'changed base url' (#410) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#410
2025-04-30 14:33:09 +00:00
mso7nueh
e499a9ee03 Merge pull request 'main' (#31) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#31
2025-04-30 14:32:06 +00:00
Username1548
5e6cdca9c3 changed base url 2025-04-30 21:32:05 +07:00
mso7nueh
43bfcbbfd8 Merge pull request 'Issue-329' (#404) from mso7nueh/eatvio_app:Issue-329 into main
Reviewed-on: eatvio/eatvio_app#404
2025-04-30 14:30:41 +00:00
2fbb99e466 Merge pull request 'feat(chats,diary): added logic for chosen diet portions and added banner to finish plan to chats' (#409) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#409
2025-04-30 14:29:41 +00:00
mso7nueh
74e2bd1f89 Merge pull request 'feat(support): add docs' (#408) from mso7nueh/eatvio_app:Issue-407 into main
Reviewed-on: eatvio/eatvio_app#408
2025-04-30 14:28:57 +00:00
mso7nueh
2ab148d0d0 feat(menu): add popup to recipe, diet, plan 2025-04-30 17:26:34 +03:00
Username1548
a5f0fa7825 Merge remote-tracking branch 'upstream/main' 2025-04-30 21:25:40 +07:00
Username1548
3b4ed501fb feat(chats,diary): added logic for chosen diet portions and added banner to finish plan to chats 2025-04-30 21:25:23 +07:00
mso7nueh
32d698bf82 feat(support): add docs 2025-04-30 16:02:39 +03:00
mso7nueh
a4260dc883 Merge pull request 'Контекстное меню (три точки)' (#403) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#403
2025-04-30 09:18:32 +00:00
mso7nueh
37ed041da4 fix: test-flight 2025-04-30 12:18:07 +03:00
mso7nueh
d040f94979 feat(recipes): custom popup for recipes 2025-04-30 10:57:30 +03:00
e572614a8b Merge pull request 'Plans creation has been completed' (#401) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#401
2025-04-29 13:56:59 +00:00
mso7nueh
66196a3332 feat: custom popup for blogPosts 2025-04-29 13:06:09 +03:00
mso7nueh
b5fd9dc7c5 Merge pull request 'update screen + welcome screen' (#402) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#402
2025-04-29 09:06:06 +00:00
mso7nueh
6b48eaf8fe feat: update screen 2025-04-29 12:01:13 +03:00
mso7nueh
b74d683e2c feat: add welcome screen 2025-04-29 11:42:20 +03:00
Username1548
22bbb58072 Merge remote-tracking branch 'upstream/main' 2025-04-29 14:46:46 +07:00
Username1548
0fcb2c1a0d feat(plans): plan creating has been completed 2025-04-29 14:44:33 +07:00
mso7nueh
ff277d229a Merge pull request 'Исправления и улучшения' (#400) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#400
2025-04-28 10:21:57 +00:00
mso7nueh
af63b82f52 fix: analyzer 2025-04-25 15:33:47 +03:00
mso7nueh
4aad916c1e feat(support): task 397 email copy 2025-04-25 15:33:10 +03:00
mso7nueh
746aab2fae feat(profile): 371 task badge description onTap 2025-04-25 15:25:48 +03:00
mso7nueh
3e0ba5c440 Merge pull request 'main' (#30) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#30
2025-04-25 12:12:07 +00:00
mso7nueh
3694393674 Merge pull request 'fix(profile): profile subs fixed' (#399) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#399
2025-04-25 12:11:32 +00:00
Username1548
c8b828bfe1 fix(profile): profile subs fixed 2025-04-25 19:10:08 +07:00
mso7nueh
1d74aadac6 Merge pull request 'Попытка настройки автосборки в тестфлайт, завново создал все сертификаты и ключи' (#340) from main into test-flight
Reviewed-on: eatvio/eatvio_app#340
2025-04-25 12:09:08 +00:00
mso7nueh
a52a5383de fix(feed): task 374 raing score, description 2025-04-25 13:50:23 +03:00
mso7nueh
886dfa2570 fix(finance): task 332 remove card manage for user and red color for canceled 2025-04-25 13:17:37 +03:00
mso7nueh
27b1656690 feat(avatar): task 394 placeholder empty avatar 2025-04-25 12:56:23 +03:00
mso7nueh
a3d903b6b9 remove ignored files 2025-04-25 11:04:18 +03:00
mso7nueh
1178525a93 fix(feed): показать ещё (338), комментарии (325), переход в профиль (317) 2025-04-25 11:03:52 +03:00
mso7nueh
bc7fcd5c65 Merge pull request 'added consultant comment to diary' (#29) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#29
2025-04-25 06:41:17 +00:00
d689074a81 Merge pull request 'added consultant comment to diary' (#391) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#391
2025-04-23 21:36:21 +00:00
Username1548
4802d91b77 Merge remote-tracking branch 'upstream/main' 2025-04-24 04:31:26 +07:00
Username1548
3754d047fb feat(diary): consultant comments 2025-04-24 04:20:24 +07:00
mso7nueh
4298243f78 Merge pull request 'fix(ci/cd): test-flight' (#390) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#390
2025-04-23 14:50:44 +00:00
mso7nueh
1fa63f9a52 fix(ci/cd): test-flight 2025-04-23 17:50:26 +03:00
mso7nueh
7a68f08a3b Merge pull request 'fix(ci/cd): test-flight' (#389) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#389
2025-04-23 14:45:29 +00:00
mso7nueh
7263fa865c fix(ci/cd): test-flight 2025-04-23 17:45:15 +03:00
mso7nueh
83a65538c9 Merge pull request 'fix(ci/cd): test-flight' (#388) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#388
2025-04-23 14:37:45 +00:00
mso7nueh
4bfeb027cc fix(ci/cd): test-flight 2025-04-23 17:37:31 +03:00
mso7nueh
48a48db5d8 Merge pull request 'fix(ci/cd): test-flight' (#387) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#387
2025-04-23 14:29:15 +00:00
mso7nueh
f9b1031567 fix(ci/cd): test-flight 2025-04-23 17:29:04 +03:00
mso7nueh
6133c05570 Merge pull request 'fix(ci/cd): test-flight' (#386) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#386
2025-04-23 14:23:57 +00:00
mso7nueh
ed52c81ca7 fix(ci/cd): test-flight 2025-04-23 17:23:43 +03:00
mso7nueh
52fcbe80f6 Merge pull request 'fix(ci/cd): test flight' (#385) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#385
2025-04-23 14:18:41 +00:00
mso7nueh
997213b4fb fix(ci/cd): test flight 2025-04-23 17:16:56 +03:00
mso7nueh
fd12243f52 Merge pull request 'main' (#384) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#384
2025-04-23 14:09:27 +00:00
mso7nueh
2f9daa129d fix(ci/cd): test-flight 2025-04-23 17:01:44 +03:00
mso7nueh
e0f472a8e6 Merge pull request 'main' (#28) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#28
2025-04-23 13:41:32 +00:00
mso7nueh
ef78dcfdd7 fix(ci/cd): test flight 2025-04-23 15:24:28 +03:00
mso7nueh
c4ff518a4b fix(ci/cd): test flight 2025-04-23 14:56:52 +03:00
mso7nueh
1c6ecb35fb fix(ci/cd): test flight 2025-04-23 14:46:40 +03:00
mso7nueh
3e63281a90 fix(ci/cd): test flight 2025-04-23 14:46:19 +03:00
mso7nueh
567201aee1 fix(ci/cd): test flight 2025-04-23 14:45:35 +03:00
mso7nueh
b1ccb79b46 fix(ci/cd): test flight 2025-04-23 14:43:11 +03:00
mso7nueh
1676649f1f Merge pull request 'fix(ci/cd): test-flight' (#383) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#383
2025-04-23 11:37:34 +00:00
mso7nueh
8099c7d97d fix(ci/cd): test-flight 2025-04-23 14:37:05 +03:00
mso7nueh
2bcc5a5d74 Merge pull request 'fix(ci/cd): test-flight' (#382) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#382
2025-04-23 11:27:20 +00:00
mso7nueh
258b575535 fix(ci/cd): test-flight 2025-04-23 14:27:00 +03:00
mso7nueh
b3c84d21e7 Merge pull request 'fix(ci/cd): test-flight' (#381) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#381
2025-04-23 11:26:15 +00:00
mso7nueh
cdef5b6582 fix(ci/cd): test-flight 2025-04-23 14:25:45 +03:00
mso7nueh
490f788c53 Merge pull request 'fix(ci/cd): test-flight' (#380) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#380
2025-04-23 11:16:53 +00:00
mso7nueh
dff6528f7b fix(ci/cd): test-flight 2025-04-23 14:16:28 +03:00
mso7nueh
ad003527e0 Merge pull request 'fix(ci/cd): test-flight' (#379) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#379
2025-04-23 11:10:11 +00:00
mso7nueh
834fbc31dd fix(ci/cd): test-flight 2025-04-23 14:09:53 +03:00
mso7nueh
bd843a75ee Merge pull request 'main' (#378) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#378
2025-04-23 08:56:53 +00:00
mso7nueh
310c935886 fix(ci/cd): test-flight 2025-04-23 11:56:31 +03:00
mso7nueh
fe489a8454 fix(ci/cd): test-flight 2025-04-23 11:54:59 +03:00
mso7nueh
50e677bb91 Merge pull request 'fix(ci/cd): test-flight' (#377) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#377
2025-04-23 08:48:55 +00:00
mso7nueh
e492a78b9b fix(ci/cd): test-flight 2025-04-23 11:48:27 +03:00
mso7nueh
573f192182 Merge pull request 'fix(ci/cd): test-flight' (#376) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#376
2025-04-23 08:45:00 +00:00
mso7nueh
bea152ecf3 fix(ci/cd): test-flight 2025-04-23 11:44:39 +03:00
mso7nueh
0144478ee1 Merge pull request 'fix(ci/cd): test-flight' (#375) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#375
2025-04-23 08:40:53 +00:00
mso7nueh
19a59bdd20 fix(ci/cd): test-flight 2025-04-23 11:40:37 +03:00
mso7nueh
fec5749dd4 Merge pull request 'fix(ci/cd): test-flight' (#370) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#370
2025-04-21 18:43:30 +00:00
mso7nueh
c23db15c11 fix(ci/cd): test-flight 2025-04-21 21:43:03 +03:00
mso7nueh
aad6774d91 Merge pull request 'fix(ci/cd): test-flight' (#369) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#369
2025-04-21 18:39:32 +00:00
mso7nueh
c7eecc027d fix(ci/cd): test-flight 2025-04-21 21:39:01 +03:00
mso7nueh
6bc1b98b24 Merge pull request 'fix(ci/cd): test-flight' (#368) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#368
2025-04-21 18:36:58 +00:00
mso7nueh
36d7cd3698 Merge remote-tracking branch 'origin/main' 2025-04-21 21:36:19 +03:00
mso7nueh
fe2bd8d391 fix(ci/cd): test-flight 2025-04-21 21:36:07 +03:00
mso7nueh
10309bc927 Merge pull request 'fix(ci/cd): test-flight' (#367) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#367
2025-04-21 17:04:08 +00:00
mso7nueh
b78b9b89f2 Обновить ios/Runner.xcodeproj/project.pbxproj 2025-04-21 17:01:20 +00:00
mso7nueh
7db4f291e2 fix(ci/cd): test-flight 2025-04-21 20:00:28 +03:00
mso7nueh
9f07df14d1 Merge pull request 'fix(ci/cd): test-flight' (#366) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#366
2025-04-21 16:41:18 +00:00
mso7nueh
e27b800594 fix(ci/cd): test-flight 2025-04-21 19:40:50 +03:00
mso7nueh
98f60bcd6c Merge pull request 'fix(ci/cd): test-flight' (#365) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#365
2025-04-21 16:31:02 +00:00
mso7nueh
a3fbded9d6 fix(ci/cd): test-flight 2025-04-21 19:30:18 +03:00
mso7nueh
c00df89b78 Merge pull request 'fix(ci/cd): export options' (#364) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#364
2025-04-21 16:14:56 +00:00
mso7nueh
dfc8b60b74 fix(ci/cd): export options 2025-04-21 19:14:31 +03:00
mso7nueh
de9db33099 Merge pull request 'fix(ci/cd): revert' (#363) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#363
2025-04-21 16:03:13 +00:00
mso7nueh
2df68a2f92 fix(ci/cd): revert 2025-04-21 19:02:55 +03:00
mso7nueh
d69c45117d Merge pull request 'fix(ci/cd): build tf env' (#362) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#362
2025-04-21 16:02:02 +00:00
mso7nueh
ea22380fb1 fix(ci/cd): build tf env 2025-04-21 19:01:36 +03:00
mso7nueh
d1970f7ce6 Merge pull request 'fix(ci/cd): build tf env' (#361) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#361
2025-04-21 15:59:37 +00:00
mso7nueh
ffc5c7df61 fix(ci/cd): build tf env 2025-04-21 18:59:12 +03:00
mso7nueh
c63af7cbb7 Merge pull request 'fix(ci/cd): build tf env' (#360) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#360
2025-04-21 15:56:44 +00:00
mso7nueh
0e16b39080 fix(ci/cd): build tf env 2025-04-21 18:56:26 +03:00
mso7nueh
ae17613cca Merge pull request 'fix(ci/cd): build tf env' (#359) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#359
2025-04-21 15:55:03 +00:00
mso7nueh
de6beece5e fix(ci/cd): build tf env 2025-04-21 18:54:47 +03:00
mso7nueh
c1005e1be7 Merge pull request 'fix(ci/cd): build tf env' (#358) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#358
2025-04-21 15:36:56 +00:00
mso7nueh
a2b3c1c520 fix(ci/cd): build tf env 2025-04-21 18:36:33 +03:00
mso7nueh
57d30ed4b7 Merge pull request 'fix(ci/cd): build tf env' (#357) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#357
2025-04-21 15:28:39 +00:00
mso7nueh
3004e0e388 fix(ci/cd): build tf env 2025-04-21 18:28:16 +03:00
mso7nueh
ac92d0a3e4 Merge pull request 'fix(ci/cd): build tf env' (#356) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#356
2025-04-21 15:23:50 +00:00
mso7nueh
494a41b001 fix(ci/cd): build tf env 2025-04-21 18:23:27 +03:00
mso7nueh
1bf55fe8cd Merge pull request 'fix(ci/cd): build tf' (#355) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#355
2025-04-21 15:17:23 +00:00
mso7nueh
f66ab7eae9 fix(ci/cd): build tf 2025-04-21 18:17:05 +03:00
mso7nueh
a7f1d681a8 Merge pull request 'fix(ci/cd): build tf' (#354) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#354
2025-04-21 14:59:58 +00:00
mso7nueh
26edfa593f fix(ci/cd): build tf 2025-04-21 17:59:24 +03:00
mso7nueh
1d8ec8302d Merge pull request 'fix(ci/cd): build tf' (#353) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#353
2025-04-21 14:46:09 +00:00
mso7nueh
a2af0365dc fix(ci/cd): build tf 2025-04-21 17:45:45 +03:00
mso7nueh
5104100391 Merge pull request 'fix(ci/cd): build tf' (#352) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#352
2025-04-21 14:43:44 +00:00
mso7nueh
5ace31d3a4 fix(ci/cd): build tf 2025-04-21 17:43:19 +03:00
mso7nueh
08c9317542 Merge pull request 'fix(ci/cd): build tf' (#351) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#351
2025-04-21 14:29:44 +00:00
mso7nueh
625c1421a7 fix(ci/cd): build tf 2025-04-21 17:29:19 +03:00
mso7nueh
15c0e7f31d Merge pull request 'fix(ci/cd): build export options' (#350) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#350
2025-04-21 14:17:02 +00:00
mso7nueh
2c58fe3dd0 fix(ci/cd): build export options 2025-04-21 17:16:27 +03:00
mso7nueh
376691ac98 Merge pull request 'fix(ci/cd): build tf' (#349) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#349
2025-04-21 14:07:28 +00:00
mso7nueh
031c32d994 fix(ci/cd): build tf 2025-04-21 17:07:05 +03:00
mso7nueh
f165c60fc1 fix(feed): consultant badge size 2025-04-21 17:03:08 +03:00
mso7nueh
395474b3ec Merge pull request 'fix(ci/cd): build tf' (#348) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#348
2025-04-21 13:56:37 +00:00
mso7nueh
f8a74a4664 fix(ci/cd): build tf 2025-04-21 16:56:13 +03:00
mso7nueh
ba3e12bba4 Merge pull request 'fix(ci/cd): export options' (#347) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#347
2025-04-21 13:43:09 +00:00
mso7nueh
210e821107 Обновить ios/Runner.xcodeproj/project.pbxproj 2025-04-21 13:42:41 +00:00
mso7nueh
84cd2aebc9 Merge pull request 'fix(ci/cd): export options' (#347) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#347
2025-04-21 13:38:34 +00:00
mso7nueh
726301a64b fix(ci/cd): export options 2025-04-21 16:38:18 +03:00
mso7nueh
1f72e83e9e Merge pull request 'fix(ci/cd): project options' (#346) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#346
2025-04-21 13:31:31 +00:00
mso7nueh
95373b0fa8 fix(ci/cd): project options 2025-04-21 16:30:21 +03:00
mso7nueh
54a4bbc82b Merge pull request 'fix(ci/cd): export options' (#345) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#345
2025-04-21 13:24:35 +00:00
mso7nueh
8fec0a623a fix(ci/cd): export options 2025-04-21 16:24:10 +03:00
mso7nueh
fcc88f47b0 Merge pull request 'fix(ci/cd): build tf' (#344) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#344
2025-04-21 12:38:01 +00:00
mso7nueh
537ae19687 fix(ci/cd): build tf 2025-04-21 15:37:26 +03:00
mso7nueh
a2a47c6e88 Merge pull request 'fix(ci/cd): upd ExportOptions' (#343) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#343
2025-04-21 12:33:30 +00:00
mso7nueh
b1095585a4 fix(ci/cd): upd ExportOptions 2025-04-21 15:32:49 +03:00
mso7nueh
976cb9ac57 Merge pull request 'env >> vars' (#342) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#342
2025-04-21 12:27:40 +00:00
mso7nueh
61a7b12f93 fix(ci/cd): env >> vars 2025-04-21 15:27:15 +03:00
mso7nueh
83ad3ffdd1 Merge pull request 'secrets >> env' (#341) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#341
2025-04-21 12:26:13 +00:00
mso7nueh
554b747d8e fix(ci/cd): secrets >> env 2025-04-21 15:25:37 +03:00
mso7nueh
740ccb7d30 fix(ci/cd): test-flight 2025-04-21 14:35:22 +03:00
mso7nueh
3d87940755 Merge pull request 'Архив консультаций, мои финансы, лента' (#339) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#339
2025-04-21 10:16:34 +00:00
mso7nueh
0ead4556b9 feat(archiveOfConsultations): #331 2025-04-21 13:00:23 +03:00
mso7nueh
d49fa29dfb feat(finance): #332 2025-04-21 12:14:08 +03:00
mso7nueh
76b514614a feat(feed): #337 2025-04-21 12:04:02 +03:00
mso7nueh
2275eee3d7 feat(feed): #338 2025-04-21 11:59:03 +03:00
mso7nueh
e56047b000 Merge pull request '"В черновик"в диетах, гитигнор, удален сгенерированные фалйы, подсчёт просмотров, исплавние опечаток, добавление трёх точек в ленте' (#336) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#336
2025-04-21 08:30:22 +00:00
mso7nueh
2d113024ff fix: downgrade analyzer 2025-04-21 11:16:54 +03:00
mso7nueh
b0a6ec6558 fix: downgrade analzyer 2025-04-21 10:42:44 +03:00
mso7nueh
93ee1abb2d fix: generate build_runner 2025-04-18 16:58:06 +03:00
mso7nueh
0b20520e0b fix: generate build_runner 2025-04-18 16:53:03 +03:00
mso7nueh
c4d8ad1907 Merge branch 'eatvio-main' 2025-04-18 16:06:05 +03:00
mso7nueh
f85bad0bb8 resovle conflict 2025-04-18 16:04:30 +03:00
mso7nueh
397236a9f5 fix: merge conflict 2025-04-18 16:03:07 +03:00
mso7nueh
2cfb5dd5d7 Merge pull request 'feat(test-flight): try test flight load' (#327) from main into test-flight
Reviewed-on: eatvio/eatvio_app#327
2025-04-18 12:57:28 +00:00
mso7nueh
64ef5c8c54 fix: merge conflict 2025-04-18 15:56:59 +03:00
mso7nueh
51fb27495d fix(diet): diet states 2025-04-18 15:52:48 +03:00
mso7nueh
93236783c7 fix: remove ignored files 2025-04-18 12:36:11 +03:00
mso7nueh
600e2ea517 Обновить Build-tf 2025-04-16 11:58:19 +00:00
mso7nueh
a60007b73b Обновить Build-tf 2025-04-16 11:56:16 +00:00
mso7nueh
3b73f2fe2c Обновить Build-tf 2025-04-16 11:54:05 +00:00
mso7nueh
2ba130f875 feat(feed): views, more options 2025-04-16 13:24:43 +03:00
ea95317095 Merge pull request 'feat(order info): added order info screen' (#326) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#326
2025-04-15 11:53:47 +00:00
mso7nueh
f40fbff893 Обновить Build-tf 2025-04-14 14:46:50 +00:00
mso7nueh
f839203389 Обновить Build-tf 2025-04-14 13:47:29 +00:00
mso7nueh
ba4f960c11 Обновить Support/ExportOptions.plist 2025-04-14 13:23:15 +00:00
mso7nueh
75d7e65948 Обновить Build-tf 2025-04-14 13:01:01 +00:00
mso7nueh
b0fb4b4727 fix(many): 325 and 317 tasks 2025-04-14 14:21:47 +03:00
mso7nueh
e4ac0311e8 Merge pull request 'main' (#25) from misha/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#25
2025-04-14 10:56:56 +00:00
mso7nueh
c463448b8f Merge pull request 'main' (#24) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#24
2025-04-14 09:11:29 +00:00
Username1548
267cc38a0b fix: changed baseUrl 2025-04-08 21:30:08 +07:00
Username1548
823dc78490 fix(diary): added proccesing of future dates and fixed deleted portions 2025-04-08 21:28:40 +07:00
Username1548
245c854754 fix: changed baseUrl 2025-04-04 20:47:52 +07:00
9a9ef444f1 Merge pull request 'Test implementation of push notifications' (#324) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#324
2025-04-04 13:22:06 +00:00
Username1548
748484cf8f feat(order info): added order info screen 2025-04-04 20:21:31 +07:00
Username1548
9715f4cac9 fixed analyzer issue 2025-03-28 20:37:28 +07:00
Username1548
f9741adf1e fix(blog posts, diets, plans, recipies): changed name of json field for descriptions of models 2025-03-28 20:36:09 +07:00
Username1548
7008276735 fix: fixed analyzer issues 2025-03-26 19:56:28 +07:00
Username1548
6e917989ff Merge remote-tracking branch 'upstream/main' 2025-03-26 19:51:16 +07:00
Username1548
b54deb66e7 feat(push notifications): test implemintation of push notifcations 2025-03-26 19:48:02 +07:00
mso7nueh
70cfa15597 Merge pull request 'fix(analyzer): all' (#323) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#323
2025-03-24 14:46:42 +00:00
mso7nueh
d0a1b72cbe fix(analyzer): all 2025-03-24 17:46:28 +03:00
mso7nueh
d92bb6a59f Merge pull request 'feat(diary): wakeup, retire, mood, comment' (#322) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#322
2025-03-24 14:38:26 +00:00
mso7nueh
a871dd8951 feat(diary): wakeup, retire, mood, comment 2025-03-24 17:37:47 +03:00
mso7nueh
088a1cef50 Merge pull request 'main' (#321) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#321
2025-03-24 11:10:55 +00:00
mso7nueh
fcdc57493d feat: from plan to profile 2025-03-24 14:07:52 +03:00
mso7nueh
35ac11e019 feat: from blog post to profile 2025-03-24 14:04:28 +03:00
mso7nueh
37f7b33ac4 feat: from chat to profile 2025-03-24 13:58:01 +03:00
mso7nueh
e476eabcde feat: automatic capitalization 2025-03-24 13:53:19 +03:00
mso7nueh
89279b9ada feat: comment field increase size 2025-03-24 13:50:35 +03:00
mso7nueh
595a5d1f97 fix: decimal value on glossary moderation 2025-03-24 13:34:46 +03:00
mso7nueh
d84e3662c6 fix: plans loading 2025-03-24 13:31:12 +03:00
mso7nueh
e082bbc3c9 fix: recipe loading 2025-03-24 13:28:40 +03:00
mso7nueh
5eee8d2db0 Merge pull request 'main' (#320) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#320
2025-03-24 09:08:43 +00:00
mso7nueh
95754fbdd8 Merge remote-tracking branch 'origin/main' 2025-03-24 12:08:29 +03:00
mso7nueh
06846d593a fix: remove widget test 2025-03-24 12:08:22 +03:00
mso7nueh
0da839559b Удалить test/widget_test.dart 2025-03-24 09:07:39 +00:00
mso7nueh
e00900db62 Удалить test/widget_test.dart 2025-03-24 09:07:27 +00:00
mso7nueh
9b7e07484f Merge pull request 'main' (#23) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#23
2025-03-24 09:07:05 +00:00
mso7nueh
bee780f011 Merge pull request 'main' (#319) from main into test-flight
Reviewed-on: eatvio/eatvio_app#319
2025-03-21 13:49:05 +00:00
mso7nueh
e0f50f3a24 Merge pull request 'cards screen updated' (#318) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#318
2025-03-21 13:48:46 +00:00
Username1548
fd089e0206 Merge remote-tracking branch 'upstream/main' 2025-03-21 20:43:35 +07:00
Username1548
cdc16b9a9c card adding and selecting default one 2025-03-21 20:40:48 +07:00
mso7nueh
b969b713c9 Merge pull request 'main' (#316) from main into test-flight
Reviewed-on: eatvio/eatvio_app#316
2025-03-19 13:41:47 +00:00
mso7nueh
50992adc1b Merge pull request 'feat: upd build tf' (#315) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#315
2025-03-19 13:41:35 +00:00
mso7nueh
3aba5de3ec feat: upd build tf 2025-03-19 16:41:18 +03:00
mso7nueh
991967657d Merge pull request 'main' (#314) from main into test-flight
Reviewed-on: eatvio/eatvio_app#314
2025-03-19 13:32:11 +00:00
mso7nueh
1c6ea485f6 Merge pull request 'feat: build tf upd 12' (#313) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#313
2025-03-19 13:31:53 +00:00
mso7nueh
467ae0afd3 feat: build tf upd 12 2025-03-19 16:31:35 +03:00
mso7nueh
d45fd9bc5a Merge pull request 'main' (#312) from main into test-flight
Reviewed-on: eatvio/eatvio_app#312
2025-03-19 13:28:49 +00:00
mso7nueh
9228055b9e Merge pull request 'feat: build tf upd 11' (#311) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#311
2025-03-19 13:28:16 +00:00
mso7nueh
f26e89fc25 feat: build tf upd 11 2025-03-19 16:27:54 +03:00
mso7nueh
066169b059 Merge pull request 'main' (#310) from main into test-flight
Reviewed-on: eatvio/eatvio_app#310
2025-03-19 12:25:52 +00:00
mso7nueh
42e7697a2a Merge pull request 'feat: build tf upd 10' (#309) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#309
2025-03-19 12:25:36 +00:00
mso7nueh
066395983f feat: build tf upd 10 2025-03-19 15:25:13 +03:00
mso7nueh
173995791b Merge pull request 'main' (#308) from main into test-flight
Reviewed-on: eatvio/eatvio_app#308
2025-03-19 12:11:45 +00:00
mso7nueh
e4bb34a58b Merge pull request 'feat: build tf upd 9' (#307) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#307
2025-03-19 12:11:34 +00:00
mso7nueh
a14d31cd7a feat: build tf upd 9 2025-03-19 15:11:16 +03:00
mso7nueh
9195b2ed29 Merge pull request 'main' (#306) from main into test-flight
Reviewed-on: eatvio/eatvio_app#306
2025-03-19 12:08:24 +00:00
mso7nueh
f02b4c434f Merge pull request 'feat: build tf upd 8' (#305) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#305
2025-03-19 12:08:11 +00:00
mso7nueh
255d59127d feat: build tf upd 8 2025-03-19 15:07:54 +03:00
mso7nueh
e8f89d605c Merge pull request 'main' (#304) from main into test-flight
Reviewed-on: eatvio/eatvio_app#304
2025-03-19 10:32:57 +00:00
mso7nueh
9483c53b5f Merge pull request 'feat: info by order screen' (#303) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#303
2025-03-19 10:32:42 +00:00
mso7nueh
f97da886b4 feat: info by order screen 2025-03-19 13:32:23 +03:00
mso7nueh
6431111362 Merge pull request 'main' (#302) from main into test-flight
Reviewed-on: eatvio/eatvio_app#302
2025-03-19 08:25:27 +00:00
mso7nueh
0adae087ac Merge pull request 'feat: eo' (#301) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#301
2025-03-19 08:25:13 +00:00
mso7nueh
70eaa0e0da feat: eo 2025-03-19 11:24:51 +03:00
mso7nueh
9c268baa27 Merge pull request 'main' (#300) from main into test-flight
Reviewed-on: eatvio/eatvio_app#300
2025-03-19 08:22:21 +00:00
mso7nueh
caa2f28872 Merge pull request 'feat: export options' (#299) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#299
2025-03-19 08:22:06 +00:00
mso7nueh
186f1f40e5 feat: export options 2025-03-19 11:21:46 +03:00
mso7nueh
6a67cfa3ba Merge pull request 'main' (#298) from main into test-flight
Reviewed-on: eatvio/eatvio_app#298
2025-03-19 08:08:05 +00:00
mso7nueh
31df4797d0 Merge pull request 'feat: upd build tf' (#297) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#297
2025-03-19 08:07:36 +00:00
mso7nueh
ebf15bdf3c feat: upd build tf 2025-03-19 11:07:15 +03:00
mso7nueh
a0ad7544c6 Merge pull request 'main' (#296) from main into test-flight
Reviewed-on: eatvio/eatvio_app#296
2025-03-19 07:59:04 +00:00
mso7nueh
a043428019 Merge pull request 'feat: upd tf' (#295) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#295
2025-03-19 07:58:50 +00:00
mso7nueh
7c40f14364 feat: upd tf 2025-03-19 10:58:21 +03:00
mso7nueh
bd59323e80 Merge pull request 'main' (#294) from main into test-flight
Reviewed-on: eatvio/eatvio_app#294
2025-03-18 14:09:17 +00:00
mso7nueh
f0c861ade4 Merge pull request 'main' (#293) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#293
2025-03-18 14:08:56 +00:00
mso7nueh
3562dca76b feat: build tf upd 7 2025-03-18 17:08:33 +03:00
mso7nueh
01f8df67da Merge pull request 'Merge pull request 'feat: build tf upd 5' (#291) from mso7nueh/eatvio_app:main into main' (#22) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#22
2025-03-18 14:08:16 +00:00
mso7nueh
c00634c1d8 Merge pull request 'feat: build tf upd 5' (#291) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#291
2025-03-18 14:07:04 +00:00
mso7nueh
4b9489da7e Merge branch 'main' into main 2025-03-18 14:06:51 +00:00
mso7nueh
c6f1d5645f feat: build tf upd 6 2025-03-18 17:06:32 +03:00
mso7nueh
43349d194f Merge pull request 'Обновить .gitea/workflows/test-flight-cd.yaml' (#290) from main into test-flight
Reviewed-on: eatvio/eatvio_app#290
2025-03-18 14:05:33 +00:00
mso7nueh
00750d9408 Обновить .gitea/workflows/test-flight-cd.yaml 2025-03-18 14:05:05 +00:00
mso7nueh
2ab8389251 feat: build tf upd 5 2025-03-18 17:04:21 +03:00
217ee43a49 Merge pull request 'Update Build-tf' (#288) from main into test-flight
Reviewed-on: eatvio/eatvio_app#288
2025-03-18 09:45:35 +00:00
a2c1d31d63 Update Build-tf 2025-03-18 09:45:06 +00:00
Username1548
fa817548d9 chat has been updated 2025-03-18 14:33:51 +07:00
mso7nueh
2aa836335f Merge pull request 'main' (#287) from main into test-flight
Reviewed-on: eatvio/eatvio_app#287
2025-03-17 15:01:03 +00:00
mso7nueh
9a2e07a41b Merge pull request 'feat: build tf upd 4' (#286) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#286
2025-03-17 15:00:34 +00:00
mso7nueh
42796cff52 feat: build tf upd 4 2025-03-17 18:00:14 +03:00
mso7nueh
5cd5de8511 Merge pull request 'main' (#285) from main into test-flight
Reviewed-on: eatvio/eatvio_app#285
2025-03-17 14:49:56 +00:00
mso7nueh
820057de42 Merge pull request 'feat: build tf upd 3' (#284) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#284
2025-03-17 14:49:42 +00:00
mso7nueh
2e6796eb80 feat: build tf upd 3 2025-03-17 17:49:21 +03:00
mso7nueh
4f730619ea Merge pull request 'main' (#283) from main into test-flight
Reviewed-on: eatvio/eatvio_app#283
2025-03-17 14:47:34 +00:00
mso7nueh
a65a043ecf Merge pull request 'feat: build tf upd 2' (#282) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#282
2025-03-17 14:47:17 +00:00
mso7nueh
60a4d1f64f feat: build tf upd 2 2025-03-17 17:47:00 +03:00
mso7nueh
da687ef466 Merge pull request 'main' (#281) from main into test-flight
Reviewed-on: eatvio/eatvio_app#281
2025-03-17 14:45:23 +00:00
mso7nueh
b1d55b6c16 Merge pull request 'feat: build tf upd' (#280) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#280
2025-03-17 14:45:09 +00:00
mso7nueh
4ad219b428 feat: build tf upd 2025-03-17 17:44:54 +03:00
mso7nueh
985f248343 Merge pull request 'main' (#279) from main into test-flight
Reviewed-on: eatvio/eatvio_app#279
2025-03-17 14:42:31 +00:00
mso7nueh
0a0616fb24 Merge pull request 'feat: build tf' (#278) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#278
2025-03-17 14:42:06 +00:00
mso7nueh
616b9b4385 feat: build tf 2025-03-17 17:41:34 +03:00
mso7nueh
c399eb1480 Merge pull request 'main' (#277) from main into test-flight
Reviewed-on: eatvio/eatvio_app#277
2025-03-17 14:39:46 +00:00
mso7nueh
29b2b2d0d2 Merge pull request 'feat: profile type' (#276) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#276
2025-03-17 14:39:32 +00:00
mso7nueh
80bb6c22cb feat: profile type 2025-03-17 17:39:11 +03:00
mso7nueh
cae602e190 Merge pull request 'main' (#275) from main into test-flight
Reviewed-on: eatvio/eatvio_app#275
2025-03-17 14:37:11 +00:00
mso7nueh
c06be7a112 Merge pull request 'feat: cache clear' (#274) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#274
2025-03-17 14:36:53 +00:00
mso7nueh
c3861271f0 feat: cache clear 2025-03-17 17:36:34 +03:00
mso7nueh
4b2a364d6d Merge pull request 'main' (#273) from main into test-flight
Reviewed-on: eatvio/eatvio_app#273
2025-03-17 14:34:53 +00:00
mso7nueh
6839f7272a Merge pull request 'feat: rm profile type' (#272) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#272
2025-03-17 14:34:38 +00:00
mso7nueh
a90ffc1fc0 feat: rm profile type 2025-03-17 17:34:18 +03:00
mso7nueh
29501adaf9 Merge pull request 'main' (#271) from main into test-flight
Reviewed-on: eatvio/eatvio_app#271
2025-03-17 14:31:44 +00:00
mso7nueh
9305a6b907 Merge pull request 'feat: upd export options' (#270) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#270
2025-03-17 14:31:26 +00:00
mso7nueh
7712a85cea feat: upd export options 2025-03-17 17:31:04 +03:00
0330b7cde7 Merge pull request 'Update .gitea/workflows/test-flight-cd.yaml' (#269) from main into test-flight
Reviewed-on: eatvio/eatvio_app#269
2025-03-17 14:18:17 +00:00
83e3760be9 Update .gitea/workflows/test-flight-cd.yaml 2025-03-17 14:04:02 +00:00
mso7nueh
fe836570d5 Merge pull request 'main' (#268) from main into test-flight
Reviewed-on: eatvio/eatvio_app#268
2025-03-17 13:28:39 +00:00
mso7nueh
ab5326549a Merge pull request 'feat: tag upd' (#267) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#267
2025-03-17 13:28:15 +00:00
mso7nueh
e9e22bd1ae feat: tag upd 2025-03-17 16:27:57 +03:00
mso7nueh
0b8c7bdacb Merge pull request 'main' (#266) from main into test-flight
Reviewed-on: eatvio/eatvio_app#266
2025-03-17 13:19:41 +00:00
mso7nueh
e76c9d34b5 Merge pull request 'feat: tags' (#265) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#265
2025-03-17 13:19:25 +00:00
mso7nueh
579df94d67 feat: tags 2025-03-17 16:19:09 +03:00
mso7nueh
6799bebae8 Merge pull request 'main' (#264) from main into test-flight
Reviewed-on: eatvio/eatvio_app#264
2025-03-17 13:17:54 +00:00
mso7nueh
3ad9db9d3d Merge pull request 'main' (#263) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#263
2025-03-17 13:17:38 +00:00
mso7nueh
cf57518e5b feat: tags 2025-03-17 16:17:19 +03:00
mso7nueh
26c42d97d0 Merge pull request 'main' (#21) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#21
2025-03-17 13:14:37 +00:00
mso7nueh
26f6db7624 Merge pull request 'main' (#262) from main into test-flight
Reviewed-on: eatvio/eatvio_app#262
2025-03-17 13:13:27 +00:00
mso7nueh
c64fff01de Merge pull request 'feat: test-case' (#261) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#261
2025-03-17 13:13:08 +00:00
mso7nueh
593b99ac05 feat: test-case 2025-03-17 16:12:48 +03:00
mso7nueh
2d9d0df71e Merge pull request 'test-flight' (#260) from test-flight into main
Reviewed-on: eatvio/eatvio_app#260
2025-03-17 13:11:43 +00:00
mso7nueh
56c89b6bcb Merge remote-tracking branch 'origin/test-flight' into test-flight 2025-03-17 16:11:23 +03:00
mso7nueh
e98f9d298e feat: tf build 2025-03-17 16:11:11 +03:00
mso7nueh
1deee5fed4 Merge pull request 'test-flight' (#259) from test-flight into main
Reviewed-on: eatvio/eatvio_app#259
2025-03-17 13:08:30 +00:00
mso7nueh
531389d843 Merge pull request 'feat: test-case' (#258) from mso7nueh/eatvio_app:main into test-flight
Reviewed-on: eatvio/eatvio_app#258
2025-03-17 13:07:19 +00:00
mso7nueh
fca972bcc7 feat: tf build 2025-03-17 16:06:39 +03:00
mso7nueh
8ff32db3ca feat: test-case 2025-03-17 15:59:16 +03:00
mso7nueh
773da9c169 Merge pull request 'test-flight' (#257) from mso7nueh/eatvio_app:test-flight into test-flight
Reviewed-on: eatvio/eatvio_app#257
2025-03-17 12:57:48 +00:00
mso7nueh
1f98606fc8 feat: test-flight-cd.yaml 2025-03-17 15:55:41 +03:00
mso7nueh
f98cabd12d Merge pull request 'main' (#20) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#20
2025-03-14 13:05:25 +00:00
mso7nueh
b6d4911c2e Merge pull request 'chats have been updated to work with consultatons' (#255) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#255
2025-03-14 13:04:42 +00:00
Username1548
fe4076f9ac fixed translations 2025-03-14 20:01:39 +07:00
Username1548
88d070c5f9 merged 2025-03-14 19:59:09 +07:00
Username1548
803588a289 chats have been updated to work with consultatons 2025-03-14 19:56:55 +07:00
BLoC
578d777b1f Merge pull request 'feat: info by order screen' (#254) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#254
2025-03-14 12:53:49 +00:00
BLoC
0a664cc58f feat: info by order screen 2025-03-14 15:53:18 +03:00
Username1548
9d53760137 fixed pagination 2025-03-13 02:30:10 +07:00
Username1548
102dc9ee55 Merge remote-tracking branch 'upstream/main' 2025-03-10 22:25:36 +07:00
Username1548
f590c49def pre merge commit 2025-03-10 22:25:30 +07:00