Commits · 6e67b7dd4e8b485d2012e504071e395546e4dc76 · fides / fltrail

Jul 03, 2018
- fix: full assessment-path clickable from enrollment for project to peer Assessment · 6e67b7dd
  Axel authored 6 years ago
  
  6e67b7dd
- fix: utf-8 on feedback and annotation documents · be6f432d
  Axel authored 6 years ago
  
  fix: path for quizzes done. almost assessment path done
  be6f432d
- Merge branch 'PeerAssessmentAxel' into pages_overview · bec14bb9
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/webapp/pages/project-student.jsp
  bec14bb9
Jul 02, 2018
- refactor: Add 'back' buttons, merge three files to one, update feedback pages · c4d66579
  KKlaue authored 6 years ago
  
  c4d66579
Jul 01, 2018
- Merge branch 'annotation_#47_rework_1' into pages_overview · 52cce980
  Sven Kästle authored 6 years ago
  
  52cce980
- refactor: Add annotation page into the 'click chain' of feedback process · 6e615097
  Sven Kästle authored 6 years ago
  
  before: project-student.js --> givefeedback.jsp now: project-student.js --> annotation-document.jsp --> givefeedback.jsp
  6e615097
- refactor: New file name and add menu via tag · afe32ebb
  Sven Kästle authored 6 years ago
  
  afe32ebb
- fix: Add create table annotation statement · 0c05ca21
  Sven Kästle authored 6 years ago
  
  0c05ca21
- Merge branch 'annotation_#47' into pages_overview · 4437c7ee
  Sven Kästle authored 6 years ago
  
  4437c7ee
- feat: Add 'next' button to reach the next page · 924b4c40
  Sven Kästle authored 6 years ago
  
  924b4c40
- feat: add Buttons and Links · 23b80482
  KKlaue authored 6 years ago
  
  23b80482
Jun 30, 2018
- feat: Limit Page size to viewport height and add scrollbar to list · da3a0336
  Sven Kästle authored 6 years ago
  
  da3a0336
- Feat: create Peerfeedback view · f8c0b208
  KKlaue authored 6 years ago
  
  f8c0b208
Jun 29, 2018
- feat: rate contributions.jsp · 30ec9de0
  Axel authored 6 years ago
  
  feat: footer with progress bar on project-student
  30ec9de0
Jun 28, 2018
- beautify: collapsable quizzes · 3662911e
  Axel authored 6 years ago
  
  3662911e
- feat: Quiz-pages are done in raw form. · eff28114
  Axel authored 6 years ago
  
  feat: db reworked for quizzes.
  eff28114
Jun 26, 2018
- feat: Add delete button to card if the annotation is from user · 3e0976b7
  Sven Kästle authored 6 years ago
  
  3e0976b7
- feat: reworked menu for student, docent and missing tag. · 85a28d51
  Axel authored 6 years ago
  
  feat: jsp pages are utf-8 encoded now
  85a28d51
Jun 24, 2018
- feat: Change color on annotation card hover · e733293d
  Sven Kästle authored 6 years ago
  
  e733293d
Jun 23, 2018
- feat: Add user color support for different users · 44cedec6
  Sven Kästle authored 6 years ago
  
  44cedec6
- feat: Implement toggle button functionality · 67819811
  Sven Kästle authored 6 years ago
  
  67819811
- feat: New annotation card design · 219bc82a
  Sven Kästle authored 6 years ago
  
  219bc82a
- fix: New response for 'addAnnotation' method · 5e2a8c64
  Sven Kästle authored 6 years ago
  
  5e2a8c64
Jun 21, 2018
- feat: hovering over an annotation will highlight the corresponding text · 318f992f
  Sven Kästle authored 6 years ago
  
  318f992f
- fix: renaming for getUserByToken() · cf9d3b72
  Axel authored 6 years ago
  
  cf9d3b72
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 80cf2a5b
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java # gemeinsamforschen/src/main/webapp/pages/overview-docent.html # gemeinsamforschen/src/main/webapp/pages/overview-student.html
  80cf2a5b
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 83cbbd7e
  Axel authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java # gemeinsamforschen/src/main/webapp/pages/overview-docent.html # gemeinsamforschen/src/main/webapp/pages/overview-student.html
  83cbbd7e
- feat: get Token from url and reach it to next page works for overview-docent and -student. · 101938cc
  Axel authored 6 years ago
  
  fix: userToken was not written to url during login
  101938cc
- Merge branch 'communication' into development_master · 9bbae0ff
  Martin Stähr authored 6 years ago
  
  # Conflicts: # .gitignore # gemeinsamforschen/src/scripts/dbschema/fltrail.sql
  9bbae0ff
- format sql database sheet · f76f847d
  Martin Stähr authored 6 years ago
  
  f76f847d
- feat: update sql database schema of communication branch · 8e958114
  Martin Stähr authored 6 years ago
  
  8e958114
- gitignore. sry guys for losing settings =D · 2e9d400f
  Axel authored 6 years ago
  
  2e9d400f
- Merge branch 'PeerAssessmentAxel' into development_master · 711bb130
  Axel authored 6 years ago
  
  # Conflicts: # .gitignore
  711bb130
Jun 20, 2018
- refactor: Category, ExampleFeedback, Peer2PeerFeedback (little changes) · 44be9a83
  KKlaue authored 6 years ago
  
  44be9a83
Jun 19, 2018
- feat: first views for quizzes and rating of peer workethics. · 0d2af485
  Axel authored 6 years ago
  
  html mutates to jsp step by step. first step
  0d2af485
Jun 17, 2018
- feat: Imported the annotation prototype · 022c3600
  Sven Kästle authored 6 years ago
  
  page: annotation_document.html url: http://localhost:8080/pages/annotation_document.html
  022c3600
- Merge branch 'annotation' into development_master · f7e06075
  Sven Kästle authored 6 years ago
  
  f7e06075
- refactor: No need for gson and refactored the annotation REST paths · 60e889f3
  Sven Kästle authored 6 years ago
  
  60e889f3
- fix: fixing tests #40 · 8ec083e0
  Martin Stähr authored 6 years ago
  
  8ec083e0
- feat: start implementing groupCreationDummy #40 · f2e6f8e6
  Martin Stähr authored 6 years ago
  
  chore: adding todos
  f2e6f8e6