- Sep 29, 2018
-
-
Martin Staehr authored
-
- Sep 27, 2018
-
-
Martin Staehr authored
-
- Sep 24, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
#63 feat: implement login for rocketChat api; add new fields for rocketChat information to user database
-
- Sep 22, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/Constraints.java # gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java # gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java # gemeinsamforschen/src/main/webapp/journal/edit-description.jsp # gemeinsamforschen/src/main/webapp/management/js/changePhase.js
-
Martin Staehr authored
-
- Sep 20, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
- Sep 18, 2018
- Sep 17, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
# Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java # gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesService.java # gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java # gemeinsamforschen/src/test/java/unipotsdam/gf/interfaces/PhaseTest.java # gemeinsamforschen/src/test/resources/database/fltrail.sql
-
Martin Staehr authored
-
Axel authored
-
Axel authored
-
- Sep 16, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
- Sep 15, 2018
-
-
Martin Staehr authored
-
- Sep 14, 2018
-
-
Axel authored
-
- Sep 13, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Thomas Schnaak authored
-
Axel authored
-
Sven Kästle authored
-
Sven Kästle authored
-
Sven Kästle authored
-
Axel authored
-
tudtianus authored
-
tudtianus authored
-
Axel authored
-
Axel authored
-
Axel authored
-
Axel authored
-
- Sep 12, 2018
-
-
Julian Dehne authored
- started working on group finding prototyp (basic group management prototyp for development - not advanced groupfinding i.e. mirjams project)
-
Julian Dehne authored
Merge branch 'development_master_refactoring_1' of https://github.com/juliandehne/fltrail into development_master_refactoring_1 # Conflicts: # gemeinsamforschen/src/main/webapp/annotation/annotation-document.jsp # gemeinsamforschen/src/main/webapp/annotation/create-unstructured-annotation.jsp # gemeinsamforschen/src/main/webapp/annotation/upload-unstructured-annotation.jsp # gemeinsamforschen/src/main/webapp/assessment/Quiz-docent.jsp # gemeinsamforschen/src/main/webapp/assessment/Quiz.jsp # gemeinsamforschen/src/main/webapp/assessment/assess-work.jsp # gemeinsamforschen/src/main/webapp/assessment/calculate-assessment.jsp # gemeinsamforschen/src/main/webapp/assessment/create-quiz.jsp # gemeinsamforschen/src/main/webapp/assessment/project-docent_CG.jsp # gemeinsamforschen/src/main/webapp/assessment/rate-contribution.jsp # gemeinsamforschen/src/main/webapp/assessment/take-quiz.jsp # gemeinsamforschen/src/main/webapp/assessment/view-quiz.jsp # gemeinsamforschen/src/main/webapp/feedback/give-feedback.jsp # gemeinsamforschen/src/main/webapp/feedback/view-feedback.jsp # gemeinsamforschen/src/main/webapp/groupfinding/create-groups.jsp # gemeinsamforschen/src/main/webapp/journal/create-journal.jsp # gemeinsamforschen/src/main/webapp/journal/eportfolio.jsp # gemeinsamforschen/src/main/webapp/management/change-phase.jsp # gemeinsamforschen/src/main/webapp/management/edit-project.jsp # gemeinsamforschen/src/main/webapp/management/groups.jsp # gemeinsamforschen/src/main/webapp/management/join-project.jsp # gemeinsamforschen/src/main/webapp/overview-docent.jsp # gemeinsamforschen/src/main/webapp/overview-student.jsp # gemeinsamforschen/src/main/webapp/profile/profile.jsp # gemeinsamforschen/src/main/webapp/project-student.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-bibliography.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-concept.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-evaluation.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-method.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-overview.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-process-description.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-question.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-research.jsp # gemeinsamforschen/src/main/webapp/researchReport/create-title.jsp
-
