Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5008 backporting to master

  1. … 3 more files in changeset.
LDEV-5008 Rename doKumaran tool

  1. … 2 more files in changeset.
Merge branch 'LDEV-4997' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

  1. … 3 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

  1. … 463 more files in changeset.
LDEV-4999 Allow marks update in Dokuy monitoring summary page

  1. … 4 more files in changeset.
LDEV-4999 Display users in tablesorter in Doku monitoring summary

  1. … 2 more files in changeset.
LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

  1. … 12 more files in changeset.
LDEV-4997 Fix learner search when registering on Doku websocket server

LDEV-4997 Fix learner search when registering on Doku websocket server

LDEV-4997 Introduce Etherpad as a JSP tag

  1. … 10 more files in changeset.
LDEV-4997 Initial migration of Doku tool to Etherpad as central service

    • -865
    • +0
    ./net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    ./net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    ./net/gjerull/etherpad/client/EPLiteException.java
    • -5
    • +0
    ./net/gjerull/etherpad/client/Request.java
  1. … 18 more files in changeset.
LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

    • -865
    • +0
    ./net/gjerull/etherpad/client/EPLiteClient.java
    • -301
    • +0
    ./net/gjerull/etherpad/client/EPLiteConnection.java
    • -11
    • +0
    ./net/gjerull/etherpad/client/EPLiteException.java
    • -5
    • +0
    ./net/gjerull/etherpad/client/Request.java
  1. … 17 more files in changeset.
LDEV-4994 Add description field to Dokumaran

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

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

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

User gets checked if he participates in the given activity.

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. … 109 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. … 59 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 Squash/Update SQL scripts ready for LAMS 3.1 release

  1. … 129 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-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

  1. … 50 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. … 168 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. … 168 more files in changeset.
LDEV-4696 Migrate Dokumaran tool to Hibernate annotations

  1. … 4 more files in changeset.
LDEV-4696 Removing legacy parameters and deprecated methods

  1. … 39 more files in changeset.
LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

  1. … 179 more files in changeset.
LDEV-4440 Change "application/x-json" to "application/json"

  1. … 1 more file in changeset.