Commits · 0ea4943dd35dc1d796682752fcca7532c87611ed · fides / fltrail

Aug 01, 2018
- #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
- fix: Use 100% of width when there is no drop down button · dedcc47e
  Sven Kästle authored 6 years ago
  
  dedcc47e
- feat: Add targetId to AnnotationMessage and Implement WebSocket logic · ae51cc81
  Sven Kästle authored 6 years ago
  
  ae51cc81
- Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master · 750e4863
  Julian Dehne authored 6 years ago
  
  # Conflicts: # gemeinsamforschen/src/scripts/dbschema/fltrail.sql
  750e4863
- feat: Implement missing GET annotation gateway · 5e8da014
  Sven Kästle authored 6 years ago
  
  5e8da014
- refactor: Move annotation REST requests to seperate file · 6a2cd4e9
  Sven Kästle authored 6 years ago
  
  6a2cd4e9
- fix: Include provided as attribute for scope in pom.xml · bf6ee4bc
  Sven Kästle authored 6 years ago
  
  bf6ee4bc
Jul 18, 2018
- feat: Implement first simple WebSocket, so far no connection · 519276d9
  Sven Kästle authored 6 years ago
  
  519276d9
Jul 17, 2018
- feat: extended functionalTests to Journal, Groupfinding and Assessment module · b8426e77
  Julian Dehne authored 6 years ago
  
  b8426e77
- fix: Annotation sql statement has been overwritten · 020a8162
  Sven Kästle authored 6 years ago
  
  020a8162
- fix: Remove new credentials and add old credentials · 5591a92e
  Sven Kästle authored 6 years ago
  
  5591a92e
- Merge branch 'annotation_#47-5' into development_master · bc758ac7
  Sven Kästle authored 6 years ago
  
  bc758ac7
- fix: hide and show drop down button after edit modal close · a748fe26
  Sven Kästle authored 6 years ago
  
  a748fe26
- feat: Show and hide drop down button if necessary · d8fe1301
  Sven Kästle authored 6 years ago
  
  It is necessary to hide the button if the comment text is to long
  d8fe1301
Jul 16, 2018
- bug: fixed problem in mocking · 6090088c
  Julian Dehne authored 6 years ago
  
  6090088c
- bug: fixed problem in mocking · 467f590d
  Julian Dehne authored 6 years ago
  
  467f590d
- bug: fixed problem in mocking · 380c7d34
  Julian Dehne authored 6 years ago
  
  380c7d34
- feat: implemented ProjectConfigurationDAO · f2c22726
  Julian Dehne authored 6 years ago
  
  f2c22726
Jul 13, 2018
- feat: added functional tests for the backend components · 76304b77
  Julian Dehne authored 6 years ago
  
  76304b77
Jul 12, 2018
- feat: delete quiz in db · fd33acb2
  Axel authored 6 years ago
  
  fd33acb2
- fix: reload on Journal close · eac08e17
  Thomas Schnaak authored 6 years ago
  
  eac08e17
- refactor: own class for db communication of quizzes · f683c405
  Axel authored 6 years ago
  
  f683c405
Jul 11, 2018
- feat: Add delete button to edit modal · b87c930a
  Sven Kästle authored 6 years ago
  
  b87c930a