Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5157 Add code syntax highlighting to learner UI

  1. … 9 more files in changeset.
LDEV-5187 Combine Mark Hedging and Assessment justifications

Mark Hedging questions have own settings for justification. We should

have a consistent user experience in Assessment, not matter where

justification is set up: on Assessment activity level or on Mark Hedging

question level.

  1. … 8 more files in changeset.
LDEV-5181 Do not use Confidence Levels for Mark Hedging questions

Mark Hedging is already a kind of declaring confidence level by

students.

  1. … 8 more files in changeset.
LDEV-3387 Filter textarea data before (auto)save answers

Until now lams:textarea JS function was run only on textarea "change"

event. This event is run when the input looses focus. If an user keeps

writing in the same textare and autosave or time expired autosubmit

kicks in, data in the hidden input is not refreshed. Old data is sent

and stored in DB.

Now the data is refreshed before autosave and submit.

  1. … 1 more file in changeset.
LDEV-5123 Log learner interaction with questions in Assessment

  1. … 7 more files in changeset.
LDEV-5091 Initialise Etherpads on Discussion panel expand

  1. … 36 more files in changeset.
LDEV-3716 Fix label reference so correct option gets checked

LDEV-3716 Allow checking Assessment mcq options when clicking on label

LDEV-4921 Hide question titles in Assessment

  1. … 1 more file in changeset.
LDEV-5052 rendering question title

  1. … 1 more file in changeset.
LDEV-5033 Add answer justification to Assessment

  1. … 13 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

  1. … 6 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.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

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

lams_tool_assessment/web/pages/learning/learning.jsp

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

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

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

Fix several issues Q&A migration

  1. … 19 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. … 91 more files in changeset.
LDEV-4746 Migrate Assessment to QB

  1. … 77 more files in changeset.
LDEV-4762 Fix saving ordering type of questions that happens on autosave

  1. … 2 more files in changeset.
LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

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

# Conflicts:

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

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

  1. … 384 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

  1. … 7 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

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

  1. … 506 more files in changeset.
LDEV-4440 Resetting essay assessment vaildation and escaping

  1. … 1 more file in changeset.
LDEV-4440 Reintroduce custom textarea tags

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

  1. … 72 more files in changeset.
LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

  1. … 11 more files in changeset.