Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4822 Create a better warning page shown on unsuccessful LTI call

    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 3 more files in changeset.
Merge branch 'master' into develop

    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

    • -29
    • +40
    ./lams/ApplicationResources_en_AU.properties
  1. … 10 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

    • -0
    • +67
    ./lams/ApplicationResources_en_AU.properties
  1. … 76 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -913
    • +914
    ./lams/ApplicationResources.properties
  1. … 50 more files in changeset.
LDEV-4829 Supports multiple response app ex, improved font on TRA chart

    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 10 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

    • -29
    • +57
    ./lams/ApplicationResources.properties
    • -29
    • +40
    ./lams/ApplicationResources_en_AU.properties
  1. … 53 more files in changeset.
Merge branch 'master' into develop

    • -12
    • +16
    ./lams/ApplicationResources.properties
    • -12
    • +17
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 6 more files in changeset.
LDEV-4829 Error msg and text improvements, supports mark entry

    • -12
    • +14
    ./lams/ApplicationResources.properties
    • -12
    • +15
    ./lams/ApplicationResources_en_AU.properties
  1. … 11 more files in changeset.
LDEV-4833 Move import/export questions in XML format feature to QB

    • -2
    • +6
    ./lams/ApplicationResources_en_AU.properties
  1. … 7 more files in changeset.
Merge branch 'master' into develop

    • -1
    • +99
    ./lams/ApplicationResources_el_GR.properties
LDEV-4769 Updating translations

Updating Greek

    • -3
    • +96
    ./lams/ApplicationResources_el_GR.properties
LDEV-4832 Add ability to create/edit questions from the central QB pages

    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 28 more files in changeset.
LDEV-4826 Add export QTI feature to QB questions page

    • -9
    • +0
    ./lams/ApplicationResources_en_AU.properties
  1. … 6 more files in changeset.
Merge branch 'master' into develop

    • -14
    • +16
    ./lams/ApplicationResources.properties
    • -14
    • +18
    ./lams/ApplicationResources_en_AU.properties
LDEV-4829 Wording tweaks and tool tips added to templates

    • -14
    • +16
    ./lams/ApplicationResources.properties
    • -14
    • +18
    ./lams/ApplicationResources_en_AU.properties
  1. … 5 more files in changeset.
Merge branch 'master' into develop

    • -8
    • +12
    ./lams/ApplicationResources.properties
    • -8
    • +10
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4829 Application Exercise functionality completed, can edit titles

    • -6
    • +10
    ./lams/ApplicationResources.properties
    • -2
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 14 more files in changeset.
LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -8
    • +10
    ./lams/ApplicationResources_en_AU.properties
  1. … 12 more files in changeset.
LDEV-4829 Activities removable in build, RAT and AE have QTI Import

    • -1
    • +1
    ./lams/ApplicationResources.properties
  1. … 16 more files in changeset.
LDEV-4828 Add QB collections link on index page

    • -884
    • +885
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4826 Remove import/export QTI questions feature from tools

    • -0
    • +2
    ./lams/ApplicationResources_en_AU.properties
  1. … 12 more files in changeset.
LDEV-4777 Show question details for all question types

    • -1
    • +13
    ./lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 86 more files in changeset.
LDEV-4786 Removing mapping does not remove outcome

Also limit outcome editing to sysadmin only.

    • -1
    • +3
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4788 All learning outcomes are now global

    • -6
    • +0
    ./lams/ApplicationResources.properties
    • -6
    • +6
    ./lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -6
    • +6
    ./lams/ApplicationResources_es_ES.properties
  1. … 18 more files in changeset.
LDEV-4787 Fix incorrect spacing when copying activities in authoring

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

    • -0
    • +9
    ./lams/ApplicationResources_en_AU.properties
  1. … 14 more files in changeset.