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-5424 improvements to TBL monitor pages

  1. … 6 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

  1. … 5 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

  1. … 3 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

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

- Monitoring

- Gradebook

  1. … 19 more files in changeset.
LDEV-5346 General UI improvements TBL monitoring

Alignments, layout and labels

  1. … 11 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 19 more files in changeset.
LDEV-5332 Add Question Results table in Teams tab

  1. … 10 more files in changeset.
LDEV-5332 Drop support for MCQ as iRAT activity

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 59 more files in changeset.
LDEV-5081 Merge changes made for monitor in LDEV-5083

  1. … 36 more files in changeset.
LDEV-5174 Align Setup Teams button better in TBL monitoring teams tab

LDEV-5174 Add Teams Setup button to teams tab in TBL monitoring

  1. … 2 more files in changeset.
LDEV-5174 Do not show iRAT answers modal if learner not finished iRAT

LDEV-5174 Use more informative keys for labels

  1. … 1 more file in changeset.
LDEV-5174 Make iRAT and tRAT answers links more accessible

LDEV-5174 Add invisible icon to align numbers with highest/lowest icons

LDEV-5174 Add links from Summary table to given team's panel.

LDEV-5174 Fix tRAT lowest score detection. Add bootstrap tooltips.

  1. … 1 more file in changeset.
LDEV-5174 Add summary chart for iRAT and tRAT correct answers

  1. … 2 more files in changeset.
LDEV-5174 Use updated chartjs library

LDEV-5174 Fix close buttons in Teams modals

LDEV-5174 Make Teams tables more narrow for readability

LDEV-5174 Use icons to indicate highest & lowest factors

LDEV-5174 Remove marks and add deltas to Teams tab.

  1. … 4 more files in changeset.
LDEV-5174 Add team summary table

  1. … 4 more files in changeset.
LDEV-5174 Add Highest and Lowest labels next to learner score

  1. … 2 more files in changeset.
LDEV-5174 Add iRAT score and answer count averages

  1. … 2 more files in changeset.