Fisheye on lams-github/lams_tool_assessment/web

lams-github (): Merge branch 'v4.8' into LDEV-5424...

Andrey Balan — Tue, 09 Apr 2024 01:16:49 +0200

Andrey Balan committed c52f84e on branch in lams-github

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

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

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

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

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

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

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

· /lams_learning/web/discussion/monitor5.jsp

(-17, +17)

| History

| Source

| Diff

· /lams_monitoring/web/grouping/viewGroups.jsp

(-1, +1)

| History

| Source

| Diff

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

(-8, +8)

| History

| Source

| Diff

· /lams_monitoring/web/monitor.jsp

(-58, +66)

| History

| Source

| Diff

· /lams_monitoring/web/tblmonitor/teams.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

(-0, +4)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-4, +47)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-5, +5)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

(-2, +1)

| History

| Source

| Diff

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

(-1, +5)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/monitoring/listRecords.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-8, +111)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary5.jsp

(-12, +135)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java

(-12, +11)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

(-3, +2)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (): LDEV-5440 Use version 3 of JSP and JSTL and their schemas...

Marcin Cieslak — Fri, 05 Apr 2024 13:12:59 +0200

Marcin Cieslak committed b129e5e on branch in lams-github

LDEV-5440 Use version 3 of JSP and JSTL and their schemas

Make IntelliJ understand the Web aspect of LAMS projects.

· /lams_admin/.classpath

(-0, +2)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-5, +2)

| History

| Source

| Diff

· /lams_admin/lams_admin.iml

(-1, +17)

| History

| Source

| Diff

· /lams_admin/web/403.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/404.jsp

