Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 33 more files in changeset.
LDEV-5025 Put proper text information when answers not yet disclosed

  1. … 1 more file in changeset.
LDEV-5025 Show own group ratings only when rated other groups

  1. … 2 more files in changeset.
LDEV-5025 Highlight own group when displaying Assessment answer rating

  1. … 1 more file in changeset.
LDEV-5025 Allow rating only for Leaders

LDEV-5025 Show rating for the given team's own answer

  1. … 1 more file in changeset.
LDEV-5025 Do not centre an other group's answer in the results table

LDEV-5025 Allow Assessment other groups' answer rating and commenting

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

  1. … 75 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 Reintroduce custom textarea tags

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

  1. … 73 more files in changeset.
LDEV-4586 Letter prefixes shown on results page

LDEV-4540 Fix variable name clash when iterating over options

LDEV-4540 Change layout of other groups' answers for MC questions

  1. … 2 more files in changeset.
LDEV-4540 Show correct answers and user's answers separately

LDEV-4540 Move groups' answers under each question

  1. … 2 more files in changeset.
LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

LDEV-4540 Refresh learners' results page when monitor discloses answers

  1. … 5 more files in changeset.
LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

  1. … 11 more files in changeset.
LDEV-4540 Show other teams' answers on results page

  1. … 1 more file in changeset.
LDEV-4540 Show answers of current team

  1. … 2 more files in changeset.