Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

cs427fa20team22
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

23548b10

Commit 23548b10 authored 4 years ago by Matthew Williams

Downloads
- Plain Diff

Merge branch 'UC30' of https://gitlab.engr.illinois.edu/htmoss2/cs427fa20team22 into UC30

parents 881a10eb c1eb46ce

No related branches found

No related tags found

1 merge request!23Merge UC30 into Master

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

iTrust/WebRoot/auth/hcp/menu.jsp 2 additions, 1 deletion

iTrust/WebRoot/auth/hcp/menu.jsp
iTrust/WebRoot/auth/hcp/messageInbox.jsp 24 additions, 5 deletions

iTrust/WebRoot/auth/hcp/messageInbox.jsp
iTrust/WebRoot/auth/hcp/messageOutbox.jsp 182 additions, 14 deletions

iTrust/WebRoot/auth/hcp/messageOutbox.jsp
iTrust/WebRoot/auth/patient/menu.jsp 1 addition, 1 deletion

iTrust/WebRoot/auth/patient/menu.jsp
iTrust/WebRoot/auth/patient/messageInbox.jsp 12 additions, 3 deletions

iTrust/WebRoot/auth/patient/messageInbox.jsp
iTrust/WebRoot/auth/patient/messageOutbox.jsp 204 additions, 17 deletions

iTrust/WebRoot/auth/patient/messageOutbox.jsp
iTrust/src/edu/ncsu/csc/itrust/action/ViewMyMessagesAction.java 89 additions, 1 deletion

.../src/edu/ncsu/csc/itrust/action/ViewMyMessagesAction.java

with 514 additions and 42 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