Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5374 Add max mark information configuration in Assessment authoring

    • -5
    • +7
    ./pages/learning/parts/allquestions.jsp
    • -5
    • +7
    ./pages/learning/results/allquestions.jsp
  1. … 3 more files in changeset.
LDEV-5374 Add max mark information to Assessment questions and results

    • -0
    • +6
    ./pages/learning/parts/allquestions.jsp
    • -0
    • +6
    ./pages/learning/results/allquestions.jsp
  1. … 1 more file in changeset.
LDEV-5373 Add student choices detailed table to Assessment monitoring

  1. … 2 more files in changeset.
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

  1. … 41 more files in changeset.
LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

  1. … 36 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

lams_tool_assessment/web/pages/monitoring/summary.jsp

    • -22
    • +25
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
  1. … 7 more files in changeset.
LDEV-5359 Add answered question count next to section name

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5360' into v4.6

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

  1. … 12 more files in changeset.
LDEV-5366 Make auto expand configurable in Tool settings in sysadmin

Disabled by default

  1. … 6 more files in changeset.
LDEV-5366 Auto expand justification panel on first click

LDEV-5366 Move justification panel to question panel for visibility

    • -17
    • +20
    ./pages/learning/parts/allquestions.jsp
LDEV-5360 Put grade column next to marker column on the right

    • -5
    • +5
    ./pages/monitoring/parts/questionsummary.jsp
    • -1
    • +9
    ./pages/monitoring/parts/usersummary.jsp
  1. … 1 more file in changeset.
LDEV-5360 Add marker information to other monitoring views

    • -7
    • +0
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -33
    • +40
    ./pages/monitoring/parts/questionsummary.jsp
    • -32
    • +57
    ./pages/monitoring/parts/usersummary.jsp
  1. … 1 more file in changeset.
LDEV-5360 Add marker's comment to question result

    • -1
    • +2
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
  1. … 8 more files in changeset.
LDEV-5360 Use column instead of tooltip to indicate marker

    • -19
    • +19
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
LDEV-5360 Use dash instead of 0 for umarked essay questions

    • -3
    • +12
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
LDEV-5359 Do not show autosubmit tip to non-leaders

LDEV-5359 Use default section name for blank names

  1. … 1 more file in changeset.
LDEV-5359 Inform of question distribution method in monitoring

    • -1
    • +11
    ./pages/monitoring/parts/advanceoptions.jsp
LDEV-5359 Do not enforce validation on section change

LDEV-5359 Add "all remaining questions" option for section

  1. … 2 more files in changeset.
LDEV-5359 Add Assessment section learning

    • -16
    • +51
    ./pages/learning/parts/paging.jsp
  1. … 4 more files in changeset.
LDEV-5359 Add Assessment section model and authoring

    • -34
    • +133
    ./pages/authoring/advance.jsp
  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5357' into v4.7

Conflicts:

lams_admin/web/userChangePass.jsp

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

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

  1. … 44 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 28 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 37 more files in changeset.
LDEV-4271 Add Next/Previous Page buttons in paged Assessment learner

  1. … 1 more file in changeset.
LDEV-5200, LKC-111 Fix iRAT student choices table update

    • -9
    • +6
    ./pages/monitoring/parts/mcqStudentChoices5.jsp