Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-3716 Allow checking Assessment mcq options when clicking on label

LDEV-4921 Hide question titles in Assessment

  1. … 1 more file in changeset.
LDEV-5052 rendering question title

LDEV-5033 Add answer justification to Assessment

  1. … 12 more files in changeset.
LDEV-5041 Remove block UI on learner entry with time limit

  1. … 3 more files in changeset.
LDEV-5041 Add absolute time limit feature to Assessment

  1. … 10 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

  1. … 6 more files in changeset.
LDEV-5041 Rewrite Assessment time limit with websockets

  1. … 9 more files in changeset.
LDEV-5025 Fix page reloading, not from cache

  1. … 1 more file in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-5052 Fix page reloading, not from cache

  1. … 1 more file in changeset.
LDEV-5052 Make "not disclosed" info print out in italics

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 33 more files in changeset.
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 33 more files in changeset.
LDEV-5025 Put proper text information when answers not yet disclosed

  1. … 1 more file in changeset.
LDEV-5025 Show own group ratings only when rated other groups

  1. … 2 more files in changeset.
LDEV-5025 Highlight own group when displaying Assessment answer rating

  1. … 1 more file in changeset.
LDEV-5025 Allow rating only for Leaders

LDEV-5025 Show rating for the given team's own answer

  1. … 1 more file in changeset.
LDEV-5025 Do not centre an other group's answer in the results table

LDEV-5025 Allow Assessment other groups' answer rating and commenting

  1. … 10 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

  1. … 5 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

lams_tool_assessment/web/pages/learning/learning.jsp

  1. … 5 more files in changeset.
LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

  1. … 4 more files in changeset.
LDEV-4880 Add confidence level variations

  1. … 16 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 21 more files in changeset.
LDEV-4900 Trigger autosave when force completing Assessment activity

  1. … 5 more files in changeset.
LDEV-4900 Make Assessment autosave a recognisable function

LDEV-4875 Fixes for VSA feature

  1. … 22 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

  1. … 69 more files in changeset.