(-4, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag

(-4, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Alert.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Alert5.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Arrow.tag

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/AuthoringButton.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/AuthoringRatingCriteria.tag

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/CKEditor.tag

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Comments.tag

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/CommentsAuthor.tag

(-5, +3)

| History

| Source

| Diff

… 2088 more files in changeset.

lams-github (): LDEV-5440 Reintroduce more strict security rules in web.xml

Marcin Cieslak — Sun, 31 Mar 2024 21:28:40 +0200

Marcin Cieslak committed cdc594d on branch in lams-github

LDEV-5440 Reintroduce more strict security rules in web.xml

· /lams_admin/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-1, +2)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_dimdim/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_eadventure/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (): LDEV-5440 Fix file uploads

Marcin Cieslak — Sun, 31 Mar 2024 13:31:51 +0200

Marcin Cieslak committed 5a79df0 on branch in lams-github

LDEV-5440 Fix file uploads

· /lams_admin/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/toolcontent/import.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/web.xml

(-3, +1)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_dimdim/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_eadventure/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (): LDEV-5440 Fix multipart config in web.xml files

Marcin Cieslak — Wed, 27 Mar 2024 11:54:52 +0100

Marcin Cieslak committed 52b0be8 on branch in lams-github

LDEV-5440 Fix multipart config in web.xml files

· /lams_admin/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/zipfile/ZipFileUtil.java

(-35, +37)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/web.xml

(-1, +2)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/web.xml

(-1, +2)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/web.xml

(-1, +2)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/web.xml

(-1, +2)

| History

| Source

| Diff

· /lams_tool_dimdim/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/web.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_eadventure/web/WEB-INF/web.xml

(-1, +2)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

… 21 more files in changeset.

lams-github (): LDEV-5440 Configure file uploads in Spring servlet

Marcin Cieslak — Tue, 26 Mar 2024 11:19:11 +0100

Marcin Cieslak committed f5c1bfb on branch in lams-github

LDEV-5440 Configure file uploads in Spring servlet

· /lams_admin/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_dimdim/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_eadventure/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_images/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_imscc/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_kaltura/web/WEB-INF/web.xml

(-0, +1)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (): LDEV-5440 Update web.xml version

Marcin Cieslak — Wed, 20 Mar 2024 12:30:50 +0100

Marcin Cieslak committed 44cc1e3 on branch in lams-github

LDEV-5440 Update web.xml version

· /lams_admin/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_bb_integration/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-4, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_dimdim/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_eadventure/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/web.xml

(-4, +4)

| History

| Source

| Diff

… 26 more files in changeset.

lams-github (): LDEV-5440 Update code to match dependencies...

Marcin Cieslak — Wed, 20 Mar 2024 09:56:00 +0100

Marcin Cieslak committed 35d617e on branch in lams-github

LDEV-5440 Update code to match dependencies

In particular javax -> jakarta package change and new JPA not accepting some attributes.

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/c.tld

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/fmt.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/permittedTaglibs.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/scriptfree.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/jstl/x.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/web.xml

(-2, +2)

| History

| Source

| Diff

· /lams_bb_integration/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_bb_integration/WEB-INF/tlds/c.tld

(-3, +3)

| History

| Source

| Diff

· /lams_bb_integration/lams_bb_integration.eml

(-4, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java

(-18, +19)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java

(-24, +23)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

(-24, +24)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/jstl/c.tld

(-3, +3)

| History

| Source

| Diff

… 209 more files in changeset.

lams-github (v4.7): LDEV-5452 Allow changing question version in live Assessment and Scratchie...

Marcin Cieslak — Sat, 16 Mar 2024 18:17:43 +0100

Marcin Cieslak committed db5bb77 on branch v4.7, v4.8 in lams-github

LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

· /idea_project/.idea/.gitignore	(-1, +3)	\| History	\| Source	\| Diff
· /idea_project/idea_project.iml	(-1, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20240315.sql	(-0, +17)	\| History	\| Source
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-32, +35)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-1, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/authoring.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp	(-14, +49)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-26, +57)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/authoring.jsp	(-8, +10)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5083 Adjust size of discussion sentiment widget

Marcin Cieslak — Wed, 13 Mar 2024 15:18:03 +0100

Marcin Cieslak committed 0e18ab4 on branch v4.8 in lams-github

LDEV-5083 Adjust size of discussion sentiment widget

· /lams_learning/web/discussion/monitor5.jsp	(-17, +17)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(-0, +5)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs...

Andrey Balan — Thu, 07 Mar 2024 21:01:19 +0100

Andrey Balan committed 8e0b838 on branch in lams-github

LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs

* Remove dots from the analytics chart as per Ernie's request

· /lams_central/web/css/_chart_base.scss	(-4, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/components-monitoring.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/chart.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag	(-6, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag	(-6, +36)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(-2, +42)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(-2, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-6, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-11, +345)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 Fix issues. Add Scrollspy

Andrey Balan — Thu, 07 Mar 2024 00:07:52 +0100

Andrey Balan committed 49efefa on branch in lams-github

LDEV-5424 Fix issues. Add Scrollspy

· /lams_central/web/css/_chart_base.scss	(-4, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.scss	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/chart.js	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-25, +29)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 introduce new variation of monitoring interface. Assessment tool

Andrey Balan — Fri, 01 Mar 2024 22:47:11 +0100

Andrey Balan committed b199dcb on branch in lams-github

LDEV-5424 introduce new variation of monitoring interface. Assessment tool

· /lams_central/web/css/components-monitoring.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/AdvancedAccordian.tag	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag	(-5, +35)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-4, +341)	\| History	\| Source	\| Diff

lams-github (v4.8): Merge branch 'LDEV-5436' into v4.8...

Marcin Cieslak — Thu, 29 Feb 2024 12:32:58 +0100

Marcin Cieslak committed 330b0d5 on branch v4.8 in lams-github

Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

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

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

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

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

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileController.java

(-8, +7)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

(-9, +2)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_monitoring/web/gate/gateStatus.jsp

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-12, +9)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java

(-4, +3)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java

(-5, +5)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results.jsp

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (): LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

Andrey Balan — Wed, 28 Feb 2024 22:00:55 +0100

Andrey Balan committed be33897 on branch in lams-github

LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

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

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/monitoring/daterestriction.jsp

(-29, +0)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/dateRestriction.jsp

(-36, +0)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_lamc/web/monitoring/SummaryContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_lamc/web/monitoring/parts/dateRestriction.jsp

(-29, +0)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/SummaryContent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/dateRestriction.jsp

(-78, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/monitoring/dateRestriction.jsp

(-36, +0)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/monitoring/daterestriction.jsp

(-29, +0)

| History

| Source

| Diff

· /lams_tool_notebook/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_sbmt/web/monitoring/parts/daterestriction.jsp

(-29, +0)

| History

| Source

| Diff

… 12 more files in changeset.

lams-github (): LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

Andrey Balan — Wed, 28 Feb 2024 21:25:13 +0100

Andrey Balan committed 5c2c403 on branch in lams-github

LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

· /lams_admin/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-4, +7)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-3, +3)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-4, +7)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-4, +7)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-4, +7)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-3, +3)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-4, +7)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-4, +7)

