Fisheye on lams-github/lams_tool_scratchie/web

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

Marcin Cieslak — Thu, 28 Mar 2024 18:20:47 +0100

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

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

# Conflicts:

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

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-33, +99)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-2, +8)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-1, +44)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-29, +60)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/authoring.jsp	(-2, +4)	\| History	\| Source	\| Diff

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 (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 (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): Merge remote-tracking branch 'origin/v4.7' into v4.8...

Marcin Cieslak — Sun, 28 Jan 2024 09:45:49 +0100

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

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

# Conflicts:

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

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

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

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

(-23, +7)

| History

| Source

| Diff

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

(-22, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-9, +21)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-23, +7)

| History

| Source

| Diff

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

(-22, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-9, +21)

| History

| Source

| Diff

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

(-23, +7)

| History

| Source

| Diff

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

(-22, +6)

| History

| Source

| Diff

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

(-14, +17)

| History

| Source

| Diff

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

(-9, +21)

| History

| Source

| Diff

… 124 more files in changeset.

lams-github (v4.8): LDEV-5442 copy-tags

Andrey Balan — Sat, 27 Jan 2024 01:03:26 +0100

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

LDEV-5442 copy-tags

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

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

(-26, +66)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

· /lams_tool_images/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

· /lams_tool_imscc/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

· /lams_tool_lamc/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

· /lams_tool_laqa/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

· /lams_tool_larsrc/web/WEB-INF/tags/Rating5.tag

(-26, +66)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.7): LDEV-5290 Identify tabs better when checking for multiple open tabs...

Marcin Cieslak — Mon, 22 Jan 2024 17:43:03 +0100

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

LDEV-5290 Identify tabs better when checking for multiple open tabs

A minimised window can skip setInterval() ticks. This lead to incorrect detection of multiple tabs open - a single open tab could produce this message.

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

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

(-3, +6)

| History

| Source

| Diff

… 55 more files in changeset.

lams-github (v4.8): LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

Andrey Balan — Thu, 11 Jan 2024 19:18:21 +0100

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

LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

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

(-4, +5)

| History

| Source

| Diff

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

(-2, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

· /lams_learning/web/includes/javascript/learnerPage.js

(-1, +1)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

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

(-4, +5)

| History

| Source

| Diff

… 19 more files in changeset.

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

Andrey Balan — Thu, 11 Jan 2024 18:41:38 +0100

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

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_tool_whiteboard/web/pages/learning/learning.jsp

· /lams_tool_scratchie/web/pages/learning/scratchies.jsp

(-3, +3)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

Andrey Balan — Thu, 11 Jan 2024 18:37:15 +0100

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

LDEV-5397 Enhanced mobile experience

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/css/components.scss

(-17, +24)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-20, +35)

| History

| Source

| Diff

· /lams_learning/web/loadToolActivity.jsp

(-2, +8)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 21 more files in changeset.

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

Ernie Ghiglione — Thu, 11 Jan 2024 07:30:43 +0100

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

LDEV-5397 Enhanced mobile experience

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-0, +14)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 17 more files in changeset.

lams-github (v4.8): LDEV-5397 fix expanding/collapsing icons

Andrey Balan — Thu, 11 Jan 2024 01:07:03 +0100

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

LDEV-5397 fix expanding/collapsing icons

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

(-0, +10)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5437 prevent questions and instructions to be copy/paste or print

Ernie Ghiglione — Wed, 10 Jan 2024 07:33:18 +0100

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

LDEV-5437 prevent questions and instructions to be copy/paste or print

· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-0, +7)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/questionlist.jsp	(-7, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/results.jsp	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5437 prevent questions and instructions to be copy/paste or print

Ernie Ghiglione — Wed, 10 Jan 2024 07:33:18 +0100

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

LDEV-5437 prevent questions and instructions to be copy/paste or print

· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-0, +7)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/questionlist.jsp	(-7, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/results.jsp	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 Fix scratchies not being revealed for non-leaders

Marcin Cieslak — Wed, 10 Jan 2024 07:20:34 +0100

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

LDEV-5397 Fix scratchies not being revealed for non-leaders

· /lams_tool_scratchie/web/pages/learning/scratchies.jsp

(-3, +12)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5397 copy-tags

Andrey Balan — Tue, 09 Jan 2024 20:36:07 +0100

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

LDEV-5397 copy-tags

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

(-17, +23)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

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

(-5, +5)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-17, +23)

| History

| Source

| Diff

… 49 more files in changeset.

lams-github (v4.8): LDEV-5436 Project-wide user sorting by last then first name

Marcin Cieslak — Tue, 09 Jan 2024 09:41:35 +0100

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

LDEV-5436 Project-wide user sorting by last then first name

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-11, +12)

| History

| Source

| Diff

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

(-11, +11)

| History

| Source

| Diff

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

(-15, +13)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectLearners.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/parts/selectStaff.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/user/basiclist.jsp

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-9, +8)

| History

| Source

| Diff

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

(-8, +7)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java

(-8, +10)

| History

| Source

| Diff

· /lams_central/web/emailuser.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/findUserLessons.jsp

(-1, +1)

| History

| Source

| Diff

… 136 more files in changeset.

lams-github (v4.8): LDEV-5397 fix portraits sources

Andrey Balan — Mon, 08 Jan 2024 18:02:07 +0100

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

LDEV-5397 fix portraits sources

· /lams_learning/web/loadToolActivity.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/results.jsp	(-3, +4)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

Ernie Ghiglione — Sun, 07 Jan 2024 21:32:55 +0100

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

