lamsfoundation

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. … 33 more files in changeset.
LDEV-5440 Replace deprecated Long constructor

    • -4
    • +4
    ./lams/tool/survey/service/SurveyServiceImpl.java
  1. … 114 more files in changeset.
LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

  1. … 222 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-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

  1. … 52 more files in changeset.
LDEV-5448 properly remove HTML tags produced by CKEditor

LDEV-5440 Further code upgrade to conform new WF libraries

  1. … 60 more files in changeset.
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

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

    • -1
    • +1
    ./lams/tool/survey/model/SurveyOption.java
    • -1
    • +1
    ./lams/tool/survey/model/SurveyUser.java
    • -1
    • +1
    ./lams/tool/survey/service/SurveyServiceImpl.java
    • -1
    • +1
    ./lams/tool/survey/web/form/SurveyForm.java
  1. … 452 more files in changeset.
LDEV-5440 Refactor packages of imported classes

    • -1
    • +1
    ./lams/tool/survey/model/SurveyOption.java
    • -1
    • +1
    ./lams/tool/survey/model/SurveyUser.java
    • -1
    • +1
    ./lams/tool/survey/service/SurveyServiceImpl.java
    • -1
    • +1
    ./lams/tool/survey/web/form/SurveyForm.java
  1. … 471 more files in changeset.
LDEV-5440 Rewrite config files and library references

    • -15
    • +15
    ./lams/tool/survey/model/Survey.java
    • -10
    • +10
    ./lams/tool/survey/model/SurveyAnswer.java
    • -8
    • +8
    ./lams/tool/survey/model/SurveyOption.java
    • -15
    • +15
    ./lams/tool/survey/model/SurveyQuestion.java
    • -12
    • +12
    ./lams/tool/survey/model/SurveyUser.java
    • -1
    • +1
    ./lams/tool/survey/service/SurveyServiceImpl.java
  1. … 941 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

    • -2
    • +7
    ./lams/tool/survey/model/SurveyUser.java
    • -1
    • +1
    ./lams/tool/survey/service/SurveyServiceImpl.java
  1. … 148 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

    • -105
    • +15
    ./lams/tool/survey/service/SurveyServiceImpl.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

    • -105
    • +15
    ./lams/tool/survey/service/SurveyServiceImpl.java
  1. … 34 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -10
    • +0
    ./lams/tool/survey/SurveyConstants.java
    • -4
    • +0
    ./lams/tool/survey/dao/SurveyUserDAO.java
    • -0
    • +15
    ./lams/tool/survey/dbupdates/patch20231221.sql
    • -102
    • +0
    ./lams/tool/survey/dto/ReflectDTO.java
    • -22
    • +0
    ./lams/tool/survey/model/Survey.java
    • -47
    • +0
    ./lams/tool/survey/service/ISurveyService.java
    • -91
    • +0
    ./lams/tool/survey/service/SurveyServiceImpl.java
    • -2
    • +1
    ./lams/tool/survey/surveyApplicationContext.xml
    • -40
    • +0
    ./lams/tool/survey/util/ReflectDTOComparator.java
    • -1
    • +0
    ./lams/tool/survey/web/form/SurveyForm.java
  1. … 506 more files in changeset.
LDEV-5433 Squash DB patches and update versions

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

    • -38
    • +48
    ./lams/tool/survey/service/SurveyServiceImpl.java
  1. … 38 more files in changeset.
LDEV-5397 Switch to server side redirects

    • -2
    • +0
    ./lams/tool/survey/SurveyConstants.java
  1. … 20 more files in changeset.
LDEV-5328 Squash DB patches and update versions

    • -0
    • +14
    ./lams/tool/survey/dbupdates/patch20220920.sql
  1. … 154 more files in changeset.
LDEV-5257 Secure fileDownloadToken cookie

  1. … 9 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. … 28 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. … 30 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.

  1. … 95 more files in changeset.
LDEV-5137 Do not fetch question from DB if it is not there yet

LDEV-4858 Ensure correct Excel cell text length

  1. … 4 more files in changeset.
LDEV-5077 Allow all HTTP methods when fetching Survey chart

LDEV-5068 Fix survey question-per-page validation

LDEV-5057 Use UTF-8 as default encoding for message sources

    • -0
    • +1
    ./lams/tool/survey/surveyApplicationContext.xml
  1. … 33 more files in changeset.
LDEV-4962 Use complex portrait UUID in tools

  1. … 24 more files in changeset.
LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

  1. … 24 more files in changeset.