Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5078 Fix i18n labels in Arrow tag

    • -2
    • +2
    ./pages/authoring/parts/optionlist.jsp
    • -2
    • +2
    ./pages/authoring/parts/questionlist.jsp
  1. … 49 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/authoring/advance.jsp

lams_tool_assessment/web/pages/authoring/authoring.jsp

LDEV-5069 Prevent error when setting blank time limit in Assessment

LDEV-5067 Do not show disclose group answers if activity is not grouped

LDEV-5066 Do not show uncofigured Etherpad option in Assessment

  1. … 1 more file in changeset.
LDEV-5065 Confirm before disclosing answers in Assessment monitoring

    • -19
    • +42
    ./pages/tblmonitoring/assessment.jsp
  1. … 1 more file in changeset.
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

    • -0
    • +7
    ./pages/authoring/parts/questionlist.jsp
  1. … 24 more files in changeset.
LDEV-4917 Add Uppy file uploads to QTI question import

  1. … 6 more files in changeset.
LDEV-3716 Allow checking Assessment mcq options when clicking on label

    • -3
    • +6
    ./pages/learning/parts/multiplechoice.jsp
LDEV-4921 Hide question titles in Assessment

    • -5
    • +8
    ./pages/learning/parts/allquestions.jsp
  1. … 1 more file in changeset.
LDEV-5054 Fix Learning Outcome removal Ajax call

  1. … 31 more files in changeset.
LDEV-5015 missing >

LDEV-5052 rendering question title

    • -4
    • +5
    ./pages/learning/parts/allquestions.jsp
    • -5
    • +5
    ./pages/learning/results/allquestions.jsp
LDEV-5050 Control if question is required from Assessment authoring

    • -0
    • +7
    ./pages/authoring/parts/questionlist.jsp
  1. … 1 more file in changeset.
LDEV-5015 Hide iRA student choices button if there are no learners

  1. … 1 more file in changeset.
LDEV-5033 Add answer justification to Assessment

    • -1
    • +26
    ./pages/learning/parts/allquestions.jsp
    • -0
    • +9
    ./pages/learning/results/allquestions.jsp
    • -0
    • +5
    ./pages/monitoring/parts/userresponse.jsp
  1. … 10 more files in changeset.
LDEV-5041 Use CSS instead of deprecated HTML attributes

    • -13
    • +13
    ./pages/monitoring/parts/timeLimit.jsp
LDEV-5041 add/fix labels and modify the monitor UI stlightly

    • -33
    • +40
    ./pages/monitoring/parts/timeLimit.jsp
  1. … 1 more file in changeset.
LDEV-5041 Allow adding a whole group to individual time limit table

  1. … 3 more files in changeset.
LDEV-5041 Allow time limit for learners who did not reach Assessment yet

  1. … 10 more files in changeset.
LDEV-5041 Remove block UI on learner entry with time limit

  1. … 3 more files in changeset.
LDEV-5041 Expand panel if absolute time limit is set and not expired

LDEV-5041 Add individual time limits

    • -3
    • +59
    ./pages/monitoring/parts/timeLimit.jsp
  1. … 10 more files in changeset.
LDEV-5041 Add "Finish now" feature

    • -4
    • +13
    ./pages/monitoring/parts/timeLimit.jsp
  1. … 1 more file in changeset.
LDEV-5041 Add absolute time limit feature to Assessment

    • -12
    • +62
    ./pages/monitoring/parts/timeLimit.jsp
    • -32
    • +178
    ./pages/monitoring/summary.jsp
  1. … 7 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

    • -134
    • +139
    ./pages/learning/learning.jsp
    • -0
    • +70
    ./pages/monitoring/parts/timeLimit.jsp
  1. … 4 more files in changeset.
LDEV-5041 Rewrite Assessment time limit with websockets

    • -43
    • +107
    ./pages/learning/learning.jsp
  1. … 9 more files in changeset.
LDEV-5025 Allow leaving comments even after user rated

  1. … 31 more files in changeset.
LDEV-5025 Fix page reloading, not from cache

  1. … 1 more file in changeset.
LDEV-4925 Fix new lines on learner results page in Peer Review

  1. … 31 more files in changeset.