LDEV-5397 Enhanced mobile experience

· /lams_central/web/css/components.scss	(-0, +17)	\| History	\| Source	\| Diff
· /lams_central/web/images/css/check.png	(binary)	\| History	\| Source
· /lams_learning/web/css/components-learner.scss	(-7, +57)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/includes/css/assessment.scss	(-2, +14)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/learning.jsp	(-8, +10)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/results.jsp	(-3, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(-3, +21)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-4, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/results.jsp	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5420 Add questions print button to Scratchie

Marcin Cieslak — Tue, 02 Jan 2024 15:33:08 +0100

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

LDEV-5420 Add questions print button to Scratchie

· /lams_tool_assessment/web/pages/authoring/basic.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/AuthoringController.java	(-0, +21)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/authoring.jsp	(-94, +91)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/basic.jsp	(-0, +11)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 copy-tags

Andrey Balan — Sat, 30 Dec 2023 01:23:42 +0100

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

LDEV-5397 copy-tags

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

… 17 more files in changeset.

lams-github (v4.8): LDEV-5397 round scratchies

Ernie Ghiglione — Fri, 29 Dec 2023 13:19:47 +0100

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

LDEV-5397 round scratchies

· /lams_tool_scratchie/web/pages/learning/parts/scratchieSvg.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.8): LDEV-5425 copy-tags

Andrey Balan — Wed, 27 Dec 2023 21:14:21 +0100

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

LDEV-5425 copy-tags

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

(-107, +0)

| History

| Source

| Diff

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

(-67, +0)

| History

| Source

| Diff

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

(-4, +1)

| History

| Source

| Diff

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

(-71, +10)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-107, +0)

| History

| Source

| Diff

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

(-67, +0)

| History

| Source

| Diff

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

(-4, +1)

| History

| Source

| Diff

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

(-71, +10)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-107, +0)

| History

| Source

| Diff

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

(-67, +0)

| History

| Source

| Diff

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

(-71, +10)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-107, +0)

| History

| Source

| Diff

… 144 more files in changeset.

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from all tools

Andrey Balan — Wed, 27 Dec 2023 21:04:44 +0100

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

LDEV-5425 Remove "End of activity" notebook from *all* tools

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

(-188, +121)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-42, +30)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-6, +6)

| History

| Source

| Diff

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

(-107, +0)

| History

| Source

| Diff

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

(-67, +0)

| History

| Source

| Diff

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

(-71, +10)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

(-40, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20231221.sql

(-0, +15)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java

(-51, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java

(-106, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java

(-204, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java

(-11, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java

(-250, +0)

| History

| Source

| Diff

… 505 more files in changeset.

lams-github (v4.7): LDEV-5363 Make RAT questions sync optional

Marcin Cieslak — Wed, 27 Dec 2023 14:13:12 +0100

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

LDEV-5363 Make RAT questions sync optional

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/AuthoringController.java	(-32, +35)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/authoring.jsp	(-2, +9)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/basic.jsp	(-1, +7)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp	(-4, +6)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/AuthoringController.java	(-56, +61)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/authoring.jsp	(-1, +8)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/basic.jsp	(-1, +6)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp	(-1, +3)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 fix inability to double click when such option is ON

Andrey Balan — Thu, 21 Dec 2023 17:57:36 +0100

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

LDEV-5397 fix inability to double click when such option is ON

· /lams_tool_scratchie/web/pages/learning/learning.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-0, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5401 Display individual extensions in time limit widget

Marcin Cieslak — Thu, 21 Dec 2023 11:46:16 +0100

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

LDEV-5401 Display individual extensions in time limit widget

· /lams_monitoring/web/timeLimit.jsp	(-0, +31)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit5.jsp	(-2, +32)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_doku/web/pages/monitoring/summary5.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(-2, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 improve burning questions' CSS at the results page

Andrey Balan — Thu, 21 Dec 2023 01:13:20 +0100

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

LDEV-5397 improve burning questions' CSS at the results page

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

(-28, +42)

| 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

Fisheye on lams-github/lams_tool_scratchie/web

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

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

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

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

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

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

lams-github (v4.8): LDEV-5442 copy-tags

lams-github (v4.7): LDEV-5290 Identify tabs better when checking for multiple open tabs...

lams-github (v4.8): LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

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

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

lams-github (v4.8): LDEV-5397 fix expanding/collapsing icons

lams-github (v4.8): LDEV-5437 prevent questions and instructions to be copy/paste or print

lams-github (v4.8): LDEV-5437 prevent questions and instructions to be copy/paste or print

lams-github (v4.8): LDEV-5397 Fix scratchies not being revealed for non-leaders

lams-github (v4.8): LDEV-5397 copy-tags

lams-github (v4.8): LDEV-5436 Project-wide user sorting by last then first name

lams-github (v4.8): LDEV-5397 fix portraits sources

lams-github (v4.8): LDEV-5397 Enhanced mobile experience

lams-github (v4.8): LDEV-5420 Add questions print button to Scratchie

lams-github (v4.8): LDEV-5397 copy-tags

lams-github (v4.8): LDEV-5397 round scratchies

lams-github (v4.8): LDEV-5425 copy-tags

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from *all* tools

lams-github (v4.7): LDEV-5363 Make RAT questions sync optional

lams-github (v4.8): LDEV-5397 fix inability to double click when such option is ON

lams-github (v4.7): LDEV-5401 Display individual extensions in time limit widget

lams-github (v4.8): LDEV-5397 improve burning questions' CSS at the results page

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

lams-github (v4.8): LDEV-5425 Remove "End of activity" notebook from all tools