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 boostrap5 Peerreview tool's monitoring

  1. … 2 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

  1. … 28 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 27 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

  1. … 21 more files in changeset.
LDEV-5442 make monitoring use new starability widget

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

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

  1. … 516 more files in changeset.
LDEV-5083 Properly close each group accordion item in TBL summary

LDEV-4233 Prevent checkbox event from triggering multiple times

LDEV-5404 Escaping funny characters that break js

- Peer evaluation

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

  1. … 335 more files in changeset.
LDEV-5394 Small UI changes

LDEV-5394 Add "send emails to all" button in Peer Review

  1. … 8 more files in changeset.
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

  1. … 41 more files in changeset.
LDEV-5355 Allow editing multi-line comments

  1. … 1 more file in changeset.
LDEV-5355 Allow comment editing in Peer Review tool

  1. … 2 more files in changeset.
LDEV-5083 Rewrite TBL Peer Review tab to new UI

  1. … 5 more files in changeset.
LDEV-5313 Fix sending Peer Review emails from multi-criteria group

LDEV-5232 Remove "notify student" option from Peer Review authoring

  1. … 4 more files in changeset.
LDEV-5155 Scroll to email preview area on its open

LDEV-5155 Display email preview in corresponding group

  1. … 1 more file in changeset.
LDEV-5155 Fix displaying rubrics results in groups in monitoring

  1. … 1 more file in changeset.
LDEV-5155 Add email button to monitoring rubrics view

LDEV-5155 Add rubrics summary in Peer Review monitoring

Also fix learners' results view.

  1. … 5 more files in changeset.
LDEV-5155 Show generic button for rubrics criteria group in monitoring

  1. … 3 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 83 more files in changeset.
LDEV-4925 Adjust layout of hedging justification in Peer Review monitor

LDEV-5013 Display comment without escaping in Peer Review monitoring

LDEV-5011 Confirm before sending emails to students in Peer Review

  1. … 1 more file in changeset.