Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fltrail
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0e3cfa43

Commit 0e3cfa43 authored 5 years ago by Julian Dehne

Downloads
- Plain Diff

Merge branch 'development_master' of...

Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master

parents 7c0a773f 60f9d0bd

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java 5 additions, 21 deletions

...c/main/java/unipotsdam/gf/config/GFApplicationBinder.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/controller/FeedbackImpl.java 5 additions, 10 deletions

...otsdam/gf/modules/annotation/controller/FeedbackImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java 1 addition, 33 deletions

...essment/controller/service/AssessmentDBCommunication.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 8 additions, 16 deletions

...modules/assessment/controller/service/PeerAssessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java 1 addition, 0 deletions

...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskMapping.java 53 additions, 0 deletions

...rc/main/java/unipotsdam/gf/process/tasks/TaskMapping.java

with 73 additions and 80 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