lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

    • -0
    • +237
    ./conf/security/Owasp.CsrfGuard.properties
    • -20
    • +31
    ./web/includes/javascript/orgGroup.js
  1. … 80 more files in changeset.
LDEV-4932 Adjust CSRF Guard logging

Logger uses LAMS format and logs only warnings (attacks) rather than all

its checks.

    • -1
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 3 more files in changeset.
SP-4 Add teacher to subcourses

LDEV-4932 Add CSRF Excel export in tools

    • -1
    • +4
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 8 more files in changeset.
LDEV-4932 Add CSRF to LD export and Excel export

    • -0
    • +4
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 7 more files in changeset.
LDEV-4644 Reintroduce an incorrectly deleted CSS file

    • -0
    • +45
    ./web/css/outcome.scss
LDEV-4932 Start using /common/taglibs.jsp in lams_central

    • -10
    • +4
    ./web/authoring/template/createresult.jsp
    • -4
    • +1
    ./web/authoring/template/genericintro.jsp
    • -3
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -3
    • +1
    ./web/authoring/template/tool/mcoption.jsp
  1. … 54 more files in changeset.
SP-4 Provision staff members

LDEV-4932 Add CSRF to monitor and central

    • -0
    • +14
    ./conf/security/Owasp.CsrfGuard.properties
    • -20
    • +31
    ./web/includes/javascript/orgGroup.js
    • -5
    • +22
    ./web/includes/javascript/orgGrouping.js
  1. … 40 more files in changeset.
LDEV-4932 Adding CSRF to add lesson

    • -0
    • +1
    ./conf/security/Owasp.CsrfGuard.properties
  1. … 1 more file in changeset.