Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/code merge #34

Merged
merged 11 commits into from
Jul 18, 2024
Merged

Bugfix/code merge #34

merged 11 commits into from
Jul 18, 2024

Conversation

AungKyaw-Myint
Copy link
Collaborator

No description provided.

discussion front-end ui
# Conflicts:
#	backend/src/main/java/com/waa/project/security/config/CorsConfig.java
#	frontend/src/App.js
update merge with develop
Update discussion and handling modal box and API changes
updated for the comment chaining response and UI implemented
Comment edition implement, search function and UI Implement
implement sub-comments parts for the UI
# Conflicts:
#	frontend/package-lock.json
#	frontend/package.json
# Conflicts:
#	frontend/src/features/dashboard/dashboard-student.jsx
@hariclerry hariclerry merged commit 07be05b into develop Jul 18, 2024
Copy link
Collaborator

@phurpawangchuk phurpawangchuk left a comment

Choose a reason for hiding this comment

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

OK go ahead

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.

3 participants