Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  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

  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

LDEV-4921 Hide question titles in Assessment

  1. … 1 more file in changeset.
LDEV-5015 missing >

LDEV-5052 rendering question title

LDEV-5050 Control if question is required from Assessment authoring

    • -0
    • +7
    ./authoring/parts/questionlistRestricted.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. … 10 more files in changeset.
LDEV-5041 Use CSS instead of deprecated HTML attributes

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

    • -33
    • +40
    ./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

  1. … 10 more files in changeset.
LDEV-5041 Add "Finish now" feature

  1. … 1 more file in changeset.
LDEV-5041 Add absolute time limit feature to Assessment

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

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

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

  1. … 1 more file in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

    • -9
    • +11
    ./monitoring/parts/questionsummary.jsp
  1. … 2 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

    • -7
    • +7
    ./monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.
LDEV-5052 Fix page reloading, not from cache

  1. … 1 more file in changeset.
LDEV-5052 Make "not disclosed" info print out in italics

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 33 more files in changeset.
LDEV-5052 Add group name when displaying rating in monitor

    • -3
    • +5
    ./monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.