Fisheye on lams-github/lams_learning/web/discussion/monitor5.jsp

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 (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 improvements to TBL monitor pages

Andrey Balan — Thu, 15 Feb 2024 21:49:14 +0100

Andrey Balan committed fc63987 on branch in lams-github

LDEV-5424 improvements to TBL monitor pages

· /lams_learning/web/discussion/monitor5.jsp	(-4, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-3, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/aes.jsp	(-11, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-67, +63)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teamsQuestionResults.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teamsQuestionResultsCell.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit.jsp	(-55, +63)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 divs not having any special roles can't have aria-labels

Andrey Balan — Wed, 20 Dec 2023 23:11:52 +0100

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

LDEV-5397 divs not having any special roles can't have aria-labels

· /lams_learning/web/discussion/learner.jsp	(-5, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-4, +2)	\| History	\| Source	\| Diff
· /lams_tool_doku/web/pages/learning/galleryWalk.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_tool_laqa/web/learning/AnswersContent.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/learning.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_leader/web/pages/learning/leaderselection.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_mindmap/web/pages/learning/galleryWalk.jsp	(-3, +2)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/learning/rubrics.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/learning/rubricsPivot.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/web/learner/sbmtlearner.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/web/pages/learning/galleryWalk.jsp	(-4, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5404 Escaping funny characters that break js...

Ernie Ghiglione — Sun, 06 Aug 2023 00:29:41 +0200

Ernie Ghiglione committed 21f82ef on branch v4.7, v4.8 in lams-github

LDEV-5404 Escaping funny characters that break js

- Learner

· /lams_learning/web/branching/preview.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/common/taglibs.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/kumalive/kumalive.jsp	(-20, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/kumalive/kumaliveReport.jsp	(-11, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-8, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/presenceChat.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

Marcin Cieslak — Tue, 12 Jul 2022 15:55:45 +0200

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

LDEV-5083 Rewrite TBL Assessment AES disclose and discussion element

· /lams_learning/src/java/org/.../learning/discussion/controller/DiscussionSentimentController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-0, +297)	\| History	\| Source
· /lams_monitoring/web/css/components-monitoring.css	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson5.js	(-3, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results/allquestions5.jsp	(-10, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers5.jsp	(-41, +39)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessment5.jsp	(-45, +43)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices5.jsp	(-1, +1)	\| History	\| Source	\| Diff