Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 fix initialization of buttons when Assessment is shown in TBL's iRAT tab

  1. … 2 more files in changeset.
LDEV-5397 fix assessment monitoring by feeding it old bootstrap3 learning jsps

  1. … 13 more files in changeset.
LDEV-5095 Limit max size of completion chart in Assessment monitoring

LDEV-5373 Make side headers sticky at teams' choices table

LDEV-5373 Display Teams student choices only with leaders enabled

Merge remote-tracking branch 'origin/v4.7' into SP-9

# Conflicts:

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_monitoring/web/includes/javascript/monitorLesson.js

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp

  1. … 8 more files in changeset.
LDEV-5397 migrate Assessment's learning to Bootstrap 5

  1. … 33 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Assessment

  1. … 10 more files in changeset.
SP-9 Rewrite lesson completion chart to new ChartJS

  1. … 5 more files in changeset.
SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

  1. … 7 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 337 more files in changeset.
LDEV-5401 Add learner-triggered absolute time limit monitoring

Also make time limit panel refresh automatically in monitoring.

  1. … 10 more files in changeset.
LDEV-5401 Add learner-triggered absolute time limit authoring and learning

  1. … 16 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 14 more files in changeset.
LDEV-5400 Add tooltip with learners to activity completion chart

Also add group information in the tooltip

  1. … 8 more files in changeset.
LDEV-5373 Display groups' choices always for grouped Assessments

  1. … 1 more file in changeset.
LDEV-5373 Add student choices detailed table to Assessment monitoring

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 7 more files in changeset.
LDEV-5360 Put grade column next to marker column on the right

  1. … 1 more file in changeset.
LDEV-5360 Add marker information to other monitoring views

  1. … 1 more file in changeset.
LDEV-5360 Add marker's comment to question result

  1. … 8 more files in changeset.
LDEV-5360 Use column instead of tooltip to indicate marker

LDEV-5360 Use dash instead of 0 for umarked essay questions

LDEV-5359 Inform of question distribution method in monitoring

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-5200, LKC-111 Fix iRAT student choices table update

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 11 more files in changeset.
LDEV-5351 Use Boostrap tooltips instead of plain HTML titles

LDEV-5352 Slightly improve UI

  1. … 1 more file in changeset.
LDEV-5352 Use colours in question column, not in options columns