Skip to content
Snippets Groups Projects
  1. Nov 26, 2018
    • Julian Dehne's avatar
      Merge branch 'development_master' of... · 0f4371b3
      Julian Dehne authored
      Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into groupfinding_module
      
      # Conflicts:
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/Project.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectView.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/process/ProjectCreationProcess.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java
      #	gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java
      #	gemeinsamforschen/src/main/webapp/profile/profile.jsp
      #	gemeinsamforschen/src/main/webapp/project/js/create-project.js
      #	gemeinsamforschen/src/main/webapp/project/overview-student.jsp
      #	gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
      #	gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
      #	gemeinsamforschen/src/scripts/dbschema/createDummyUsersGroupsProject.sql
      #	gemeinsamforschen/src/test/resources/database/fltrail.sql
      0f4371b3
  2. Nov 19, 2018
  3. Nov 16, 2018
  4. Nov 14, 2018
  5. Nov 13, 2018
  6. Nov 12, 2018
  7. Nov 07, 2018
  8. Nov 06, 2018
  9. Nov 05, 2018
  10. Nov 04, 2018
  11. Nov 02, 2018
  12. Nov 01, 2018
  13. Oct 30, 2018
  14. Oct 29, 2018
  15. Oct 25, 2018
  16. Oct 22, 2018
  17. Oct 18, 2018
  18. Oct 17, 2018
  19. Oct 16, 2018
  20. Oct 15, 2018
Loading