| History

| Source

| Diff

· /lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

… 48 more files in changeset.

lams-github (): Merge branch 'v4.8' into LDEV-5424...

Andrey Balan — Wed, 28 Feb 2024 21:12:47 +0100

Andrey Balan committed 6ca7c6f on branch in lams-github

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

· /lams_central/web/css/components.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-3, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-4, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/essay.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp	(-5, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(-1, +18)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp	(-44, +51)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/learning/viewforum.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_images/web/pages/learning/parts/commentsarea.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/learning.jsp	(-6, +7)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-1, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)...

Andrey Balan — Tue, 27 Feb 2024 22:43:37 +0100

Andrey Balan committed 8969536 on branch v4.8 in lams-github

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

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

(-9, +11)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/learning.jsp

(-27, +29)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java

(-4, +9)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/listRecords.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/questionSummaries.jsp

(-1, +1)

| History

| Source

| Diff

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

(-9, +11)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/learning.jsp

(-34, +36)

| History

| Source

| Diff

… 38 more files in changeset.

lams-github (v4.8): LDEV-5449 Add "allow answer rating" option in learning

Marcin Cieslak — Tue, 27 Feb 2024 12:47:21 +0100

Marcin Cieslak committed 3fcb386 on branch v4.8 in lams-github

LDEV-5449 Add "allow answer rating" option in learning

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

(-1, +1)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5449 Add "allow answer rating" option in authoring

Marcin Cieslak — Tue, 27 Feb 2024 12:35:35 +0100

Marcin Cieslak committed 96b7a25 on branch v4.8 in lams-github

LDEV-5449 Add "allow answer rating" option in authoring

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20240227.sql	(-0, +14)	\| History	\| Source
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(-0, +17)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/advance.jsp	(-8, +22)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	(-1, +18)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 tag's title attribute is no longer required

Andrey Balan — Thu, 22 Feb 2024 21:28:54 +0100

Andrey Balan committed 55b53b0 on branch in lams-github

LDEV-5424 tag's title attribute is no longer required

