Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 2 more files in changeset.
LDEV-5101 Allow applying new question version to other activities in LD

    • -0
    • +3
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +12
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 9 more files in changeset.
LDEV-5094 Add logs to SSO handler

LDEV-5102 Prevent Scratchie from giving marks to absent learner

  1. … 5 more files in changeset.
LDEV-4949 Fix question title and feedback extraction

LDEV-4949 Properly removed "Feedback:" tag

LDEV-4949 Add Learning Outcomes parsing

  1. … 3 more files in changeset.
LDEV-4949 Use random temporary image name so it does not get overwritten

LDEV-4949 Add default value of "alt" attribute to <img> tags

    • -10
    • +19
    ./lamsfoundation/lams/questions/QuestionParser.java
LDEV-4949 Always add "img-responsive" class to <img> tags

LDEV-4949 Detect question elements correctly. Refactor code.

LDEV-4949 remove <p> tags from answers and reduce title to 80 characters

LDEV-4849 Add logging to Question Bank service

LDEV-4949 Fix correct answer and feedback extraction.

LDEV-4858 Ensure correct Excel cell text length

    • -22
    • +26
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
  1. … 4 more files in changeset.
LDEV-5094, LDEV-4030 Fix loop of user integrated relogin and lock out

LDEV-5097 Allow fetching rating data without specified user

LDEV-5094 Redirect authenticated user immediately

Detect situation when user is automatically reauthenticating via

integrations and redirect him straight to the desired URL, so the

default servlet does not kick in.

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java

  1. … 1 more file in changeset.
LDEV-5084 Allow custom membership URL in LTI calls

  1. … 2 more files in changeset.
LKC-236 Return questions replaced in tool for further processing

  1. … 3 more files in changeset.
LKC-215 Send review reminder email every given period

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_admin/conf/language/lams/ApplicationResources_no_NO.properties

  1. … 5 more files in changeset.
LDEV-5072 Allow customisation of LTI user ID parameter name

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20200909.sql
  1. … 8 more files in changeset.
LKC-213 Remove unnecessary clause as an exception is never thrown

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

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/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

    • -2
    • +17
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 23 more files in changeset.
LDEV-4746 Assign migrated QB questions to their owners' collections

LDEV-4917 Clean up tmp uploaded files when they are no longer needed

    • -0
    • +6
    ./lamsfoundation/lams/util/FileUtil.java
  1. … 3 more files in changeset.
LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

    • -1
    • +22
    ./lamsfoundation/lams/util/FileUtil.java
    • -11
    • +2
    ./lamsfoundation/lams/util/UploadFileUtil.java
  1. … 16 more files in changeset.
LDEV-5058 Move activity category from DB to authoring front end

    • -0
    • +17
    ./lamsfoundation/lams/dbupdates/patch20200730.sql
    • -12
    • +2
    ./lamsfoundation/lams/tool/dto/ToolDTO.java
  1. … 7 more files in changeset.