Commits · c0be55a037717b477ec1ec691a6ac7502c58efb8 · fides / fltrail

Aug 29, 2018
- Merge remote-tracking branch 'origin/development_master' into development_master · c0be55a0
  Thomas Schnaak authored 6 years ago
  
  c0be55a0
- #65 feat: export for assessment (without ResearchReport) · 9cab9a8c
  Thomas Schnaak authored 6 years ago
  
  9cab9a8c
Aug 27, 2018
- fix: DB communication for assessments · beb97f33
  Axel authored 6 years ago
  
  feat: docent quiz page
  beb97f33
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · bf247012
  Axel authored 6 years ago
  
  bf247012
Aug 20, 2018
- Merge branch 'development_master' into PeerAssessmentAxel · 35c4adb2
  Axel authored 6 years ago
  
  35c4adb2
- fix: updated DB-scheme. feat: DB-communication works for assessment. · 153fa6ba
  Axel authored 6 years ago
  
  153fa6ba
Aug 19, 2018
- Merge branch 'development_master' into Journal · 242d1955
  Thomas Schnaak authored 6 years ago
  
  242d1955
- #64 feat: implemented add/delete Link · 0e690ba0
  Thomas Schnaak authored 6 years ago
  
  0e690ba0
Aug 17, 2018
- fix: communication to db for workrating works. does not work for quizzes and contributionRating yet · 62550567
  Axel authored 6 years ago
  
  62550567
Aug 16, 2018
- deleted orig-files. · 55234f8c
  Axel authored 6 years ago
  
  55234f8c
- Stash · 56d37665
  Axel authored 6 years ago
  
  56d37665
Aug 15, 2018
- fix: my fix broke communication to DB for adding workRating. · 2dba2114
  Axel authored 6 years ago
  
  2dba2114
- feat: writeStuffToDB · 1a1f2a0a
  Axel authored 6 years ago
  
  1a1f2a0a
Aug 14, 2018
- feat: calculate Assessment on basis of DB. · 3b74ad91
  Axel authored 6 years ago
  
  3b74ad91
- unitTests · c7061f04
  Axel authored 6 years ago
  
  c7061f04
Aug 09, 2018
- beaut: exchanged List by Map in the return value of calculateAssessment() · 740f165e
  Axel authored 6 years ago
  
  740f165e
- fix: cheatChecker works for variance and median · 7493378c
  Axel authored 6 years ago
  
  7493378c
Aug 08, 2018
- feat: CheatChecker works with variance. · 1b84f745
  Axel authored 6 years ago
  
  Started to implement machine learning.
  1b84f745
Aug 07, 2018
- beaut: exchanged one list by one Map · 72c95322
  Axel authored 6 years ago
  
  feat: started to implement cheat resisting workRating
  72c95322
Aug 03, 2018
- feat: Adjust the annotation page to use new tags. #62 · cc4b1143
  Sven Kästle authored 6 years ago
  
  cc4b1143
Aug 01, 2018
- #64 feat: implemented closeProjectdescription · ce429544
  Thomas Schnaak authored 6 years ago
  
  ce429544
- #64 fix: closeJournal fixed · a16948a7
  tudtianus authored 6 years ago
  
  a16948a7
- #64 feat: completed get/edit functionality #62 feat: added taglib · 0ea4943d
  tudtianus authored 6 years ago
  
  0ea4943d
- Merge remote-tracking branch 'remotes/origin/development_master' into Journal · d389014c
  tudtianus authored 6 years ago
  
  d389014c
Jul 31, 2018
- fix: fixed some errors with database · f205c3d7
  Thomas Schnaak authored 6 years ago
  
  f205c3d7
Jul 29, 2018
- fix: headline for docent-pages · 136ac668
  Axel authored 6 years ago
  
  136ac668
Jul 26, 2018

#63 feat: adding rocket chat config to .gitignore · 773d36c3
Martin Stähr authored 6 years ago

773d36c3
#63 feat: adding rocket chat config · f6af2788
Martin Stähr authored 6 years ago

f6af2788
fix: reimported maven and it was basically fine to compile · 0a44eb05
Axel authored 6 years ago

0a44eb05

Merge remote-tracking branch 'origin/session_management' into PeerAssessmentAxel · f86e1b91

Axel authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
#	gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
#	gemeinsamforschen/src/scripts/dbschema/fltrail.sql

f86e1b91

feat: calculate assessment for finalized project works as a dummy · be212d7e
Axel authored 6 years ago

be212d7e

Merge remote-tracking branch 'origin/development_master' into Journal · 3390c494

Thomas Schnaak authored 6 years ago

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java

3390c494

Jul 25, 2018
- fix: getQuizzes from DB was corrupted · c2d60979
  Axel authored 6 years ago
  
  feat: workRating for peers are written to DB feat: 2 new tables in DB
  c2d60979
Jul 23, 2018
- feat: added session example for simplification of context storing · 28dfca5d
  Julian Dehne authored 6 years ago
  
  28dfca5d
- beauty: 2 new taglibs · 52b6a3ba
  Axel authored 6 years ago
  
  feat: creating Quizzes in the DB possible
  52b6a3ba
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · c1ac569c
  Julian Dehne authored 6 years ago
  
  c1ac569c
- feat: added better logging to activities Test · 769e315f
  Julian Dehne authored 6 years ago
  
  769e315f
Jul 20, 2018
- feat: Add edit annotation websocket support · 1def0649
  Sven Kästle authored 6 years ago
  
  1def0649
- fix: Annotation sql statement has been overwritten again · d7bcf886
  Sven Kästle authored 6 years ago
  
  d7bcf886
- Merge branch 'annotation_#47-6' into development_master · 5b8dc87a
  Sven Kästle authored 6 years ago
  
  5b8dc87a