Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4920 Import QTI questions to Assessment after adding them to QB

  1. … 1 more file in changeset.
LDEV-4860 Grey out labels for disabled checkboxes

LDEV-4880 Add confidence level variations

    • -1
    • +23
    ./pages/learning/parts/confidencelevel.jsp
    • -0
    • +12
    ./pages/monitoring/parts/questionsummary.jsp
    • -0
    • +12
    ./pages/monitoring/parts/usersummary.jsp
  1. … 12 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-4900 Trigger autosave when force completing Assessment activity

  1. … 4 more files in changeset.
LDEV-4900 Make Assessment autosave a recognisable function

LDEV-4889 Display correct/incorrect icons in TBL monitor's Teams tab

    • -10
    • +127
    ./pages/tblmonitoring/teams.jsp
    • -92
    • +0
    ./pages/tblmonitoring/userresponse.jsp
  1. … 1 more file in changeset.
LDEV-4875 Fixes for TBL monitoring pages

  1. … 2 more files in changeset.
LDEV-4875 Fixes for VSA feature

    • -18
    • +27
    ./pages/tblmonitoring/assessment.jsp
  1. … 19 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -1
    • +1
    ./pages/learning/parts/allquestions.jsp
    • -17
    • +0
    ./pages/learning/parts/shortanswer.jsp
    • -0
    • +19
    ./pages/learning/parts/vsa.jsp
    • -1
    • +1
    ./pages/learning/results/allquestions.jsp
    • -33
    • +0
    ./pages/learning/results/shortanswer.jsp
    • -0
    • +33
    ./pages/learning/results/vsa.jsp
    • -9
    • +138
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 68 more files in changeset.
LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

    • -1
    • +1
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/shortanswer.jsp
    • -1
    • +1
    ./pages/learning/results/markhedging.jsp
    • -1
    • +1
    ./pages/learning/results/numerical.jsp
    • -1
    • +1
    ./pages/learning/results/shortanswer.jsp
    • -3
    • +3
    ./pages/learning/results/truefalse.jsp
    • -5
    • +5
    ./pages/monitoring/parts/userresponse.jsp
    • -5
    • +5
    ./pages/tblmonitoring/userresponse.jsp
  1. … 11 more files in changeset.
LDEV-4836 Fix restricted authoring page

LDEV-4836 Add questions drag and drop feature

    • -18
    • +50
    ./pages/authoring/parts/questionlist.jsp
  1. … 3 more files in changeset.
LDEV-4836 Update edit in monitor feature after migration to QB

  1. … 2 more files in changeset.
LDEV-4745 Cache references max marks before importing QB question

  1. … 1 more file in changeset.
LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

    • -52
    • +94
    ./pages/authoring/randomQuestion.jsp
  1. … 12 more files in changeset.
LDEV-4834 Use panel-less LO widget in QB question authoring

    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 69 more files in changeset.
LDEV-4836 Limit allowed operations so recalculateMarks can work properly

LDEV-4839 Refine import QB questions feature

  1. … 9 more files in changeset.
LDEV-4838 Refine import from QB feature

  1. … 6 more files in changeset.
LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

    • -4
    • +6
    ./pages/authoring/parts/questionlist.jsp
    • -54
    • +117
    ./pages/authoring/randomQuestion.jsp
  1. … 12 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

    • -18
    • +0
    ./common/authoringQuestionHeader.jsp
    • -28
    • +0
    ./includes/css/bootstrap-toggle.scss
    • -135
    • +0
    ./includes/javascript/authoring-options.js
    • -9
    • +0
    ./includes/javascript/bootstrap-toggle.js
    • -237
    • +0
    ./pages/authoring/parts/addessay.jsp
    • -222
    • +0
    ./pages/authoring/parts/addmarkhedging.jsp
    • -202
    • +0
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -303
    • +0
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -269
    • +0
    ./pages/authoring/parts/addnumerical.jsp
    • -204
    • +0
    ./pages/authoring/parts/addordering.jsp
    • -214
    • +0
    ./pages/authoring/parts/addshortanswer.jsp
    • -196
    • +0
    ./pages/authoring/parts/addtruefalse.jsp
  1. … 62 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 49 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
    • +1
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./pages/learning/parts/multiplechoice.jsp
    • -29
    • +9
    ./pages/learning/parts/ordering.jsp
    • -1
    • +1
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -18
    • +9
    ./pages/monitoring/parts/questionsummary.jsp
    • -20
    • +8
    ./pages/monitoring/parts/usersummary.jsp
  1. … 43 more files in changeset.
LDEV-4833 Move import/export questions in XML format feature to QB

    • -101
    • +0
    ./pages/authoring/importQuestions.jsp
    • -12
    • +0
    ./pages/authoring/parts/questionlist.jsp
  1. … 5 more files in changeset.
LKC-202 AEs "Show student’s choices” page to show real question title

LDEV-4832 Add ability to create/edit questions from the central QB pages

    • -0
    • +1
    ./pages/authoring/parts/addmarkhedging.jsp
    • -0
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -0
    • +1
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -0
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -0
    • +1
    ./pages/authoring/parts/addordering.jsp
    • -0
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -0
    • +1
    ./pages/authoring/parts/addtruefalse.jsp
  1. … 21 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
    • +1
    ./pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./pages/learning/parts/multiplechoice.jsp
    • -18
    • +9
    ./pages/monitoring/parts/questionsummary.jsp
    • -20
    • +8
    ./pages/monitoring/parts/usersummary.jsp
  1. … 85 more files in changeset.
LDEV-4826 Remove import/export QTI questions feature from tools

    • -9
    • +0
    ./pages/authoring/parts/questionlist.jsp
  1. … 11 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.