Fisheye: Diff - lams-github/lams_monitoring/web/monitor.jsp

Tree
Options

5523969

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

26 Sep 23 Marcin Cieslak 5523969e2d7fc452301bf0a8403e5afbbae6c92a

ad4238f

SP-9 Rewrite lesson completion chart to new ChartJS

26 Jul 23 Marcin Cieslak ad4238fead7dcc8bdbf8cc0e180b21b680b9c151

Loading ...