- Oct 10, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
- Oct 08, 2018
-
-
Martin Staehr authored
-
- Oct 02, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
- Oct 01, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
- Sep 30, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
Martin Staehr authored
-
- Sep 29, 2018
-
-
Martin Staehr authored
-
Martin Staehr authored
it is necessary to login to create custom access token
-
Martin Staehr authored
-
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
-