Skip to content
Snippets Groups Projects
  1. Sep 24, 2018
  2. Sep 21, 2018
  3. Sep 20, 2018
  4. Sep 19, 2018
  5. Sep 18, 2018
  6. Sep 17, 2018
  7. Sep 14, 2018
  8. Sep 13, 2018
  9. Sep 12, 2018
    • Julian Dehne's avatar
      - started working on group finding prototyp (basic group management prototyp... · ab6d6338
      Julian Dehne authored
      - started working on group finding prototyp (basic group management prototyp for development - not advanced groupfinding i.e. mirjams project)
      ab6d6338
    • Julian Dehne's avatar
      Merge branch 'development_master_refactoring_1' of... · 0a129d53
      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
      0a129d53
    • Julian Dehne's avatar
      - started working on group finding prototyp (basic group management prototyp... · 9b334fbd
      Julian Dehne authored
      - started working on group finding prototyp (basic group management prototyp for development - not advanced groupfinding i.e. mirjams project)
      9b334fbd
    • Axel's avatar
      debug: fixed relative paths in menu and js's · f3c62d75
      Axel authored
      f3c62d75
    • Axel's avatar
      Merge branch 'development_master_refactoring_1' of... · 728808a1
      Axel authored
      Merge branch 'development_master_refactoring_1' of https://github.com/juliandehne/fltrail into development_master_refactoring_1
      728808a1
    • Axel's avatar
      refac js and css in according webapp-packages · 98736e05
      Axel authored
      98736e05
    • Julian Dehne's avatar
      - started working on group finding prototyp (basic group management prototyp... · 04617801
      Julian Dehne authored
      - started working on group finding prototyp (basic group management prototyp for development - not advanced groupfinding i.e. mirjams project)
      04617801
    • Julian Dehne's avatar
    • Axel's avatar
      beaut: new packages for every web-app-module · fd7727fb
      Axel authored
      fd7727fb
Loading