Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

Emergency Alert Application
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4ffa6579

Commit 4ffa6579 authored 4 months ago by Elisabethein

Downloads
- Plain Diff

Merge remote-tracking branch 'emergency-alert-application/Ariana' into Elisabet

parents f6c97648 adc0de7a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

eaa_frontend/src/components/EditProfileComponent.vue 8 additions, 18 deletions

eaa_frontend/src/components/EditProfileComponent.vue
eaa_frontend/src/components/EditUserComponent.vue 170 additions, 22 deletions

eaa_frontend/src/components/EditUserComponent.vue
eaa_frontend/src/pages/StatisticsPage.vue 250 additions, 48 deletions

eaa_frontend/src/pages/StatisticsPage.vue
src/main/java/com/EmergencyAlertApplication/EAA/Services/StatisticsService.java 1 addition, 1 deletion

...gencyAlertApplication/EAA/Services/StatisticsService.java

with 429 additions and 89 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment