Skip to content

media, files, links - #71

Merged
quangdat2511 merged 28 commits into
mainfrom
group/gallery/merge
May 3, 2026
Merged

media, files, links#71
quangdat2511 merged 28 commits into
mainfrom
group/gallery/merge

Conversation

@VVVu1511

@VVVu1511 VVVu1511 commented May 3, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

VVVu1511 added 28 commits April 3, 2026 15:37
# Conflicts:
#	android/app/src/main/java/com/example/hubble/view/dm/DmDetailsActivity.java
#	android/app/src/main/res/values-en/strings.xml
#	android/app/src/main/res/values/strings.xml
# Conflicts:
#	android/app/src/main/java/com/example/hubble/adapter/dm/DmConversationOverviewAdapter.java
#	android/app/src/main/java/com/example/hubble/view/dm/DmDetailsActivity.java
#	android/app/src/main/res/values-en/strings.xml
#	android/app/src/main/res/values/strings.xml
# Conflicts:
#	android/app/src/main/res/layout/activity_dm_chat.xml
#	backend/src/main/java/com/hubble/service/MessageService.java
#	backend/src/test/java/com/hubble/controller/MessageControllerTest.java
#	backend/src/test/java/com/hubble/service/MessageServiceTest.java
# Conflicts:
#	android/app/src/main/java/com/example/hubble/data/repository/DmRepository.java
#	backend/src/main/java/com/hubble/repository/AttachmentRepository.java
#	backend/src/main/java/com/hubble/service/MessageService.java
# Conflicts:
#	android/app/src/main/res/values/strings.xml
#	backend/src/test/java/com/hubble/service/MessageServiceTest.java
@VVVu1511
VVVu1511 marked this pull request as ready for review May 3, 2026 04:51
@VVVu1511
VVVu1511 requested a review from quangdat2511 May 3, 2026 04:51
@VVVu1511
VVVu1511 requested review from HVK2500 and danzgne May 3, 2026 04:51

@quangdat2511 quangdat2511 left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@quangdat2511
quangdat2511 merged commit c359927 into main May 3, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants