Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 34 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 510 more files in changeset.
LDEV-5433 Squash DB patches and update versions

  1. … 107 more files in changeset.
LDEV-5431 Reset activity completion on force uncomplete in Monitor

  1. … 38 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

  1. … 95 more files in changeset.
LDEV-5328 Squash DB patches and update versions

  1. … 154 more files 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.
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-5219 Check gate after Scribe activity

  1. … 2 more files in changeset.
LDEV-4802 Ignore invalid websocket close codes

For unknown reason browsers sometimes close websockets with an invalid

close code, for example 15393. It prevents from running @OnClose methods

in LAMS websocket servers. Since we do not have control over this

situation, it is better to skip CloseReason parameter all together.

  1. … 6 more files in changeset.
LDEV-5057 Use UTF-8 as default encoding for message sources

  1. … 33 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 75 more files in changeset.
LDEV-4945 Fix mysql comments on patch files

  1. … 100 more files in changeset.
LDEV-4743 Squash tool patches updating to version 3.1

  1. … 116 more files in changeset.
LDEV-4932 Secure save tool authoring with CSRF Guard

  1. … 42 more files in changeset.
LDEV-4935 Secure Scribe websockets

User gets checked if he participates in the given activity.

LDEV-4932 Adding CSRF protecting to change scratchie user in monitor

  1. … 2 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

  1. … 108 more files in changeset.
LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

  1. … 42 more files in changeset.
LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

  1. … 60 more files in changeset.
LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

  1. … 7 more files in changeset.
LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

  1. … 134 more files in changeset.
LDEV-4678 Remove no longer needed @Autowired applicationContext

  1. … 20 more files in changeset.
LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

  1. … 140 more files in changeset.
LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

  1. … 167 more files in changeset.
LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

  1. … 167 more files in changeset.
LDEV-4696 Scribe uses annotations, proxy service removed

  1. … 5 more files in changeset.
LDEV-4440 code formatting

  1. … 6 more files in changeset.