Skip to content
Snippets Groups Projects
  1. Jun 10, 2019
  2. Jun 02, 2019
  3. May 29, 2019
  4. May 26, 2019
  5. May 24, 2019
  6. May 23, 2019
  7. May 17, 2019
  8. Apr 24, 2019
  9. Apr 23, 2019
  10. Mar 20, 2019
  11. Mar 04, 2019
  12. Feb 08, 2019
  13. Feb 04, 2019
  14. Jan 15, 2019
  15. Jan 10, 2019
  16. Jan 07, 2019
  17. Jan 04, 2019
  18. Dec 18, 2018
  19. Dec 17, 2018
  20. Dec 13, 2018
  21. 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
  22. Nov 19, 2018
  23. Nov 14, 2018
  24. Nov 07, 2018
  25. Nov 06, 2018
  26. Oct 29, 2018
  27. Oct 25, 2018
  28. Oct 22, 2018
  29. Oct 18, 2018
  30. Oct 15, 2018
Loading