Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

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

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

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

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 30 more files in changeset.
LDEV-5083 Adjust size of discussion sentiment widget

  1. … 2 more files in changeset.
LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs

* Remove dots from the analytics chart as per Ernie's request

  1. … 13 more files in changeset.
LDEV-5424 Fix issues. Add Scrollspy

  1. … 4 more files in changeset.
LDEV-5424 introduce new variation of monitoring interface. Assessment tool

  1. … 7 more files in changeset.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 26 more files in changeset.
LDEV-5424 tag's title attribute is no longer required

  1. … 6 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

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

# Conflicts:

# lams_tool_assessment/web/pages/learning/learning.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 138 more files in changeset.
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.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

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

  1. … 3 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 519 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.