Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5245 Use name and login to identify students in Monitoring

LDEV-5236 Reintroduce title validation in Share Resources learner

  1. … 2 more files in changeset.
LDEV-5186 Merge two notifications into one email in Share Resources

Improve wording of the sent email.

  1. … 2 more files in changeset.
LDEV-5186 Merge two notification option into one in Share Resources

  1. … 4 more files in changeset.
LDEV-4917 Add Uppy upload to Share Resources tool

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

  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.
LDEV-4945 Fix mysql comments on patch files

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

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

  1. … 113 more files in changeset.
LDEV-4932 Add CSRF to Vote and share resources authoring

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

  1. … 42 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. … 109 more files in changeset.
LDEV-4932 Adding CSRF to Share resources

Adding CSRF prevention to hide/show toggle in monitor

  1. … 6 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.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

  1. … 14 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.
Merge remote-tracking branch 'origin/master' into develop

LDEV-3450 Fix incorrect Hibernate mapping for tool's criteria import

Merge remote-tracking branch 'origin/master' into develop

  1. … 2 more files in changeset.
LDEV-3450 Fix learner criteria import

LDEV-4755 Display upload errors nicer

  1. … 5 more files in changeset.
LDEV-4741 Fix form @ModelAttribute name

* Also prevent adding item to itemList in case of exception.

* Minor code improvements

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

  1. … 129 more files in changeset.
LDEV-4692 Fix time taken's timezone

And some minor code formatting.

  1. … 1 more file 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. … 51 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. … 166 more files in changeset.