Fisheye on lams-github/lams_tool_scratchie/src

lams-github (): LDEV-5440 Replace deprecated Long constructor

Marcin Cieslak — Sun, 31 Mar 2024 14:32:05 +0200

Marcin Cieslak committed 82ec29b on branch in lams-github

LDEV-5440 Replace deprecated Long constructor

· /lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/controller/LtiController.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceController.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java

(-38, +40)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputValue.java

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java

(-9, +9)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java

(-2, +2)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-1, +1)

| History

| Source

| Diff

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

(-18, +18)

| History

| Source

| Diff

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

(-8, +8)

| History

| Source

| Diff

… 102 more files in changeset.

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.7): LDEV-4993 Show all correct answers in Scratchie student choices table

Marcin Cieslak — Thu, 07 Mar 2024 14:32:06 +0100

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

LDEV-4993 Show all correct answers in Scratchie student choices table

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java

(-3, +3)

| 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 bootstrap5 Scratchie monitoring

Andrey Balan — Thu, 22 Feb 2024 21:23:55 +0100

Andrey Balan committed e745a65 on branch in lams-github

LDEV-5424 bootstrap5 Scratchie monitoring

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/TblMonitorController.java	(-3, +6)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/WEB-INF/tags/PageMonitor.tag	(-12, +35)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/monitoring.jsp	(-92, +4)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions.jsp	(-233, +0)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/burningQuestions5.jsp	(-71, +0)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/burningQuestionsTable.jsp	(-207, +0)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/dateRestriction.jsp	(-29, +0)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp	(-69, +62)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp	(-22, +25)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(-414, +0)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(-50, +53)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoicesTable.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/summary.jsp	(-89, +124)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(-0, +93)	\| History	\| Source
· /lams_tool_scratchie/web/pages/tblmonitoring/burningQuestionsTable.jsp	(-0, +210)	\| History	\| Source
· /lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp	(-2, +0)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(-62, +46)	\| History	\| Source	\| Diff

lams-github (): LDEV-5440 Further code upgrade to conform new WF libraries

Marcin Cieslak — Tue, 20 Feb 2024 13:53:22 +0100

Marcin Cieslak committed cb01d2d on branch in lams-github

LDEV-5440 Further code upgrade to conform new WF libraries

· /lams_build/build.xml

(-27, +1)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/codec.module.xml

(-27, +0)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/commons-codec-1.15.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/commons-logging-1.2.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/io.module.xml

(-29, +0)

| History

| Source

| Diff

· /lams_build/lib/jakarta-commons/logging.module.xml

(-29, +0)

| History

| Source

| Diff

· /lams_central/.classpath

(-3, +3)

| History

| Source

| Diff

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

(-119, +181)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentForm.java

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/DatabaseAuthenticator.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/SimpleGroup.java

