Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

    • -275
    • +282
    ./pages/monitoring/summary.jsp
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

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

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

  1. … 38 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

    • -1
    • +1
    ./pages/learning/results/allquestions.jsp
    • -3
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 328 more files in changeset.
LDEV-5401 Add learner-triggered absolute timer to other tools

  1. … 41 more files in changeset.
LDEV-5401 Add learner-triggered absolute time limit monitoring

Also make time limit panel refresh automatically in monitoring.

  1. … 8 more files in changeset.
LDEV-5401 Add learner-triggered absolute time limit authoring and learning

    • -297
    • +358
    ./pages/authoring/advance.jsp
  1. … 13 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -92
    • +154
    ./includes/javascript/chart.js
    • -98
    • +161
    ./includes/javascript/chart5.js
  1. … 10 more files in changeset.
LDEV-5130 Show ALlocate VSAs button in iRAT monitoring

  1. … 2 more files in changeset.
LDEV-5400 Add tooltip with learners to activity completion chart

Also add group information in the tooltip

    • -95
    • +154
    ./includes/javascript/chart.js
    • -242
    • +242
    ./pages/monitoring/summary.jsp
  1. … 5 more files in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

  1. … 32 more files in changeset.
LDEV-5400 Add list of Assessment started/not started/completed students on chart hover

  1. … 9 more files in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

    • -412
    • +513
    ./WEB-INF/tags/StyledRating.tag
  1. … 32 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 34 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 34 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5373 Display groups' choices always for grouped Assessments

  1. … 1 more file in changeset.
LDEV-5375 Prefill subject and context fields

LDEV-5375 Add OpenAI question import to Assessment

    • -1
    • +11
    ./pages/authoring/parts/questionlist.jsp
  1. … 9 more files in changeset.
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