lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4967 missing quotes

LDEV-4967 including appropriate contentType header

LDEV-4967 including appropriate contentType header

Merge branch 'master' into v4.0

    • -1
    • +0
    ./conf/security/Owasp.CsrfGuard.properties
LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

    • -1
    • +0
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 3 more files in changeset.
LDEV-4964 Let learners access LTI deep linking lesson prior to teacher

LDEV-4964 Let learners access LTI deep linking lesson prior to teacher

(cherry picked from commit dfe7f83f0d8544622cfd3e30484158ec43610cce)

LDEV-4946 Display control buttons again

LDEV-4962 Fix portraits with complex UUIDs

  1. … 4 more files in changeset.
LDEV-4962 Fix portraits with complex UUIDs

  1. … 1 more file in changeset.
LDEV-4962 Introduce complex portrait UUIDs

  1. … 32 more files in changeset.
LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

  1. … 35 more files in changeset.
LDEV-4958 Set content folder ID in form when creating a QB question

LDEV-4802 Use redirect instead of forward to QB interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

LDEV-4958 Set content folder ID when importing QTI questions to QB

LDEV-4956 Update "user_id" parameter if extServer.getUseAlternativeUseridParameterName() setting is ON

Merge branch 'master' into v4.0

    • -0
    • +5
    ./conf/security/Owasp.CsrfGuard.properties
LDEV-4932 Add CSRF to LKC monitoring

    • -0
    • +5
    ./conf/security/Owasp.CsrfGuard.properties
Merge branch 'master' into v4.0

# Conflicts:

# lams_central/web/common/taglibs.jsp

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

  1. … 168 more files in changeset.
LDEV-4946 Make LTI add lesson screen work with new LD tree

LDEV-4932 Add CSRF to Assessment monitoring

    • -0
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 3 more files in changeset.
LDEV-4898 Fix race condition when generating a LD SVG

LDEV-4943 Don't log error message on learner accessing LTI lesson

(cherry picked from commit 9f6b6a7487f9b5cbf283bf95361e3778e93fde95)

  1. … 2 more files in changeset.
LDEV-4943 Don't log error message on learner accessing LTI lesson

  1. … 2 more files in changeset.
LDEV-4941 Prevent "stealing" a QB question

Prevent changing an existing question's collection if it is not in one

of user's own collections

    • -1
    • +2
    ./web/qb/authoring/addQuestionFooter.jsp
  1. … 5 more files in changeset.
LDEV-4884 Skip QB questions with existing UUID on XML import

Merge branch 'master' into v4.0

# Conflicts:

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java

    • -1
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 14 more files in changeset.
LDEV-4932 Add CSRF to QB bank calls

    • -0
    • +18
    ./conf/security/Owasp.CsrfGuard.properties
    • -12
    • +9
    ./web/authoring/template/tbl/tbl.jsp
    • -0
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
  1. … 18 more files in changeset.
SP-4 Staff gets only monitor and author roles, not learner