apoloz/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

sync main #1

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

No dependencies set.

Reference: apoloz/eatvio_app#1
Delete Branch "eatvio/eatvio_app:main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?