Commits · e733293dc58778064d5f6d520328df1310279aa4 · fides / fltrail

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
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
Jun 16, 2018
- fix: fixing entry point of problem of app · 0901c44d
  Martin Stähr authored 6 years ago
  
  0901c44d
- fix: adding .idea folder to ignore list for every subfolder · edfe99f4
  Martin Stähr authored 6 years ago
  
  It only contains IDE settings which shouldn't be in source control anyway
  edfe99f4
- Merge branch 'annotation' into development_master · debfd6cc
  Sven Kästle authored 6 years ago
  
  debfd6cc
- feat: Implement CRUD methods to manage annotations from web · c2645d9c
  Sven Kästle authored 6 years ago
  
  c2645d9c
- feat: Add sql statement to create annotations table · 431e6c08
  Sven Kästle authored 6 years ago
  
  431e6c08
Jun 15, 2018
- test: Tests the AnnotationController methods · a8707245
  Sven Kästle authored 6 years ago
  
  a8707245
- feat: Implement annotation database management · 6514af70
  Sven Kästle authored 6 years ago
  
  The AnnotationController handles the database queries
  6514af70
Jun 11, 2018
- fix: Category · 20c5bd18
  KKlaue authored 6 years ago
  
  fix: ExampleFeedback
  20c5bd18
Jun 10, 2018
- refactor: Peer2PeerFeedback · f3d00e4f
  KKlaue authored 6 years ago
  
  feat: ExampleFeedback feat: Enum Category
  f3d00e4f
Jun 09, 2018
- fix: Updated Journal Interface · a0513fd2
  tudtianus authored 6 years ago
  
  a0513fd2
Jun 07, 2018
- Merge branch 'core.management.group' into development_master · a733ea1e
  Martin Stähr authored 6 years ago
  
  a733ea1e
- override quizmethod · 9ed8a840
  Axel authored 6 years ago
  
  9ed8a840
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · faf71d87
  Axel authored 6 years ago
  
  faf71d87
- fix: enhanced Quiz and wrote some comments · f4692800
  Axel authored 6 years ago
  
  f4692800
Jun 06, 2018
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 24acdd98
  Thomas Schnaak authored 6 years ago
  
  24acdd98
- refactor: fix variable naming · 2f21ac87
  Martin Stähr authored 6 years ago
  
  2f21ac87
- feat: implement dummy functions · 920f2416
  Martin Stähr authored 6 years ago
  
  920f2416
- feat: implemented dummyservice and registration mechanism · 2e5d49aa
  Martin Stähr authored 6 years ago
  
  2e5d49aa
- refactor: communication interface and add missing functions · 139da86c
  Martin Stähr authored 6 years ago
  
  139da86c
- fix: changed interfaces · 6b247536
  Thomas Schnaak authored 6 years ago
  
  6b247536
- fix: fix for logging · 149855ce
  Martin Stähr authored 6 years ago
  
  149855ce
Jun 05, 2018
- bigfixing: the an error with the switch cases for docent-student · 94262250
  Julian Dehne authored 6 years ago
  
  refactoring: simplified package structure (no servlet/tag folders needed) documentation: added some comments to the service classes
  94262250
- refactor: eliminated servlets (new tech for course not necessary) · f0724b7b
  Julian Dehne authored 6 years ago
  
  refactor: used jersey seeOther method for redirect instead
  f0724b7b
- fix: beautify overview for docent and student · ef6bba53
  Axel authored 6 years ago
  
  ef6bba53
- feat: login and register connects to overview · 04aac149
  Axel authored 6 years ago
  
  04aac149
- feat: implemented role for user (isStudent true/false) · 9596972b
  Julian Dehne authored 6 years ago
  
  9596972b
- Merge remote-tracking branch 'origin/development_master' into core.management.group · f4e46f05
  Julian Dehne authored 6 years ago
  
  f4e46f05
Jun 04, 2018
- feat: implemented Login View (ported from groupfinding project) · 25838284
  Julian Dehne authored 6 years ago
  
  feat: implemented Servlet Filter (for all pages in /pages/ user is redirected to login if he is not authorized) feat: implemented TagLib for hidden fields (showing the user name based on token in url) feat: copied styles from groupfinding project
  25838284
- Merge remote-tracking branch 'origin/development_master' into development_master · 31a99df4
  quark authored 6 years ago
  
  31a99df4
- changed ResearchReport Interface · 6ee0cf99
  quark authored 6 years ago
  
  6ee0cf99
Jun 03, 2018
- refactor: Interface&Class Peer2PeerFeedback · 0f13ca69
  KKlaue authored 6 years ago
  
  0f13ca69