(-6, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java

(-28, +28)

| History

| Source

| Diff

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

(-28, +30)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_common/lams_common.eml

(-1, +1)

| History

| Source

| Diff

… 47 more files in changeset.

lams-github (v4.8): LDEV-5446 Ensure that UUIDs are unique but retained on import

Marcin Cieslak — Fri, 16 Feb 2024 13:36:45 +0100

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

LDEV-5446 Ensure that UUIDs are unique but retained on import

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java	(-18, +21)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20240216.sql	(-1, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/AuthoringController.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/AuthoringController.java	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5425 delete notebook leftovers

Andrey Balan — Tue, 30 Jan 2024 23:03:42 +0100

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

LDEV-5425 delete notebook leftovers

· /lams_tool_mindmap/src/java/org/lamsfoundation/.../tool/mindmap/web/controller/LearningController.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(-8, +0)	\| History	\| Source	\| Diff

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

Marcin Cieslak — Sun, 21 Jan 2024 10:30:17 +0100

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

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

# Conflicts:

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

· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-2, +9)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(-5, +6)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java	(-24, +23)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/.../whiteboard/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5401 Hide individual extension from widget after learner finished

Marcin Cieslak — Fri, 19 Jan 2024 12:45:09 +0100

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

LDEV-5401 Hide individual extension from widget after learner finished

· /lams_monitoring/web/timeLimit.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/timeLimit5.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(-5, +6)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java	(-25, +31)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/.../whiteboard/web/controller/MonitoringController.java	(-0, +4)	\| History	\| Source	\| Diff

lams-github (): LDEV-5441 Finish user attempts and session after timer expired

Marcin Cieslak — Thu, 18 Jan 2024 11:47:27 +0100

Marcin Cieslak committed 05ed44a on branch in lams-github

LDEV-5441 Finish user attempts and session after timer expired

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +42)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/web/controller/TblMonitoringController.java	(-11, +11)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(-0, +42)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(-7, +12)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-0, +36)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java	(-25, +31)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/TblMonitorController.java	(-18, +17)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/.../tool/whiteboard/service/IWhiteboardService.java	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(-0, +42)	\| History	\| Source	\| Diff
· /lams_tool_whiteboard/src/java/org/lamsfoundation/.../whiteboard/web/controller/MonitoringController.java	(-0, +1)	\| History	\| Source	\| Diff

lams-github (): LDEV-5440 Revert some unnecessary package name changes

Marcin Cieslak — Tue, 16 Jan 2024 10:38:00 +0100

Marcin Cieslak committed 88da402 on branch in lams-github

LDEV-5440 Revert some unnecessary package name changes

· /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/CleanupController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/CleanupPreviewLessonsController.java

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.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/OrgSaveController.java

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 450 more files in changeset.

lams-github (): LDEV-5440 Refactor packages of imported classes

Marcin Cieslak — Tue, 16 Jan 2024 10:01:46 +0100

Marcin Cieslak committed 129d0eb on branch in lams-github

LDEV-5440 Refactor packages of imported classes

· /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/CleanupController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/CleanupPreviewLessonsController.java

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/LtiConsumerManagementController.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/OrgSaveController.java

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 467 more files in changeset.

lams-github (): LDEV-5440 Rewrite config files and library references

Marcin Cieslak — Mon, 15 Jan 2024 16:11:42 +0100

Marcin Cieslak committed a1064a5 on branch in lams-github

LDEV-5440 Rewrite config files and library references

· /idea_project/.idea/misc.xml

(-1, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-12, +12)

| History

| Source

| Diff

· /lams_admin/lams_admin.eml

(-4, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-5, +5)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/.../admin/web/controller/CleanupPreviewLessonsController.java

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

Marcin Cieslak — Fri, 29 Dec 2023 10:38:34 +0100

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

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

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

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

· /lams_build/common.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_lams_config_data.sql	(-6, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-21, +24)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-3, +4)	\| 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/.../tool/assessment/service/AssessmentServiceImpl.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_leader/src/java/org/.../tool/leaderselection/service/LeaderselectionService.java	(-20, +23)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(-1, +15)	\| History	\| Source	\| Diff

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

Andrey Balan — Wed, 27 Dec 2023 22:09:23 +0100

Andrey Balan committed 1a4b15d on branch in lams-github

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

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

(-24, +7)

| History

| Source

| Diff

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

(-29, +24)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

(-22, +0)

| History

| Source

| Diff

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

(-114, +31)

| History

| Source

| Diff

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

(-69, +0)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/advance.jsp

(-31, +0)

| History

| Source

| Diff

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

(-31, +0)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

(-55, +2)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

(-90, +20)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

(-95, +19)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

(-54, +2)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/lamsfoundation/.../tool/imageGallery/service/ImageGalleryServiceImpl.java

(-103, +20)

| History

| Source

| Diff

· /lams_tool_imscc/src/java/org/.../tool/commonCartridge/service/CommonCartridgeServiceImpl.java

(-96, +14)

| History

| Source

| Diff

… 20 more files in changeset.

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

Andrey Balan — Wed, 27 Dec 2023 22:09:23 +0100

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