Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5360 Indicate auto-graded answers

  1. … 5 more files in changeset.
LDEV-5360 Allow even longer marker comments

Caused by

https://lamssupport.atlassian.net/browse/ICL-18

  1. … 3 more files in changeset.
LDEV-5360 Allow multiline marker comments

Caused by

https://lamssupport.atlassian.net/browse/ICL-27

  1. … 6 more files in changeset.
LDEV-5360 Accept "0" as proper mark for unmarked answer

Caused by

https://lamssupport.atlassian.net/browse/ICL-28

  1. … 2 more files in changeset.
LDEV-5360 Allow longer marker comments

  1. … 3 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. … 9 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Assessment

  1. … 18 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. … 8 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. … 8 more files in changeset.
LDEV-5360 Put grade column next to marker column on the right

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

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

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

  1. … 1 more file in changeset.
LDEV-5360 Use dash instead of 0 for umarked essay questions

  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. … 12 more files in changeset.
LDEV-5351 Add marking teacher front end

  1. … 6 more files in changeset.
LDEV-5336 Add table with all learners' results

  1. … 8 more files in changeset.
LDEV-5317 Fix thread preventing server from shutting down

Using <c:import> in cross-module context prevents WildFly from shutting

down properly. The mechanism was replaced with an Ajax call.

  1. … 10 more files in changeset.
LDEV-5317 Move timeLimit.jsp from its own directory

  1. … 6 more files in changeset.
LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

  1. … 29 more files in changeset.
LDEV-5242 Merge changes from 4.5

  1. … 4 more files in changeset.