Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 519 more files in changeset.
LDEV-5431 Do not remove from groups and leaders on "Keep content"

  1. … 2 more files in changeset.
LDEV-5431 Reset activity completion on force uncomplete in Monitor

  1. … 38 more files in changeset.
LDEV-5402 Fix LD path building on Monitoring page

LDEV-5402 Fix LD path building on Monitoring page

LDEV-5423 Complete Flux on all subscriptions terminated

Also:

* use separate and configurable task executor for async requests

* introduce backlog pressure strategy for Fluxes

* synchronise access to Flux mapping

* add logs

  1. … 3 more files in changeset.
LDEV-5260 Fix multiple timers Flux

  1. … 2 more files in changeset.
LDEV-5341 Skip privileges when starting lesson via Quartz Job

Links to

https://lamssupport.atlassian.net/browse/LKC-154

  1. … 1 more file in changeset.
LDEV-5407 Show "return to index" link only for non-integrated courses

  1. … 1 more file in changeset.
LDEV-5341 Skip privileges when suspending lesson via Quartz Job

Following

https://lamssupport.atlassian.net/browse/LKC-145

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-5337 Inform which learners were skipped during grouping upload

  1. … 4 more files in changeset.
LDEV-5338 Properly set chosen groups even for other grouping types

  1. … 5 more files in changeset.
LDEV-5408 Add Extra Information buttons on RAT and AE tabs in monitoring

  1. … 6 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-5407 Remove monitor link to return to index page for integrations

  1. … 1 more file in changeset.
SP-9 Rewrite lesson completion chart to new ChartJS

  1. … 5 more files in changeset.
LDEV-5402 Display path to Learning Design in authoring

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

Conflicts:

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

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

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

  1. … 6 more files in changeset.
LDEV-5350 Do not remove groups used for branching on spreadsheet upload

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

  1. … 11 more files in changeset.
LDEV-5363 Remove duplicate method

LDEV-5363 Add TBL course gradebook export

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

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

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

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

lams_monitoring/web/grouping/chosenGrouping.jsp

  1. … 43 more files in changeset.
LDEV-5358 Always sort groups by name, case insensitive

  1. … 6 more files in changeset.
# WARNING: head commit changed in the meantime

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

  1. … 8 more files in changeset.