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

Adding CSRF to:

- Change user marks

- Disclose correct answers

- Disclose group answers

  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

  1. … 63 more files in changeset.
LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Add numbering in authoring and excel export.

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

  1. … 17 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

  1. … 75 more files in changeset.
LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

  1. … 23 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# 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/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.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/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# 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/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

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

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

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

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 51 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 92 more files in changeset.
LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

  1. … 9 more files in changeset.
LDEV-4825 Display QB stats in Assessment tool monitoring

  1. … 2 more files in changeset.
LDEV-4746 Migrate Assessment to QB

  1. … 76 more files in changeset.
LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

  1. … 5 more files in changeset.
LDEV-4805 Finally switch to using free-jqGrid

  1. … 23 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 42 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 384 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 501 more files in changeset.
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

  1. … 95 more files in changeset.
LDEV-4679 No need to have a search field for confidence

LDEV-4440 Clean up shared files

  1. … 205 more files in changeset.
LDEV-4440 Fix Edit link in monitoring

  1. … 1 more file in changeset.
LDEV-4663: questions report layout

Small changes in monitor question report layout

  1. … 2 more files in changeset.
LDEV-4440 Assessment noStruts

  1. … 70 more files in changeset.
LDEV-4607 Confirm delete marks on output change in monitoring

  1. … 3 more files in changeset.
LDEV-4607 Remove marks on output change to "none" in monitoring

  1. … 10 more files in changeset.
LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor

  1. … 1 more file in changeset.
LDEV-4540 Allow disclosing correct/groups answers in plain monitoring

  1. … 4 more files in changeset.
LDEV-4451 Add scss files and fix their names

  1. … 7 more files in changeset.
LDEV-4445 Question page in monitor has portraits

  1. … 4 more files in changeset.
LDEV-4451 Store ConfidenceLevels inside Assessment

ConfidenceLevels should be stored at the tools level as otherwise it's

hard to keep questions hashes updated in lams_central.

Add support for providing them to Scratchie.

  1. … 13 more files in changeset.