· /lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(-4, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(-4, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(-4, +7)	\| History	\| Source	\| Diff
· /lams_tool_forum/web/jsps/monitoring/summary.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(-4, +7)	\| History	\| Source	\| Diff

lams-github (): LDEV-5424 bootstrap5 Assessment's monitoring

Andrey Balan — Tue, 20 Feb 2024 21:01:07 +0100

Andrey Balan committed 3d1c696 on branch in lams-github

LDEV-5424 bootstrap5 Assessment's monitoring

· /lams_central/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_central/web/css/free.ui.jqgrid.custom.scss

(-1, +27)

| History

| Source

| Diff

· /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

(-0, +2)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/tags/PageMonitor.tag

(-12, +35)

| History

| Source

| Diff

· /lams_tool_assessment/web/includes/javascript/chart.js

(-1, +15)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results/allquestions.jsp

(-44, +65)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results/attemptsummary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp

(-18, +19)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/editactivity.jsp

(-28, +26)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp

(-151, +4)

| History

| Source

| Diff

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

(-111, +110)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/parts/dateRestriction.jsp

(-36, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp

(-1, +2)

| History

| Source

| Diff

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

(-23, +26)

| History

| Source

| Diff

… 13 more files in changeset.

lams-github (v4.8): LDEV-5447 Bring back colour backgrounds when sharing MCQ groups answers in assessment

Ernie Ghiglione — Mon, 19 Feb 2024 15:13:34 +0100

Ernie Ghiglione committed b0232d1 on branch v4.8 in lams-github

LDEV-5447 Bring back colour backgrounds when sharing MCQ groups answers in assessment

· /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp

(-5, +5)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5444 Do not display histogram when there are no answers yet

Marcin Cieslak — Thu, 15 Feb 2024 09:02:25 +0100

Marcin Cieslak committed 1d81e13 on branch v4.8 in lams-github

LDEV-5444 Do not display histogram when there are no answers yet

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

(-57, +62)

| History

| Source

| Diff

lams-github (v4.8): SP-9 Reintroduce histogram to Assessment monitoring

Marcin Cieslak — Fri, 09 Feb 2024 23:45:42 +0100

Marcin Cieslak committed 57b97cb on branch v4.8 in lams-github

SP-9 Reintroduce histogram to Assessment monitoring

· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (): LDEV-5424 copy-tags

Andrey Balan — Thu, 08 Feb 2024 23:06:52 +0100

Andrey Balan committed b59a581 on branch in lams-github

LDEV-5424 copy-tags

· /lams_admin/web/WEB-INF/tags/AdvancedAccordian.tag

(-12, +12)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/PageMonitor.tag

(-0, +146)

| History

| Source

· /lams_admin/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-15, +48)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/PageMonitor.tag

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-6, +41)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tlds/lams/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/AdvancedAccordian.tag

(-12, +12)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/PageAdmin.tag

(-0, +84)

| History

| Source

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

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/PageMonitor.tag

(-0, +146)

| History

| Source

· /lams_gradebook/web/WEB-INF/tags/RestrictedUsageAccordian.tag

(-15, +48)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld

(-2, +6)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/AdvancedAccordian.tag

(-12, +12)

| History

| Source

| Diff

… 177 more files in changeset.

lams-github (): LDEV-5424 rename Page5.tag->PageAdmin.tag

Andrey Balan — Thu, 08 Feb 2024 22:50:26 +0100

Andrey Balan committed ca098d6 on branch in lams-github

LDEV-5424 rename Page5.tag->PageAdmin.tag

· /lams_admin/web/WEB-INF/tags/Page5.tag

(-467, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/PageAdmin.tag

(-0, +84)

| History

| Source

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/appadmin.jsp

(-8, +3)

| History

| Source

| Diff

· /lams_admin/web/cleanup.jsp

(-10, +6)

| History

| Source

| Diff

· /lams_admin/web/cleanupPreviewLessons.jsp

(-13, +5)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-18, +12)

| History

| Source

| Diff

· /lams_admin/web/disabledusers.jsp

(-14, +5)

| History

| Source

| Diff

· /lams_admin/web/import/importGroups.jsp

(-17, +9)

| History

| Source

| Diff

· /lams_admin/web/import/importexcel.jsp

(-19, +10)

| History

| Source

| Diff

· /lams_admin/web/import/importresult.jsp

(-6, +2)

| History

| Source

| Diff

· /lams_admin/web/import/status.jsp

(-6, +2)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumer.jsp

(-12, +9)

| History

| Source

| Diff

· /lams_admin/web/integration/ltiConsumerList.jsp

(-12, +6)

| History

| Source

| Diff

· /lams_admin/web/integration/serverlist.jsp

(-10, +6)

| History

| Source

| Diff

… 57 more files in changeset.

lams-github (v4.8): SP-9 Reintroduce histogram to Assessment monitoring

Marcin Cieslak — Thu, 08 Feb 2024 03:18:15 +0100

Marcin Cieslak committed 845d5a0 on branch v4.8 in lams-github

SP-9 Reintroduce histogram to Assessment monitoring

· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp

(-0, +2)

| History

| Source

| Diff

lams-github (): LDEV-5424 switch to bootstrap5 versions of js and jsps

Andrey Balan — Wed, 07 Feb 2024 02:55:29 +0100

Andrey Balan committed d644891 on branch in lams-github

LDEV-5424 switch to bootstrap5 versions of js and jsps

· /lams_monitoring/web/timeLimit.jsp	(-301, +265)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit5.jsp	(-765, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/web/controller/TblMonitoringController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart.js	(-53, +50)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/javascript/chart5.js	(-304, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp	(-43, +42)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(-120, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices.jsp	(-61, +86)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/mcqStudentChoices5.jsp	(-134, +0)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.8): Merge remote-tracking branch 'origin/v4.7' into v4.8...

Marcin Cieslak — Fri, 02 Feb 2024 10:51:45 +0100

Marcin Cieslak committed c57ea16 on branch v4.8 in lams-github

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

# Conflicts:

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

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

(-29, +29)

| History

| Source

| Diff