Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

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

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

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 30 more files in changeset.
LDEV-5440 Do not use deprecated constructors of Double and Boolean

    • -1
    • +1
    ./tool/forum/service/ForumService.java
  1. … 32 more files in changeset.
LDEV-5440 Replace deprecated Long constructor

    • -3
    • +3
    ./tool/forum/service/ForumService.java
  1. … 109 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
    ./tool/forum/service/ForumService.java
  1. … 32 more files in changeset.
LDEV-5440 Further code upgrade to conform new WF libraries

    • -14
    • +12
    ./tool/forum/dao/hibernate/MessageSeqDao.java
  1. … 59 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-5424 boostrap5 Forum's monitoring

  1. … 20 more files in changeset.
LDEV-5442 fix issues with star rating widget

  1. … 2 more files in changeset.
LDEV-5442 switch to using lams:Rating tag instead of jRating plugin in Forum tool

    • -19
    • +11
    ./tool/forum/dto/MessageDTO.java
    • -5
    • +27
    ./tool/forum/service/ForumService.java
  1. … 9 more files in changeset.
LDEV-5440 Revert some unnecessary package name changes

    • -3
    • +3
    ./tool/forum/dao/hibernate/ForumUserDao.java
    • -1
    • +1
    ./tool/forum/dao/hibernate/MessageSeqDao.java
    • -1
    • +1
    ./tool/forum/model/ForumToolSession.java
    • -1
    • +1
    ./tool/forum/service/ForumService.java
    • -1
    • +1
    ./tool/forum/util/TopicComparator.java
    • -1
    • +1
    ./tool/forum/web/forms/MessageForm.java
  1. … 450 more files in changeset.
LDEV-5440 Refactor packages of imported classes

    • -1
    • +1
    ./tool/forum/dao/hibernate/MessageSeqDao.java
    • -1
    • +1
    ./tool/forum/model/ForumToolSession.java
    • -1
    • +1
    ./tool/forum/service/ForumService.java
    • -1
    • +1
    ./tool/forum/util/TopicComparator.java
    • -1
    • +1
    ./tool/forum/web/forms/MessageForm.java
  1. … 468 more files in changeset.
LDEV-5440 Rewrite config files and library references

    • -3
    • +3
    ./tool/forum/dao/hibernate/ForumUserDao.java
    • -2
    • +2
    ./tool/forum/dao/hibernate/MessageSeqDao.java
    • -14
    • +14
    ./tool/forum/model/Attachment.java
    • -6
    • +6
    ./tool/forum/model/ForumCondition.java
    • -6
    • +6
    ./tool/forum/model/ForumConfigItem.java
    • -10
    • +10
    ./tool/forum/model/ForumToolSession.java
    • -14
    • +14
    ./tool/forum/model/ForumUser.java
    • -13
    • +13
    ./tool/forum/model/MessageRating.java
    • -10
    • +10
    ./tool/forum/model/MessageSeq.java
    • -10
    • +10
    ./tool/forum/model/Timestamp.java
    • -2
    • +2
    ./tool/forum/service/ForumService.java
    • -1
    • +1
    ./tool/forum/util/ConditionTopicComparator.java
  1. … 941 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

    • -1
    • +1
    ./tool/forum/service/ForumService.java
  1. … 145 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

    • -54
    • +2
    ./tool/forum/service/ForumService.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

    • -54
    • +2
    ./tool/forum/service/ForumService.java
  1. … 34 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -21
    • +3
    ./tool/forum/dao/hibernate/ForumUserDao.java
    • -0
    • +15
    ./tool/forum/dbupdates/patch20231221.sql
    • -3
    • +0
    ./tool/forum/forumApplicationContext.xml
    • -55
    • +2
    ./tool/forum/service/ForumService.java
    • -30
    • +1
    ./tool/forum/service/IForumService.java
    • -66
    • +0
    ./tool/forum/web/forms/ReflectionForm.java
  1. … 506 more files in changeset.
LDEV-5433 Squash DB patches and update versions

    • -0
    • +13
    ./tool/forum/dbupdates/patch20230325.sql
  1. … 107 more files in changeset.
LDEV-5431 Reset activity completion on force uncomplete in Monitor

    • -66
    • +78
    ./tool/forum/service/ForumService.java
  1. … 38 more files in changeset.
# WARNING: head commit changed in the meantime

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

    • -3
    • +20
    ./tool/forum/service/ForumService.java
  1. … 8 more files in changeset.
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

    • -20
    • +3
    ./tool/forum/service/ForumService.java
  1. … 54 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

    • -3
    • +20
    ./tool/forum/service/ForumService.java
  1. … 54 more files in changeset.
Merge 4.6 into 4.7

    • -3
    • +0
    ./tool/forum/service/ForumService.java
  1. … 7 more files in changeset.
LDEV-5328 Remove obsolete code as pointed out by build script

    • -3
    • +0
    ./tool/forum/service/ForumService.java
  1. … 1 more file in changeset.
LDEV-5328 Squash DB patches and update versions

    • -0
    • +14
    ./tool/forum/dbupdates/patch20220920.sql
  1. … 154 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

    • -2
    • +2
    ./tool/forum/service/ForumService.java
  1. … 180 more files in changeset.
LDEV-4917 Allow replies from learners without attachments

LDEV-5285 Add missing upload folder name in Forum

  1. … 1 more file in changeset.
LDEV-5250 Remove Pedagogical Planner integration with core LAMS

  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.