Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -2
    • +4
    ./monitoring/web/MonitoringController.java
LDEV-5402 Fix LD path building on Monitoring page

    • -3
    • +5
    ./monitoring/web/MonitoringController.java
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

    • -4
    • +12
    ./monitoring/web/MonitoringController.java
  1. … 3 more files in changeset.
LDEV-5260 Fix multiple timers Flux

    • -6
    • +44
    ./monitoring/web/MonitoringController.java
  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

    • -3
    • +4
    ./monitoring/web/MonitoringController.java
  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

    • -0
    • +4
    ./monitoring/web/MonitoringController.java
  1. … 9 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

    • -4
    • +1
    ./monitoring/web/GroupingController.java
  1. … 5 more files in changeset.
LDEV-5337 Inform which learners were skipped during grouping upload

    • -125
    • +133
    ./monitoring/service/MonitoringService.java
    • -23
    • +26
    ./monitoring/web/GroupingUploadController.java
  1. … 4 more files in changeset.
LDEV-5338 Properly set chosen groups even for other grouping types

    • -45
    • +45
    ./monitoring/service/IMonitoringFullService.java
    • -31
    • +34
    ./monitoring/web/GroupingUploadController.java
  1. … 5 more files in changeset.
LDEV-5408 Add Extra Information buttons on RAT and AE tabs in monitoring

    • -0
    • +2
    ./monitoring/web/MonitoringController.java
  1. … 6 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

    • -22
    • +26
    ./monitoring/web/GroupingController.java
  1. … 3 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

    • -22
    • +26
    ./monitoring/web/GroupingController.java
  1. … 3 more files in changeset.
LDEV-5407 Remove monitor link to return to index page for integrations

    • -0
    • +2
    ./monitoring/web/MonitoringController.java
  1. … 1 more file in changeset.
SP-9 Rewrite lesson completion chart to new ChartJS

    • -5
    • +8
    ./monitoring/web/MonitoringController.java
  1. … 5 more files in changeset.
LDEV-5402 Display path to Learning Design in authoring

    • -89
    • +89
    ./monitoring/web/MonitoringController.java
  1. … 2 more files in changeset.
LDEV-5386 Library management

    • -16
    • +3
    ./monitoring/web/MonitoringController.java
  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.

    • -0
    • +40
    ./monitoring/web/BranchingController.java
    • -91
    • +65
    ./monitoring/web/MonitoringController.java
  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

    • -0
    • +11
    ./monitoring/web/GroupingUploadController.java
  1. … 6 more files in changeset.
LDEV-5350 Do not remove groups used for branching on spreadsheet upload

    • -0
    • +11
    ./monitoring/web/GroupingUploadAJAXController.java
  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

    • -2
    • +5
    ./monitoring/web/MonitoringController.java
    • -158
    • +9
    ./monitoring/web/TblMonitoringController.java
  1. … 11 more files in changeset.
LDEV-5363 Remove duplicate method

    • -86
    • +0
    ./monitoring/web/TblMonitoringController.java
LDEV-5363 Add TBL course gradebook export

    • -80
    • +15
    ./monitoring/web/TblMonitoringController.java
  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

    • -2
    • +1
    ./monitoring/web/GroupingController.java
    • -18
    • +3
    ./monitoring/web/GroupingUploadController.java
  1. … 43 more files in changeset.
LDEV-5358 Always sort groups by name, case insensitive

    • -2
    • +1
    ./monitoring/web/GroupingAJAXController.java
    • -18
    • +3
    ./monitoring/web/GroupingUploadAJAXController.java
  1. … 6 more files in changeset.
# WARNING: head commit changed in the meantime

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

    • -1
    • +9
    ./monitoring/web/GroupingController.java
  1. … 8 more files in changeset.
LDEV-4341 Always save org grouping to top course

    • -9
    • +15
    ./monitoring/web/GroupingAJAXController.java