Commits · 792ab79daecc66c612a059ea92c65a7e23166d29 · fides / fltrail

Sep 04, 2018
- refactor: New colors for each category · 792ab79d
  Sven Kästle authored 6 years ago
  
  colors from: https://www.materialpalette.com/colors
  792ab79d
- refactor: Adjust front-end REST methods · acb70e19
  Sven Kästle authored 6 years ago
  
  acb70e19
- refactor: Change database representation of submission part · fde69e0d
  Sven Kästle authored 6 years ago
  
  Id was replaced by a composite primary key
  fde69e0d
Aug 28, 2018
- feat: restore category annotations on page load · 3aa2136f
  Sven Kästle authored 6 years ago
  
  3aa2136f
- fix: Rename 'handleContextStuff' function to 'handleCategoryClick' · ead2fdb4
  Sven Kästle authored 6 years ago
  
  ead2fdb4
- feat: Save user category selection in database and implement selection logic · 54b7c90f
  Sven Kästle authored 6 years ago
  
  54b7c90f
Aug 14, 2018
- feat: Alter submission parts to use array as body · 4ebbc932
  Sven Kästle authored 6 years ago
  
  4ebbc932
Aug 13, 2018
- feat: Implement client-side REST api and add simple highlighting of text · 65fcc977
  Sven Kästle authored 6 years ago
  
  65fcc977
Aug 09, 2018
- refactor: New name for submission REST gateway · da6b885d
  Sven Kästle authored 6 years ago
  
  da6b885d
- feat: New REST gateway for submission parts · 5ed6da25
  Sven Kästle authored 6 years ago
  
  5ed6da25
- feat: Add simple category annotation cards · 45a52eb3
  Sven Kästle authored 6 years ago
  
  45a52eb3
Aug 08, 2018
- feat: Add unstructured annotation page and show submission text based on id · f598d0c4
  Sven Kästle authored 6 years ago
  
  f598d0c4
- feat: Save unstructured user input in database · 81e3a6d7
  Sven Kästle authored 6 years ago
  
  81e3a6d7
- feat: New REST gateway to create and receive full submission · e0603851
  Sven Kästle authored 6 years ago
  
  e0603851
Aug 05, 2018
- feat: Validate textarea input · d2aae249
  Sven Kästle authored 6 years ago
  
  d2aae249
- refactor: Adjust js name for unstructured upload page · df7bf93c
  Sven Kästle authored 6 years ago
  
  df7bf93c
- refactor: Adjust css name for unstructured upload page · d4ba21c1
  Sven Kästle authored 6 years ago
  
  d4ba21c1
- feat: New style for unstructured upload page · 155ce981
  Sven Kästle authored 6 years ago
  
  155ce981
- refactor: New name for unstructured upload page · 7c70402d
  Sven Kästle authored 6 years ago
  
  7c70402d
Aug 03, 2018
- fix: Remove unnecessary html page · 89b15585
  Sven Kästle authored 6 years ago
  
  89b15585
- feat: Adjust the annotation page to use new tags. #62 · cc4b1143
  Sven Kästle authored 6 years ago
  
  cc4b1143
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

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