Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

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

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -27
    • +44
    ./includes/javascript/authoring/authoringActivity.js
  1. … 27 more files in changeset.
LDEV-5120 Allow hiding criteria titles in Rating.tag

  1. … 31 more files in changeset.
LDEV-5127 Adjust reported pad height when toolbar is not displayed

  1. … 32 more files in changeset.
LDEV-5127 Fix pad resizing

  1. … 32 more files in changeset.
LDEV-5114 Allow new version enforce also for essay questions

LDEV-5121 Remove validation rule which breaks TBL wizar

LDEV-5036 Do not use resource link ID only for BlackBoard

Other LTI systems use it to determine ID of created resource right away.

  1. … 1 more file in changeset.
LDEV-5114 Allow new version enforce also for true/false questions

LDEV-5121 Add TBL template imported questions to chosen QB collection

    • -0
    • +1
    ./authoring/template/tool/assessmentQTI.jsp
    • -0
    • +1
    ./authoring/template/tool/mcquestionQTI.jsp
  1. … 5 more files in changeset.
LDEV-5121 Set user private collection as default one when importing QTI

LDEV-5121 Set default question collection on "My Questions"

LDEV-5114 Enforce question new version on demand

    • -3
    • +14
    ./qb/authoring/addQuestionFooter.jsp
  1. … 2 more files in changeset.
LDEV-5113 Introduce manual grading tool output

  1. … 4 more files in changeset.
LDEV-5101 Prepare a placeholder for QB question versions

  1. … 4 more files in changeset.
LDEV-5110 Add Learning Outcomes processing in TBL template

    • -0
    • +4
    ./authoring/template/tool/assessmentQTI.jsp
    • -0
    • +5
    ./authoring/template/tool/mcquestionQTI.jsp
  1. … 8 more files in changeset.
LDEV-5109 Fix collection choice in QTI/Word question import

LDEV-5106 Allow filtering of question types in Word import.

For iRAT/tRAT allow only single-answer multiple choice questions. For

Application Exercises allow single- and multiple-answer multiple choice

questions and essay questions.

  1. … 3 more files in changeset.
LDEV-5101 Allow applying new question version to other activities in LD

  1. … 12 more files in changeset.
LDEV-5106 Adding MS Word question import to TBL Template

LDEV-5106 Adding MS Word question import to TBL Template

  1. … 2 more files in changeset.
LDEV-4949 adding MS Word document template

  1. … 1 more file in changeset.
LDEV-4949 fix title

LDEV-5103 Change Question Bank icon on index page for consistency

LDEV-5103 Add Question Bank button to authoring

LDEV-4949 Add Learning Outcomes parsing

  1. … 7 more files in changeset.
LDEV-4949 Adjust layout of import pop up. Allow importing .docx files.

LDEV-5200 Add CSS style to SVG file so LD thumbnail displays correctly

    • -0
    • +80
    ./css/authoring-svg.css
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

    • -0
    • +80
    ./css/authoring-svg.css
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

    • -0
    • +80
    ./css/authoring-svg.css
LDEV-5091 Etherpad.tag to accept predefined pad ID

  1. … 31 more files in changeset.