lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'master' into v4.0

# Conflicts:

# lams_central/conf/security/Owasp.CsrfGuard.properties

# 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

LDEV-4974 Always display user's login and name

LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 178 more files in changeset.
LKC-225 Make container auto sync time and interval configurable

LDEV-4972 Do not rely on activityId of the removed activities

LDEV-4971 Handle non-numeric version names

LDEV-4970 Skip renaming questionReference's defaultGrade to maxMark

LDEV-4932 Add CSRF to password change

    • -39
    • +44
    /lams_central/web/passwordChangeContent.jsp
LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

    • -39
    • +44
    /lams_central/web/passwordChangeContent.jsp
Merge branch 'v4.0' into v4.1

LDEV-4969 Fix form validation

    • -1
    • +0
    /lams_central/web/passwordChangeContent.jsp
Merge branch 'LDEV-4968' into v4.0

Merge remote-tracking branch 'origin/master' into v4.0

LDEV-4968 Add CSRF Guard token to remove question request in Q&A tool

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

    • -18
    • +36
    /lams_central/web/includes/javascript/dialog.js
Merge remote-tracking branch 'origin/master' into v4.0

Merge branch 'LDEV-4966'

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

    • -26
    • +31
    /lams_central/web/includes/javascript/dialog.js
LDEV-4967 missing quotes

LDEV-4967 including appropriate contentType header

LDEV-4967 including appropriate contentType header

LKC-225 Make integrated server name configurable

Merge remote-tracking branch 'origin/v4.0' into v4.1

Merge branch 'LDEV-4962' into v4.0

Merge branch 'master' into v4.0

LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

LDEV-4965 Avoid reseting lessonFinishUrl on saving ltiConsumer

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

    • -7
    • +10
    /lams_central/web/lti/addLesson.jsp