Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Replace deprecated Long constructor

  1. … 116 more files in changeset.
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

  1. … 34 more files in changeset.
LDEV-5436 Use comma as name separator

Also fix names in few other places.

  1. … 7 more files in changeset.
LDEV-5440 Further code upgrade to conform new WF libraries

    • -28
    • +23
    ./EmailNotificationsController.java
  1. … 61 more files in changeset.
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

  1. … 86 more files in changeset.
LDEV-5428 Remove lesson presence and chat

  1. … 40 more files in changeset.
LDEV-5440 Revert some unnecessary package name changes

    • -1
    • +1
    ./ComplexLearnerProgressController.java
  1. … 458 more files in changeset.
LDEV-5440 Refactor packages of imported classes

    • -1
    • +1
    ./ComplexLearnerProgressController.java
  1. … 475 more files in changeset.
LDEV-5440 Rewrite config files and library references

    • -6
    • +6
    ./ComplexLearnerProgressController.java
  1. … 947 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5436 Add project-wide User sorting on Java level

  1. … 10 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-5407 Show "return to index" link only for non-integrated courses

  1. … 1 more file in changeset.
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. … 6 more files in changeset.
LDEV-5338 Properly set chosen groups even for other grouping types

  1. … 7 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.

    • -0
    • +40
    ./BranchingController.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

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

    • -0
    • +11
    ./GroupingUploadAJAXController.java
  1. … 1 more file in changeset.