lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4978 Remove reference to an non-existing entity property

The reference was introduced by an incorrect recent merge with master,

regarding LDEV-4932.

LDEV-4975 Upgrade jquery to version 3.4.1

    • -5
    • +5
    ./web/includes/javascript/addLesson.js
    • -2
    • +2
    ./web/includes/javascript/progressBar.js
  1. … 6 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

    • -6
    • +0
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 188 more files in changeset.
LDEV-4932 Add CSRF to password change

    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
LDEV-4969 Fix form validation

LDEV-4966, LDEV-4137 Reposition notifications dialog after showing

    • -18
    • +36
    ./web/includes/javascript/dialog.js
LDEV-4966, LDEV-4137 Reposition notifications dialog after showing

    • -26
    • +31
    ./web/includes/javascript/dialog.js
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.