Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Do not use deprecated constructors of Double and Boolean

  1. … 34 more files in changeset.
LDEV-5440 Replace deprecated Long constructor

    • -18
    • +18
    ./service/MonitoringService.java
  1. … 115 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. … 33 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
    ./web/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. … 85 more files in changeset.
LDEV-5428 Remove lesson presence and chat

    • -24
    • +0
    ./service/IMonitoringFullService.java
    • -48
    • +21
    ./service/MonitoringService.java
  1. … 38 more files in changeset.
LDEV-5440 Revert some unnecessary package name changes

    • -1
    • +1
    ./quartz/job/CloseScheduleGateJob.java
    • -1
    • +1
    ./quartz/job/EmailProgressMessageJob.java
    • -1
    • +1
    ./quartz/job/EmailScheduleMessageJob.java
    • -1
    • +1
    ./quartz/job/FinishScheduleLessonJob.java
    • -1
    • +1
    ./quartz/job/StartScheduleLessonJob.java
    • -1
    • +1
    ./web/ComplexLearnerProgressController.java
    • -1
    • +1
    ./web/EmailNotificationsController.java
  1. … 451 more files in changeset.
LDEV-5440 Refactor packages of imported classes

    • -1
    • +1
    ./quartz/job/CloseScheduleGateJob.java
    • -1
    • +1
    ./quartz/job/EmailProgressMessageJob.java
    • -1
    • +1
    ./quartz/job/EmailScheduleMessageJob.java
    • -1
    • +1
    ./quartz/job/FinishScheduleLessonJob.java
    • -1
    • +1
    ./quartz/job/StartScheduleLessonJob.java
    • -1
    • +1
    ./web/ComplexLearnerProgressController.java
    • -1
    • +1
    ./web/EmailNotificationsController.java
  1. … 468 more files in changeset.
LDEV-5440 Rewrite config files and library references

    • -2
    • +2
    ./quartz/job/CloseScheduleGateJob.java
    • -1
    • +1
    ./quartz/job/EmailProgressMessageJob.java
    • -1
    • +1
    ./quartz/job/EmailScheduleMessageJob.java
    • -2
    • +2
    ./quartz/job/FinishScheduleLessonJob.java
    • -1
    • +1
    ./quartz/job/StartScheduleLessonJob.java
    • -6
    • +6
    ./web/ComplexLearnerProgressController.java
    • -7
    • +7
    ./web/EmailNotificationsController.java
  1. … 941 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

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

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

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Merge remote-tracking branch 'origin/LDEV-5397' into v4.8

    • -21
    • +24
    ./service/MonitoringService.java
  1. … 9 more files in changeset.
Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

    • -29
    • +24
    ./service/MonitoringService.java
  1. … 34 more files in changeset.
Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

    • -29
    • +24
    ./service/MonitoringService.java
  1. … 34 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -29
    • +24
    ./service/MonitoringService.java
  1. … 519 more files in changeset.
LDEV-5431 Do not remove from groups and leaders on "Keep content"

    • -21
    • +24
    ./service/MonitoringService.java
  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

    • -4
    • +4
    ./quartz/job/StartScheduleLessonJob.java
  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

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

    • -45
    • +45
    ./service/IMonitoringFullService.java
    • -30
    • +31
    ./service/MonitoringService.java
    • -31
    • +34
    ./web/GroupingUploadController.java
  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.