Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-5337 Add "return to monitoring button" to Team Setup screen

  1. … 5 more files in changeset.
LDEV-5200 Properly refresh monitoring after changing lesson state

LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

  1. … 1 more file in changeset.
LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

  1. … 1 more file 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. … 8 more files in changeset.
LDEV-5397 Use rewritten alert (toast) and confirmation pop ups

  1. … 5 more files in changeset.
LDEV-5386 Library management

  1. … 70 more files in changeset.
LDEV-4199 Reintroduce group based branching monitoring page

It is difficult to determine which groups have been mapped to branches in monitoring and whether they are not broken. We needed a page to be able to review groupings.

  1. … 6 more files in changeset.
LDEV-5200 Fix Edit Class dialog role extraction from HTML structure

LDEV-5200 Fix learner search and search clear

LDEV-5200 Fix learner search and search clear

LDEV-5200 Add completed activities and lesson info on learners tab

  1. … 4 more files in changeset.
LDEV-5200 Add paging to learners tab in monitoring

  1. … 2 more files in changeset.
LDEV-3167 Stop monitor refresh when user logged out

LDEV-5200 Display and allow copying lesson URL

  1. … 3 more files in changeset.
LDEV-5200 In Learners tab do not open activity pop up for gates

LDEV - 5348: Minor monitor improvements

- move count down timer to manage lesson

- Make class dialog bigger so no need to resize (given new font size)

  1. … 2 more files in changeset.
LDEV-5200 Add pop ups and labels to learners tab

  1. … 2 more files in changeset.
LDEV-5083 Fix encoding issue in Learners tab

LDEV-5200 Fix lesson renaming

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

LDEV-4274 Fix learner progress reports "Send now" button

LDEV-5200 Use consistent dbl click handler on gate & grouping activities

LDEV-5200 Remove obsolete "requires attention" icon click handler

LDEV-5200 Allow monitor JS script minimisation

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

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 35 more files in changeset.
LDEV-4989 Recognise Password Gate as a gate for monitoring icons

LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 19 more files in changeset.