-
- Downloads
Merge branch 'PeerAssessmentAxel' into pages_overview
# Conflicts: # gemeinsamforschen/src/main/webapp/pages/project-student.jsp
No related branches found
No related tags found
Showing
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/HiddenUserTag.java 1 addition, 0 deletions...ava/unipotsdam/gf/core/management/user/HiddenUserTag.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java 37 additions, 28 deletions...rc/main/java/unipotsdam/gf/core/management/user/Menu.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java 2 additions, 2 deletions.../java/unipotsdam/gf/core/management/user/UserService.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java 2 additions, 2 deletions...c/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java 1 addition, 1 deletion.../modules/assessment/controller/service/FBAssessement.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java 1 addition, 1 deletion...modules/assessment/controller/service/PeerAssessment.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java 6 additions, 6 deletions...es/assessment/controller/service/PeerAssessmentDummy.java
- gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java 3 additions, 2 deletions...tsdam/gf/modules/assessment/controller/view/QuizView.java
- gemeinsamforschen/src/main/webapp/assets/css/footer.css 43 additions, 0 deletionsgemeinsamforschen/src/main/webapp/assets/css/footer.css
- gemeinsamforschen/src/main/webapp/assets/css/styles.css 4 additions, 0 deletionsgemeinsamforschen/src/main/webapp/assets/css/styles.css
- gemeinsamforschen/src/main/webapp/assets/js/Quiz.js 26 additions, 0 deletionsgemeinsamforschen/src/main/webapp/assets/js/Quiz.js
- gemeinsamforschen/src/main/webapp/assets/js/finalAssessment.js 6 additions, 1 deletion...nsamforschen/src/main/webapp/assets/js/finalAssessment.js
- gemeinsamforschen/src/main/webapp/assets/js/footer.js 35 additions, 0 deletionsgemeinsamforschen/src/main/webapp/assets/js/footer.js
- gemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js 17 additions, 6 deletionsgemeinsamforschen/src/main/webapp/assets/js/takeQuiz.js
- gemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js 67 additions, 0 deletionsgemeinsamforschen/src/main/webapp/assets/js/viewQuiz.js
- gemeinsamforschen/src/main/webapp/index.jsp 1 addition, 1 deletiongemeinsamforschen/src/main/webapp/index.jsp
- gemeinsamforschen/src/main/webapp/pages/Quiz.jsp 54 additions, 0 deletionsgemeinsamforschen/src/main/webapp/pages/Quiz.jsp
- gemeinsamforschen/src/main/webapp/pages/assessmentCalculator.jsp 1 addition, 0 deletions...amforschen/src/main/webapp/pages/assessmentCalculator.jsp
- gemeinsamforschen/src/main/webapp/pages/createQuiz.jsp 29 additions, 2 deletionsgemeinsamforschen/src/main/webapp/pages/createQuiz.jsp
- gemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp 5 additions, 4 deletionsgemeinsamforschen/src/main/webapp/pages/finalAssessments.jsp
Loading
Please register or sign in to comment