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

Feature 13085 self report edit #13100

Merged
merged 6 commits into from
May 23, 2024
Merged

Conversation

leventegal-she
Copy link
Contributor

Fixes #13085

Levente Gal added 3 commits May 13, 2024 08:57
@sormas-vitagroup
Copy link
Contributor

Copy link
Contributor

@carina29 carina29 left a comment

Choose a reason for hiding this comment

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

There are some conflicts in strings.properties
and SelfReportGrid.java

sormas-api/src/main/resources/strings.properties Outdated Show resolved Hide resolved
sormas-backend/src/main/resources/sql/sormas_schema.sql Outdated Show resolved Hide resolved
Levente Gal added 2 commits May 22, 2024 10:13
…self-report-edit

# Conflicts:
#	sormas-api/src/main/resources/strings.properties
#	sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/SelfReportGrid.java
@sormas-vitagroup
Copy link
Contributor

@carina29 carina29 merged commit a564f9a into development May 23, 2024
7 of 13 checks passed
@carina29 carina29 deleted the feature-13085-self-report-edit branch May 23, 2024 09:23
Copy link
Contributor

@carina29 carina29 left a comment

Choose a reason for hiding this comment

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

Approved PR.

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.

Add an edit/delete/archive functionality for Self Reporting messages (UI) [3]
3 participants