Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 adding CSRF to assessment TBL page

LDEV-4951 Migrate MCQ tool to Assessment

  1. … 10 more files in changeset.
LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

  1. … 167 more files in changeset.
LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

    • -2
    • +4
    ./pages/authoring/parts/questionlist.jsp
  1. … 4 more files in changeset.
LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -2
    • +4
    ./pages/authoring/parts/questionlist.jsp
  1. … 4 more files in changeset.
LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

  1. … 4 more files in changeset.
LDEV-4932 Add CSRF to Assessment monitoring

    • -1
    • +2
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 2 more files in changeset.
LDEV-4944 Take care about VSAs edited by several teachers simultaneously

    • -15
    • +18
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 4 more files in changeset.
LDEV-4875 Add "cursor:pointer" to drag-and-drop answers

    • -0
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
LDEV-4932 Add CSRF to QB bank calls

  1. … 32 more files in changeset.
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

    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./pages/monitoring/parts/usersummary.jsp
  1. … 87 more files in changeset.
LDEV-4932 Add CSRF Excel export in tools

  1. … 9 more files in changeset.
LDEV-4932 Add CSRF to LD export and Excel export

  1. … 11 more files in changeset.
LDEV-4932 Add CSRF to OutcomeAuthor tag

  1. … 30 more files in changeset.
LDEV-4932 removing multipart encoding

There are plenty of form we set the multipart encoding for uploading files, but no files are uploaded. This has implications for CSRF tokens. So we remove the enctype="multipart/form-data" for all the authoring forms that aren't needed.

  1. … 14 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

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

  1. … 42 more files in changeset.
LDEV-4932 Adding CSRF to Assessment monitoring

Adding CSRF to:

- Change user marks

- Disclose correct answers

- Disclose group answers

    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./pages/monitoring/parts/usersummary.jsp
  1. … 2 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

  1. … 2 more files in changeset.
LDEV-4932 Secure setting submission deadline with CSRF Guard

    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
  1. … 60 more files in changeset.
LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Add numbering in authoring and excel export.

    • -0
    • +38
    ./pages/admin/config.jsp
    • -0
    • +6
    ./pages/authoring/parts/questionlist.jsp
  1. … 10 more files in changeset.
LDEV-4887 QTI import done within TBL template

    • -1
    • +1
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -5
    • +5
    ./pages/authoring/parts/questionlist.jsp
  1. … 1 more file in changeset.
LDEV-4920 Import QTI questions to Assessment after adding them to QB

  1. … 1 more file in changeset.
LDEV-4860 Grey out labels for disabled checkboxes

LDEV-4880 Add confidence level variations

    • -1
    • +23
    ./pages/learning/parts/confidencelevel.jsp
    • -0
    • +12
    ./pages/monitoring/parts/questionsummary.jsp
    • -0
    • +12
    ./pages/monitoring/parts/usersummary.jsp
  1. … 12 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 21 more files in changeset.
LDEV-4900 Trigger autosave when force completing Assessment activity

  1. … 4 more files in changeset.
LDEV-4900 Make Assessment autosave a recognisable function

LDEV-4889 Display correct/incorrect icons in TBL monitor's Teams tab

    • -10
    • +127
    ./pages/tblmonitoring/teams.jsp
    • -92
    • +0
    ./pages/tblmonitoring/userresponse.jsp
  1. … 1 more file in changeset.
LDEV-4875 Fixes for TBL monitoring pages

  1. … 2 more files in changeset.