Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

# lams_central/web/includes/javascript/rating5.js

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

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

# lams_learning/web/css/components-learner.scss

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

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

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

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

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

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

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

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

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

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  1. … 13 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

  1. … 27 more files in changeset.
SP-9 Reintroduce histogram to Assessment monitoring

SP-9 Reintroduce histogram to Assessment monitoring

Merge remote-tracking branch 'origin/v4.7' into SP-9

# Conflicts:

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_monitoring/web/includes/javascript/monitorLesson.js

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp

  1. … 9 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Assessment

  1. … 18 more files in changeset.
SP-9 Rewrite lesson completion chart to new ChartJS

  1. … 5 more files in changeset.
SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

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

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

WEB-005

  1. … 52 more files in changeset.
LDEV-5351 Add marking teacher front end

  1. … 6 more files in changeset.
LDEV-5331 Add missing title and autocomplete attr to submission deadline

  1. … 18 more files in changeset.
LDEV-5272 Apply VSA UI improvements to single question summary page

  1. … 8 more files in changeset.
LDEV-5251 Add tooltip with list of students in answered questions chart

  1. … 6 more files in changeset.
LDEV-5213 Replace volatile JS imports with their non-cached version

  1. … 93 more files in changeset.
LDEV-5041 Add Assessment timing limits control to TBL monitoring

  1. … 6 more files in changeset.
LDEV-5157 Reorganise and add programming languages support

Added C, Objective C, C++, C#, Skala and Kotlin.

  1. … 8 more files in changeset.
LDEV-5157 Colour code syntax of students' answers in monitoring

  1. … 10 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 83 more files in changeset.
LDEV-5151 Add Boostrap tooltips to Item Analysis section

  1. … 1 more file in changeset.
LDEV-5111 Change chart title if it displays groups and not students

  1. … 3 more files in changeset.
LDEV-5111 Display groups instead of students in chart when needed

If Assessment activity uses a leader, then only he gets his answers auto

saved. He counts as one student. But when he finishes the activity, his

answers get copied to other group members. Suddenly instead of 1 student

we get, say, 5 with same answers. This makes the answered questions

chart go crazy.

Now when leader selection is in use, group count is displayed instead of

student count in the chart.

  1. … 9 more files in changeset.
LDEV-5095 Move chart code to separate JS file for reuse in another spot

  1. … 2 more files in changeset.
LDEV-5095 Make charts more responsive and add some padding

  1. … 1 more file in changeset.
LDEV-5095 Add Answered Questions chart and periodic refresh

  1. … 7 more files in changeset.
Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-5097 Add buttons to open results view in Assessment monitoring

  1. … 5 more files in changeset.
LDEV-5095 Initial implementation of learner complection chart

  1. … 3 more files in changeset.
LDEV-5041 Use CSS instead of deprecated HTML attributes

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

  1. … 12 more files in changeset.