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

    • -1
    • +1
    ./web/controller/LearningController.java
    • -3
    • +3
    ./web/controller/MonitoringController.java
  1. … 113 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
    • +1
    ./web/controller/LearningController.java
  1. … 33 more files in changeset.
LAI-11 Add AI PBL wizard

Refactor code of other AI wizards.

  1. … 10 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-5425 delete notebook leftovers

    • -1
    • +1
    ./web/controller/LearningController.java
  1. … 1 more file in changeset.
LDEV-5440 Revert some unnecessary package name changes

    • -1
    • +1
    ./web/controller/AuthoringController.java
    • -1
    • +1
    ./web/controller/LearningController.java
    • -1
    • +1
    ./web/controller/MonitoringController.java
  1. … 454 more files in changeset.
LDEV-5440 Refactor packages of imported classes

    • -1
    • +1
    ./web/controller/AuthoringController.java
    • -1
    • +1
    ./web/controller/LearningController.java
    • -1
    • +1
    ./web/controller/MonitoringController.java
  1. … 472 more files in changeset.
LDEV-5440 Rewrite config files and library references

    • -4
    • +4
    ./web/controller/AuthoringController.java
    • -5
    • +5
    ./web/controller/LearningController.java
    • -4
    • +4
    ./web/controller/MonitoringController.java
  1. … 942 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

    • -1
    • +1
    ./web/controller/LearningController.java
  1. … 147 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

    • -64
    • +2
    ./web/controller/LearningController.java
  1. … 33 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

    • -64
    • +2
    ./web/controller/LearningController.java
  1. … 33 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -0
    • +15
    ./dbupdates/patch20231221.sql
    • -6
    • +0
    ./web/controller/AuthoringController.java
    • -64
    • +2
    ./web/controller/LearningController.java
    • -32
    • +8
    ./web/controller/MonitoringController.java
  1. … 508 more files in changeset.
LDEV-5433 Squash DB patches and update versions

    • -0
    • +13
    ./dbupdates/patch20230325.sql
  1. … 107 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

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

    • -45
    • +59
    ./web/controller/LearningController.java
  1. … 3 more files in changeset.
LDEV-5431 Reset activity completion on force uncomplete in Monitor

  1. … 38 more files in changeset.
LDEV-5225 Fix exception in MindMap Gallery Walk

When a learner only creates a session when Gallery Walk was already started, there are no nodes created for the session and an exception is thrown. Now these nodes get created even in Gallery Walk.

    • -45
    • +59
    ./web/controller/LearningController.java
LDEV-5415 Allow skipping Gallery Walk

    • -9
    • +15
    ./web/controller/MonitoringController.java
  1. … 13 more files in changeset.
LDEV-5397 bootstrap5 Mindmap tool

    • -1
    • +1
    ./web/controller/LearningController.java
  1. … 7 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

    • -5
    • +1
    ./web/controller/LearningController.java
  1. … 95 more files in changeset.
LDEV-5328 Squash DB patches and update versions

    • -0
    • +15
    ./dbupdates/patch20210731_updateTo46.sql
    • -0
    • +14
    ./dbupdates/patch20220920.sql
  1. … 152 more files in changeset.
LDEV-5250 Remove Pedagogical Planner integration with core LAMS

    • -57
    • +0
    ./web/forms/MindmapPedagogicalPlannerForm.java
  1. … 66 more files in changeset.
LDEV-4411 Stop using collection cache for now

Cache annotations were commented out so we can come back to them easily

in the future.

Collection cache is not detecting changes made to entities. When a new

entity is added, collection cache does not see the change.

Properly tweaking concurrency strategy does not seem possible at the

moment, so we just turn it off.

  1. … 29 more files in changeset.
LDEV-5248, LDEV-4411 Mark some collections as cacheable

Similar to query cache, the collection cache makes sense if the table

which collection elements map to do not change often. Each modification

to table content invalidates the given collection cache.

  1. … 31 more files in changeset.
LDEV-5248, LDEV-4411 Mark some queries as cacheable

Query cache makes sense if tables which the query reference does not

change often. Each modification to table content invalidates the given

query's cache. Also each set of query parameters is a different cache

entry, so if there are various parameter values the cache overhead can

generate more load than benefit.

    • -2
    • +1
    ./dao/hibernate/MindmapSessionDAO.java
  1. … 95 more files in changeset.
LDEV-5228 Fix print mode for single user mindmaps

    • -3
    • +5
    ./web/controller/LearningController.java
  1. … 2 more files in changeset.
LDEV-5228 Add print button to Mindmap

    • -1
    • +12
    ./web/controller/LearningController.java
    • -0
    • +1
    ./web/controller/MonitoringController.java
  1. … 5 more files in changeset.
LDEV-5225 Add Mindmap Gallery Walk ratings in monitoring

    • -34
    • +1
    ./web/controller/LearningController.java
    • -1
    • +5
    ./web/controller/MonitoringController.java
  1. … 2 more files in changeset.
LDEV-5225 Add Mindmap Gallery Walk learning

    • -60
    • +112
    ./web/controller/LearningController.java
  1. … 7 more files in changeset.
LDEV-5225 Add Mindmap Gallery Walk controls in monitoring

    • -1
    • +22
    ./web/controller/MonitoringController.java
  1. … 2 more files in changeset.
LDEV-5225 Add Mindmap Gallery Walk authoring

    • -2
    • +8
    ./web/controller/AuthoringController.java
  1. … 2 more files in changeset.