masterDetailLoadUp.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

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

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

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

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

  1. … 34 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

  1. … 27 more files in changeset.
LDEV-5360 Show max mark in tooltip in Assessment monitoring

  1. … 2 more files in changeset.
LDEV-5360 Show max mark in tooltip in Assessment monitoring

  1. … 2 more files in changeset.
LDEV-5360 Indicate auto-graded answers

  1. … 5 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Assessment

  1. … 18 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 8 more files in changeset.
LDEV-5360 Add marker information to other monitoring views

  1. … 4 more files in changeset.
LDEV-5360 Add marker's comment to question result

  1. … 9 more files in changeset.
LDEV-5360 Use column instead of tooltip to indicate marker

  1. … 1 more file in changeset.
LDEV-5360 Use dash instead of 0 for umarked essay questions

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 12 more files in changeset.
LDEV-5351 Use Boostrap tooltips instead of plain HTML titles

  1. … 2 more files in changeset.
LDEV-5351 Add marking teacher front end

  1. … 6 more files in changeset.
LDEV-5336 Add table with all learners' results

  1. … 8 more files in changeset.
LDEV-5157 Colour code syntax of students' answers in monitoring

  1. … 10 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.
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. … 80 more files in changeset.
LDEV-4805 Finally switch to using free-jqGrid

  1. … 27 more files in changeset.
LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

  1. … 29 more files in changeset.
LDEV-4358 Prevent JS errors on opening summary page when not all questions from the question bank are used in the question list

  1. … 1 more file in changeset.
LDEV-3804 Update Assessment Author and Monitor to Bootstrap

  1. … 62 more files in changeset.
LDEV-3580 Modify Assessment monitor UI to support paging, sort and search

  1. … 20 more files in changeset.
LDEV-3580 Modify Assessment monitor UI to support paging, sort and search

  1. … 5 more files in changeset.
LDEV-3481: If grade set by a teacher in Monitoring is higher than max grade, use max grade instead.

  1. … 5 more files in changeset.
LDEV-3481: If grade set by a teacher in Monitoring is higher than max grade, use max grade instead.

  1. … 5 more files in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 1 more file in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 34 more files in changeset.