sync main #1

Merged
apoloz merged 227 commits from eatvio/eatvio_app:main into main 2025-03-13 14:12:53 +00:00

227 Commits

Author SHA1 Message Date
a974325ee0 Update .gitea/workflows/docker-run-tests.yml 2025-03-13 14:11:42 +00:00
BLoC
6ff84547c7 Merge pull request 'feat: upd. flutter version' (#252) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#252
2025-03-13 13:46:54 +00:00
BLoC
04dafabc3a feat: upd. flutter version 2025-03-13 16:46:36 +03:00
BLoC
b8ecff446a Merge pull request 'feat: test case' (#251) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#251
2025-03-13 13:43:52 +00:00
BLoC
04d5eeb14b feat: test case for A.P. #1208 2025-03-13 16:40:36 +03:00
BLoC
1d3e1d3348 feat: logo size 2025-03-10 17:12:33 +03:00
BLoC
9bb8625a14 Merge pull request 'main' (#247) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#247
2025-03-10 12:46:43 +00:00
BLoC
4cae752f8d feat: remove calendar, increase fontSize in comments, settings, blog posts and plans 2025-03-10 15:46:09 +03:00
BLoC
3dea50b4c2 feat: auth success and error messaging 2025-03-10 14:39:31 +03:00
BLoC
8cca27cd76 feat: auth success and error messaging 2025-03-10 14:38:26 +03:00
BLoC
91c907bc57 feat: auto login after registration 2025-03-10 13:01:21 +03:00
BLoC
27618dd040 Merge pull request 'main' (#246) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#246
2025-03-07 12:42:06 +00:00
BLoC
8ef59a0adf feat: no avatar 2025-03-07 14:55:39 +03:00
BLoC
ebfc9eea1e fix: no internet screen 2025-03-07 12:58:12 +03:00
BLoC
e859e083d1 feat: alert dialog before log out, enlarge logo size on auth screen 2025-03-07 12:04:51 +03:00
BLoC
afac964e2e Merge pull request 'feat: finish day button' (#244) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#244
2025-03-05 13:10:49 +00:00
BLoC
6c40c6d624 feat: finish day button 2025-03-05 16:10:18 +03:00
BLoC
a53fda2c70 Merge pull request 'fix: blogPost create and delete' (#243) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#243
2025-03-05 12:53:21 +00:00
BLoC
b859bea547 fix: blogPost create and delete 2025-03-05 15:52:49 +03:00
BLoC
d0ce74814a Merge pull request 'main' (#242) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#242
2025-03-05 11:58:10 +00:00
BLoC
2a9dbe03f0 fix: export documents requirements, user details screen 2025-03-05 14:50:08 +03:00
BLoC
8e78b23885 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
2025-03-05 14:12:14 +03:00
BLoC
c145974cc0 feat: user details screen 2025-03-05 14:11:09 +03:00
BLoC
ea64a0fa81 Merge pull request 'main' (#19) from eatvio/eatvio_app:main into main
Reviewed-on: BLoC/eatvio_app#19
2025-03-05 10:49:45 +00:00
BLoC
cb7be20353 Merge pull request 'added diet complaints and token interceptor for auth handling' (#241) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#241
2025-03-05 10:49:23 +00:00
Username1548
ede59d0477 added diet complaints and token interceptor for auth handling 2025-03-05 17:25:07 +07:00
BLoC
19fada1384 Merge pull request 'main' (#18) from eatvio/eatvio_app:main into main
Reviewed-on: BLoC/eatvio_app#18
2025-03-05 09:36:19 +00:00
BLoC
c6be45c5a4 revert 47847438d7
revert feat: text styles
2025-03-05 09:36:01 +00:00
BLoC
47847438d7 feat: text styles 2025-03-05 11:13:20 +03:00
BLoC
0c448240f2 Merge pull request 'added invalid token checking' (#239) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#239
2025-03-05 08:08:12 +00:00
Username1548
96dc456ff4 added invalid token chicking 2025-03-05 14:26:16 +07:00
BLoC
ae6b2612d7 Merge pull request 'main' (#237) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#237
2025-03-03 08:06:45 +00:00
BLoC
789afcfb76 Merge pull request 'Unread messages and updated my_diets' (#231) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#231
2025-03-03 08:06:10 +00:00
BLoC
cebbb4fb2d feat: card 2025-02-28 16:48:49 +03:00
Username1548
0cdd40102f updated error handling, consultant rating layout and complaining logic 2025-02-28 19:18:01 +07:00
BLoC
9251bcbff1 feat: finance 2025-02-28 13:54:09 +03:00
BLoC
0ee94e96c9 feat: finance consultation 2025-02-24 10:48:28 +03:00
Username1548
e5b293db79 analyzer fixes 2025-02-20 16:59:58 +07:00
Username1548
292ef5fdbf Merge remote-tracking branch 'upstream/main' 2025-02-20 16:58:14 +07:00
Username1548
93899e316f added unread messages and unread chats counters 2025-02-20 16:41:07 +07:00
BLoC
fabf2d89b2 Merge pull request 'main' (#230) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#230
2025-02-19 12:41:40 +00:00
BLoC
e142ce7b96 feat: consultations 2025-02-19 14:56:53 +03:00
BLoC
fea83bb7bd fix: auth 2025-02-17 12:41:43 +03:00
BLoC
66e2578619 feat: webview registration 2025-02-17 12:32:09 +03:00
Username1548
120af45dd5 Merge remote-tracking branch 'upstream/main' 2025-02-17 14:41:55 +07:00
Username1548
291947bd32 my diets have been update 2025-02-17 14:40:31 +07:00
BLoC
1317290406 Merge pull request 'main' (#226) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#226
2025-02-12 14:24:22 +00:00
BLoC
bd519da491 fix: reg 2025-02-12 17:22:33 +03:00
BLoC
8282d49064 fix: reg in webview 2025-02-12 17:21:19 +03:00
BLoC
6e39c08538 Merge pull request 'fix: webview logic' (#225) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#225
2025-02-12 13:32:35 +00:00
BLoC
f333e98221 fix: webview logic 2025-02-12 16:32:11 +03:00
BLoC
d78c05857f Merge pull request 'fix: profile roles' (#224) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#224
2025-02-12 12:05:45 +00:00
BLoC
04b35d1734 Merge branch 'main' of http://gitea.office.local:3000/eatvio/eatvio_app 2025-02-12 15:04:47 +03:00
BLoC
453b2b6a64 Merge pull request 'Internet connection handling' (#222) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#222
2025-02-12 11:48:21 +00:00
BLoC
970a30f436 fix: profile roles 2025-02-12 14:44:58 +03:00
Username1548
070d7e1047 fixed profile, recipeis and diets 2025-02-10 21:50:13 +07:00
Username1548
5ea3264474 fixed auth screen 2025-02-06 15:20:51 +07:00
Username1548
77e7b6c31f fixed errors 2025-02-03 15:36:01 +07:00
Username1548
e7ea7b3055 Merge remote-tracking branch 'upstream/main' 2025-02-03 15:35:36 +07:00
Username1548
589122581b internet connection handling 2025-02-03 15:32:12 +07:00
BLoC
f44b9e5634 Merge pull request 'main' (#15) from eatvio/eatvio_app:main into main
Reviewed-on: BLoC/eatvio_app#15
2025-01-29 11:35:48 +00:00
BLoC
de92a5e5cb Merge pull request 'new test cases' (#218) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#218
2025-01-29 11:35:18 +00:00
BLoC
20532c9225 Merge pull request 'feat: webview' (#219) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#219
2025-01-29 11:35:08 +00:00
BLoC
e8e561fdc6 feat: webview 2025-01-29 13:14:20 +03:00
Username1548
4242265830 new test cases 2025-01-29 14:47:27 +07:00
BLoC
22aab88f13 Merge pull request 'Recipe likes' (#215) from BLoC/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#215
2025-01-24 11:36:52 +00:00
BLoC
ae7c72cd53 feat: recipe like 2025-01-24 14:34:55 +03:00
BLoC
394e6d8bbf Merge pull request 'main' (#14) from eatvio/eatvio_app:main into main
Reviewed-on: BLoC/eatvio_app#14
2025-01-24 09:05:06 +00:00
BLoC
4ea0023fa9 Merge pull request 'Dev tools' (#214) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#214
2025-01-24 09:04:07 +00:00
Username1548
370e8883a0 updated flutter version for ci/cd 2025-01-23 18:24:59 +07:00
Username1548
08cc1bd6c0 updated flutter version for ci/cd 2025-01-23 18:21:30 +07:00
Username1548
51e709ea24 Merge remote-tracking branch upstream/main 2025-01-23 14:42:14 +07:00
Username1548
2d3ef9dd76 added dev tools 2025-01-23 14:21:05 +07:00
mso7nueh
7631ecc321 Merge pull request 'main' (#213) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#213
2025-01-22 14:34:03 +00:00
Alex
819b4a8b16 fix: gitea 2025-01-22 17:33:39 +03:00
mso7nueh
03c50dd1bf Merge pull request 'main' (#13) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#13
2025-01-22 14:33:02 +00:00
f9701c53da Обновить .gitea/workflows/test.yml 2025-01-22 14:29:13 +00:00
09345e4eb0 Обновить .gitea/workflows/build.yml 2025-01-22 14:28:51 +00:00
mso7nueh
d0109740e0 Merge pull request 'main' (#212) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#212
2025-01-22 14:03:59 +00:00
Alex
e59cc8e7b6 fix: gitea 2025-01-22 17:03:08 +03:00
Alex
09ec2f8880 fix: gitea 2025-01-22 16:51:08 +03:00
Alex
0ed34a428a fix: domain 2025-01-22 15:28:15 +03:00
Alex
c4abd333e7 feat: consultants rating 2025-01-22 15:27:10 +03:00
mso7nueh
4e1a368d25 Merge pull request 'feat: support' (#210) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#210
2025-01-20 11:43:34 +00:00
Alex
18c2419bcc feat: support 2025-01-20 14:42:54 +03:00
Username1548
7eaf0bc1bb socket fixed 2025-01-19 15:10:56 +07:00
mso7nueh
a385351ffa Merge pull request 'main' (#209) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#209
2025-01-13 11:14:48 +00:00
Alex
ab0f43479f fix: black screen 2025-01-13 14:14:23 +03:00
Alex
9ccb1d08c3 fix: black screen 2025-01-10 11:32:19 +03:00
mso7nueh
7f2e4df309 Merge pull request 'main' (#12) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#12
2024-12-26 11:40:06 +00:00
mso7nueh
f8f72a6f97 Merge pull request 'main' (#208) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#208
2024-12-26 11:38:23 +00:00
Username1548
ab7004f9fd analyze rules fixed 2024-12-25 17:54:46 +07:00
Username1548
eb280e1800 Merge remote-tracking branch 'upstream/main' 2024-12-25 17:51:54 +07:00
Username1548
3521a58c2f user details created 2024-12-25 17:51:50 +07:00
mso7nueh
c9ecd7945f Merge pull request 'feat(diary): diet' (#207) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#207
2024-12-24 13:53:28 +00:00
Alex
67d8bb58ee feat(diary): diet 2024-12-24 16:52:06 +03:00
Username1548
0c981b0068 merge fixes 2024-12-23 15:39:19 +07:00
Username1548
0c54f66d41 Merge remote-tracking branch 'upstream/main' 2024-12-23 15:39:02 +07:00
Username1548
5ef1f3a660 my plans and my diets 2024-12-23 15:36:00 +07:00
mso7nueh
08e78bde1c Merge pull request 'Рецепты (создание)' (#202) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#202
2024-12-19 18:00:13 +00:00
Alex
c6a60eccd9 fix(profile): empty consultant education 2024-12-19 18:11:04 +03:00
Alex
c964ad0019 fix(recipes): ingredients 2024-12-19 17:43:46 +03:00
Alex
f7d5cc714d fix: analyzer 2024-12-19 13:46:59 +03:00
Alex
3c1092124d feat(diary): chart down 2024-12-18 17:24:31 +03:00
Alex
19ba815b99 feat(registration): refactor 2024-12-18 17:21:33 +03:00
Alex
947821c874 fix:analyzer 2024-12-18 16:28:45 +03:00
Alex
f0cdb73496 feat(registration): add phone 2024-12-18 13:34:47 +03:00
Alex
12a24e6ead feat: change base url 2024-12-18 12:46:19 +03:00
Alex
e0ec45e19e feat(recipe): add creating recipes 2024-12-18 11:56:20 +03:00
Alex
f6d4ea7df6 feat(recipe): add recipe creating 2024-12-18 11:55:32 +03:00
Username1548
15a6ff44ef Merge remote-tracking branch 'upstream/main' 2024-12-16 21:13:58 +07:00
Username1548
27241aebac plans filters ready 2024-12-16 20:31:23 +07:00
mso7nueh
29b3b45ec9 Merge pull request 'fix: analyzer' (#200) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#200
2024-12-13 14:41:50 +00:00
Alex
a58fbf1ee4 fix: analyzer 2024-12-13 17:41:15 +03:00
mso7nueh
5945f50dac Merge pull request 'fix: some fixes' (#199) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#199
2024-12-13 14:14:55 +00:00
Alex
7715da6b8e upd ci cd 2024-12-13 17:14:09 +03:00
Alex
0c09f23e1d fix: cicd 2024-12-13 17:13:18 +03:00
Alex
939c5cc6e5 feat: recipe fix anaylzer 2024-12-13 17:12:16 +03:00
Alex
799c63b427 feat: recipe widget 2024-12-13 17:11:15 +03:00
Alex
1c4c73d98e fix: file_picker ;) 2024-12-13 12:17:21 +03:00
Alex
af1bd525fd fix: file_picker 2024-12-13 11:59:42 +03:00
Alex
2aa4fdc4a8 fix: some fixes 2024-12-13 11:47:20 +03:00
mso7nueh
774d512a04 Merge pull request 'main' (#198) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#198
2024-12-11 14:02:19 +00:00
Alex
4c34fa6a40 Merge branch 'main' of http://gitea.office.local:3000/mso7nueh/eatvio_app 2024-12-11 17:01:49 +03:00
Alex
7120260a0b fix: feed cubit 2024-12-11 17:01:46 +03:00
mso7nueh
274a8c40f0 Merge pull request 'main' (#11) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#11
2024-12-11 13:08:52 +00:00
mso7nueh
d6f0835393 Merge pull request 'diet creation screen's done' (#197) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#197
2024-12-11 13:07:46 +00:00
Username1548
067b10ed7f fixed layout bug in info row 2024-12-11 20:01:01 +07:00
Username1548
e9a4c518be glossary for diet creation fixed 2024-12-11 19:51:40 +07:00
Username1548
746e16f94e Merge remote-tracking branch 'upstream/main' 2024-12-11 19:24:23 +07:00
Username1548
2f168a2f35 diet creation scrren is done 2024-12-11 19:15:25 +07:00
mso7nueh
0ce84f5433 Merge pull request 'fix: profile 2' (#196) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#196
2024-12-11 11:22:41 +00:00
Alex
728c362e24 fix: profile 2 2024-12-11 14:22:00 +03:00
mso7nueh
1479283fe2 Merge pull request 'fix: comments' (#195) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#195
2024-12-11 11:14:35 +00:00
mso7nueh
5e0f4d0b48 Merge pull request 'main' (#194) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#194
2024-12-11 10:58:29 +00:00
Alex
4b2e642b9d fix: comments 2024-12-11 13:41:14 +03:00
Alex
95b7f82770 fix: profile 2024-12-11 11:49:16 +03:00
Alex
4ce97c7640 feat: test profile service 2024-12-09 18:33:06 +03:00
Alex
25ea4eccad feat: test profile model 2024-12-09 17:24:10 +03:00
Alex
f073a7b921 feat: fontSize in blog post 2024-12-09 16:26:48 +03:00
Alex
9ba0e68e79 fix: analyzer 2024-12-09 11:17:07 +03:00
Alex
afdcea1e1f fix: glossary modeartion 2024-12-09 11:16:20 +03:00
mso7nueh
4a21d07bf1 Merge pull request 'main' (#193) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#193
2024-12-06 13:02:29 +00:00
Alex
178060e85e fix: black screen after splash 2024-12-06 14:04:37 +03:00
Alex
6f03d279e9 feat(profile): consultant 2024-12-06 13:46:15 +03:00
mso7nueh
f30663a4e9 Merge pull request 'main' (#10) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#10
2024-12-04 15:16:44 +00:00
mso7nueh
8ac8c0e334 Merge pull request 'plans pagination and post creation screen' (#192) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#192
2024-12-04 15:15:35 +00:00
Username1548
2e0a8c559f Merge remote-tracking branch 'upstream/main' 2024-12-04 22:08:00 +07:00
mso7nueh
634bf95c7e Merge pull request 'feed' (#182) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#182
2024-12-04 15:06:56 +00:00
Username1548
c81bce01dc fixed analyzer issue 2024-12-04 22:05:20 +07:00
Username1548
bc0b3829c9 added plan pagination and updated plans creation screen 2024-12-04 22:03:31 +07:00
Alex
cb1b480c42 feat(profile): delete photo 2024-12-04 15:15:28 +03:00
Alex
480a26fe78 feat(diary): alert chart 2024-12-04 13:11:13 +03:00
Alex
5e6f4cc84b fix: feed like sync 2024-12-04 01:29:02 +03:00
Alex
6cf6e32fe6 feat(profile): social links 2024-12-02 17:52:21 +03:00
Alex
a4b2711914 fix: comments and feed 2024-12-02 17:35:32 +03:00
Alex
66f6f0ed91 feat(profile): Описание профиля (статус) 2024-12-02 17:24:09 +03:00
Alex
92a3a60636 feat(profile): Подписки и подписчики, Аватарка (загрузить/удалить/посмотреть), Дополнительная информация (модалка), Поделиться профилем 2024-12-02 17:12:13 +03:00
Alex
6a98bcb492 feat(diary): Перевод фокуса на количество при выборе из списка глоссария 2024-12-02 15:36:43 +03:00
Alex
d370c9474a feat(profile): fix subs 2024-12-02 15:17:22 +03:00
Alex
2b3ecf0bf5 feat(feed): edit and delete posts 2024-12-02 14:50:11 +03:00
mso7nueh
61ede95609 Merge pull request 'main' (#9) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#9
2024-12-02 10:32:15 +00:00
mso7nueh
4a57c72297 Merge pull request 'updated diets and added plan creation screen' (#181) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#181
2024-12-02 10:31:39 +00:00
Alex
d3d41af2a6 feat(feed): add time of post 2024-12-02 12:59:32 +03:00
Alex
09e641ec63 feat(feed): add subscribe button 2024-12-02 12:56:28 +03:00
Username1548
f9291031b0 fixed GlossaryModel error 2024-12-02 16:35:54 +07:00
Username1548
6ed0d3547c Merge remote-tracking branch 'upstream/main' 2024-12-02 15:59:15 +07:00
Username1548
1688ac1dc8 plan creation screen added 2024-12-02 15:55:57 +07:00
mso7nueh
3320e96821 Merge pull request 'feat(settings): add weight' (#178) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#178
2024-12-02 08:22:37 +00:00
Alex
87925775e8 feat: add satiety 2024-12-01 23:54:16 +03:00
Alex
d2c2d4d479 feat: diary time of meal 2024-12-01 23:33:42 +03:00
Alex
7e0ca28ede feat: diary add update 2024-11-30 18:33:56 +03:00
Alex
06e8336cd3 feat: diary 2024-11-30 13:44:26 +03:00
Alex
235d9fa08e feat: version 2024-11-29 14:43:51 +03:00
Alex
b6daad071b feat: splash 2024-11-29 14:43:09 +03:00
Alex
9e773e60e6 fix: blog post load after add 2024-11-29 14:13:55 +03:00
Alex
a0ad8d2553 fix: app size 2024-11-28 20:44:24 +03:00
Alex
ed850911eb feat(registration): hide/show password 2024-11-28 17:26:35 +03:00
Alex
0d19fde557 feat: diary refactor 2024-11-27 16:23:48 +03:00
Alex
421190b6c9 feat(settings): add weight 2024-11-27 10:51:08 +03:00
Username1548
a1d9e13514 Merge remote-tracking branch 'upstream/main' 2024-11-26 19:51:11 +07:00
Username1548
e67c766307 create diet screen updated 2024-11-26 19:51:08 +07:00
mso7nueh
6793086a1d Merge pull request 'fix: gradle' (#177) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#177
2024-11-25 12:49:42 +00:00
mso7nueh
d006e4e21a fix: ci/cd rollback 2024-11-25 15:49:07 +03:00
mso7nueh
e4bca86b9e fix: youtube_url => video_url 2024-11-25 15:47:54 +03:00
mso7nueh
35d3855613 fix: jdk 21 2024-11-25 15:38:26 +03:00
mso7nueh
13742164d5 fix: jdk 21 2024-11-25 15:36:13 +03:00
mso7nueh
52b0371921 fix: jdk 21 2024-11-25 15:34:10 +03:00
mso7nueh
081511f3ac fix: jdk 21 2024-11-25 15:31:23 +03:00
mso7nueh
1fedcb1dc3 fix: jdk 21 2024-11-25 15:29:25 +03:00
mso7nueh
136febf31a fix: jdk 21 2024-11-25 15:22:15 +03:00
mso7nueh
f9f4e96b52 fix: jdk 2024-11-25 15:20:48 +03:00
mso7nueh
d5f546a807 fix: upd java and gradle 2024-11-25 15:16:01 +03:00
mso7nueh
43f9881863 fix: gradle 2024-11-25 13:38:19 +03:00
Username1548
4c4ece75b8 Merge remote-tracking branch 'upstream/main' 2024-11-25 16:10:45 +07:00
Username1548
c78a90b603 create diet screen 2024-11-25 16:01:02 +07:00
mso7nueh
9e64368ce2 Merge pull request 'main' (#173) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#173
2024-11-22 14:17:27 +00:00
mso7nueh
242b9e0e14 feat(profile): add search in subs 2024-11-22 17:11:49 +03:00
mso7nueh
b8afeb53b4 feat(profile): send message and subscribe button 2024-11-22 16:44:52 +03:00
mso7nueh
c909c75d47 feat(profile): subscribers and subscriptions 2024-11-22 15:27:51 +03:00
mso7nueh
f805505cb3 feat(feed): subscribe button + remove diary photo loading delay 2024-11-20 16:10:54 +03:00
mso7nueh
c0fc3d9f33 fix: chat 2024-11-20 15:13:23 +03:00
mso7nueh
13db19a03c Merge pull request 'main' (#8) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#8
2024-11-20 11:50:46 +00:00
mso7nueh
9afb2f3c92 Merge pull request 'moved data/diet folder' (#172) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#172
2024-11-20 11:49:59 +00:00
Username1548
c3cb55f8a2 Merge remote-tracking branch 'upstream/main' 2024-11-20 18:45:50 +07:00
mso7nueh
7355d453aa Merge pull request 'fix: pubspec upd' (#171) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#171
2024-11-20 11:41:12 +00:00
mso7nueh
42491ccf1f fix: pubspec upd 2024-11-20 14:40:46 +03:00
Username1548
985243a2aa fixed analizer issue 2024-11-20 18:37:54 +07:00
Username1548
7260d70d3f moved diets logic to a diets folder 2024-11-20 18:35:58 +07:00
mso7nueh
b4b8fcea7d Merge pull request 'refactor' (#170) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#170
2024-11-20 11:34:37 +00:00
mso7nueh
b3f08bd640 fix: fix test 2024-11-20 14:34:04 +03:00
mso7nueh
b4aed3d3fd fix: refactor files 2024-11-20 14:30:48 +03:00
mso7nueh
524736fa41 Merge pull request 'fix: remove old unused features and widgets' (#169) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#169
2024-11-20 11:20:45 +00:00
mso7nueh
537ced583e fix: remove old unused features and widgets 2024-11-20 14:20:15 +03:00
mso7nueh
4b952dd55a Merge pull request 'fix: remove old unused features and widgets' (#168) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#168
2024-11-20 11:12:06 +00:00
mso7nueh
63dc72bd7a fix: remove old unused features and widgets 2024-11-20 14:10:05 +03:00
mso7nueh
a29d34519d Merge pull request 'fix(blogPost): create' (#167) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#167
2024-11-20 09:12:24 +00:00
mso7nueh
a007e53aae fix(blogPost): create 2024-11-20 12:11:37 +03:00
Username1548
39d6348ba1 Merge remote-tracking branch 'upstream/main' 2024-11-20 15:28:52 +07:00
Username1548
c292f3a767 diet creation page 2024-11-20 15:28:48 +07:00
mso7nueh
b85509f05f Merge pull request 'Отправка продукта на модерацию в глоссарий' (#166) from mso7nueh/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#166
2024-11-20 08:16:24 +00:00
mso7nueh
1ac956b448 fix: fix analyzer 2024-11-20 11:15:20 +03:00
mso7nueh
f230833c4e Merge pull request 'main' (#7) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#7
2024-11-19 13:52:02 +00:00
mso7nueh
0e2c07a3e9 Merge pull request 'Update .gitea/workflows/test.yml' (#163) from apoloz/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#163
2024-11-19 13:51:32 +00:00
mso7nueh
500d7e36d2 Merge pull request 'main' (#6) from eatvio/eatvio_app:main into main
Reviewed-on: mso7nueh/eatvio_app#6
2024-11-19 10:34:59 +00:00
mso7nueh
039d2871b7 Merge pull request 'added new analyzer exclude options and fixed naming in sorting filter types' (#157) from misha/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#157
2024-11-19 10:33:48 +00:00
Username1548
92c1bb1a91 added new analyzer exclude options and fixed naming in sorting filter types 2024-11-15 19:58:10 +07:00