Skip to content
Snippets Groups Projects
  1. Oct 10, 2018
  2. Oct 08, 2018
  3. Oct 02, 2018
  4. Oct 01, 2018
  5. Sep 30, 2018
  6. Sep 29, 2018
  7. Sep 27, 2018
  8. Sep 24, 2018
  9. Sep 22, 2018
    • Martin Staehr's avatar
      remove .orig files · 7dade02d
      Martin Staehr authored
      7dade02d
    • Martin Staehr's avatar
      #40 fix merge error · 4b0c34f1
      Martin Staehr authored
      4b0c34f1
    • Martin Staehr's avatar
      Merge remote-tracking branch 'origin/development_master' into #40_dummyProjectCreation · d2f060da
      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
      d2f060da
    • Martin Staehr's avatar
      #40 fix dependency injection bugs · 5e3d4a7f
      Martin Staehr authored
      5e3d4a7f
  10. Sep 20, 2018
  11. Sep 18, 2018
  12. Sep 17, 2018
Loading