Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Add CSRF to Scratchie monitoring

Adding CSRF for:

- Changing group marks

  1. … 2 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

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

  1. … 63 more files in changeset.
LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

    • -11
    • +18
    ./tblmonitoring/traStudentChoices.jsp
  1. … 7 more files in changeset.
LDEV-4921 Fix ordering for burning question in Scratchie learner

  1. … 1 more file in changeset.
LDEV-4921 Properly detect General Burning Question in TBL monitor

LDEV-4921 Hide question titles in TBL monitoring burning questions

  1. … 1 more file in changeset.
LDEV-4921 Hide question titles in Scratchie monitoring burning questions

  1. … 1 more file in changeset.
LDEV-4921 Hide question titles in Scratchie burning questions

LDEV-4921 Add question numbering in Scratchie

    • -123
    • +123
    ./monitoring/parts/statisticpart.jsp
  1. … 1 more file in changeset.
LDEV-4921 Allow hiding question titles in Learner for Scratchie

  1. … 6 more files in changeset.
LDEV-4920 Import QTI questions to Scratchie after adding them to QB

  1. … 3 more files in changeset.
LDEV-4880 Add confidence level variations

    • -3
    • +47
    ./learning/parts/confidenceLevelPortrait.jsp
  1. … 19 more files in changeset.
LDEV-4911 Create structure for monitoring learning

  1. … 4 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-4875 Fix scratching of MCQ questions

  1. … 1 more file in changeset.
LDEV-4897 Update Scratchie to use new Excel exporting methods

  1. … 1 more file in changeset.
LDEV-4900 Make other tools react to autosave command

  1. … 2 more files in changeset.
LDEV-4745 Set general burning question's uid to 0

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

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/AuthoringController.java

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 26 more files in changeset.
LDEV-4898 Fix notifyCloseURL passing in Scratchie

  1. … 1 more file in changeset.
LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

  1. … 15 more files in changeset.
LDEV-4875 Fix JS validation after field name change

LDEV-4875 Respect QbQuestion's case sensitive setting

* Simplify learning.jsp, so it gets most of the data from the server

rather than tries to figure it out on a client side

* Optimize the way answers get fetched from Assessment

* Fix the following issue: if there is no activity selected to fetch

assessment answers from, then Scratchie don't show user answers

  1. … 6 more files in changeset.
LDEV-4875 Take care about answers containing XML escaped characters

LDEV-4875 Fixes for VSA feature

  1. … 14 more files in changeset.
LDEV-4875 Item summary page to display options correctly

    • -20
    • +21
    ./monitoring/parts/itemSummary.jsp
LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -0
    • +29
    ./authoring/parts/addItemFooter.jsp
    • -0
    • +267
    ./authoring/parts/addMcq.jsp
    • -0
    • +237
    ./authoring/parts/addVsa.jsp
    • -0
    • +25
    ./learning/parts/confidenceLevelPortrait.jsp
  1. … 63 more files in changeset.
LDEV-4868 Fix Scratchie so it can show more than one question

* Also fix confidence levels feature in Scratchie

  1. … 1 more file in changeset.
LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

    • -14
    • +19
    ./authoring/parts/optionlist.jsp
  1. … 9 more files in changeset.