Fisheye on lams-github/lams_gradebook/src

lams-github (): LDEV-5440 Do not use deprecated constructors of Double and Boolean

Marcin Cieslak — Tue, 02 Apr 2024 08:35:38 +0200

Marcin Cieslak committed 7de71bb on branch in lams-github

LDEV-5440 Do not use deprecated constructors of Double and Boolean

· /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

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/browser_detect.js

(-1, +1)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/.../gradebook/dto/comparators/GBAverageMarkComparator.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/.../gradebook/dto/comparators/GBMedianTimeTakenComparator.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBTimeTakenComparator.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

(-2, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

(-33, +33)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 20 more files in changeset.

lams-github (): LDEV-5440 Update Hibernate queries with new syntax...

Marcin Cieslak — Tue, 20 Feb 2024 12:14:26 +0100

Marcin Cieslak committed c11264f on branch in lams-github

LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

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

(-7, +9)

| 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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

(-7, +7)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/config/dao/hibernate/ConfigurationDAO.java

(-5, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0012FixWorkspaceNames.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0016FixWorkspacePublicFolder.java

(-11, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch02030300.java

(-1, +1)

| History

| Source

| Diff

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

(-13, +11)

| History

| Source

| Diff

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

(-12, +12)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

… 72 more files in changeset.

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-5436 Add project-wide User sorting on Java level

Marcin Cieslak — Mon, 08 Jan 2024 11:47:39 +0100

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

LDEV-5436 Add project-wide User sorting on Java level

· /lams_common/src/java/org/lamsfoundation/lams/lesson/util/LearnerProgressNameComparator.java	(-7, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-7, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserDetails.java	(-0, +26)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/FirstNameAlphabeticComparator.java	(-104, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/LastNameAlphabeticComparator.java	(-155, +0)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-6, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java	(-15, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-2, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-7, +2)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	(-15, +10)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(-4, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3623 Fix exception on displaying gate as current activity

Marcin Cieslak — Sat, 19 Aug 2023 13:05:06 +0200

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

LDEV-3623 Fix exception on displaying gate as current activity

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-0, +1)

| History

| Source

| Diff

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

Marcin Cieslak — Thu, 11 May 2023 12:16:20 +0200

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

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

# Conflicts:

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-180, +174)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5393 Update marks for all peers in group after activity

Marcin Cieslak — Sun, 07 May 2023 12:58:59 +0200

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

LDEV-5393 Update marks for all peers in group after activity

· /lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java	(-3, +13)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-182, +176)	\| History	\| Source	\| Diff
· /lams_tool_preview/src/java/org/lamsfoundation/.../tool/peerreview/service/PeerreviewOutputFactory.java	(-1, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5363 Add subgroup column in TBL course gradebook export

Marcin Cieslak — Thu, 02 Mar 2023 15:51:04 +0100

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

LDEV-5363 Add subgroup column in TBL course gradebook export

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-0, +10)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5363 Export all TBL lessons in course if user is course manager

Marcin Cieslak — Thu, 02 Mar 2023 15:14:02 +0100

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

LDEV-5363 Export all TBL lessons in course if user is course manager

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-2, +11)

| History

| Source

| Diff

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

Marcin Cieslak — Mon, 27 Feb 2023 10:53:29 +0100

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

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

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

· /lams_gradebook/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-0, +90)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java	(-5, +40)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java	(-2, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(-158, +9)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/LearningController.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/admin/config.jsp	(-2, +9)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(-25, +82)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(-12, +21)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/monitoring/studentChoicesTable.jsp	(-182, +181)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5363 Allow monitors to export course gradebook reports

Marcin Cieslak — Fri, 17 Feb 2023 08:28:52 +0100

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

LDEV-5363 Allow monitors to export course gradebook reports

· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java

(-4, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5363 Add TBL course gradebook export

Marcin Cieslak — Thu, 09 Feb 2023 17:31:49 +0100

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

LDEV-5363 Add TBL course gradebook export

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java	(-1, +7)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java	(-0, +150)	\| History	\| Source	\| Diff
· /lams_gradebook/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-0, +90)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java	(-8, +7)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java	(-3, +40)	\| History	\| Source	\| Diff
· /lams_gradebook/web/gradebookCourseMonitor.jsp	(-23, +36)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(-80, +15)	\| History	\| Source	\| Diff

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

Marcin Cieslak — Mon, 31 Oct 2022 08:19:29 +0100

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

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

Conflicts:

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

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

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

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

(-1, +1)

| History

| Source

| Diff

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

(-2, +2)

| 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/PortraitBatchUploadController.java

(-3, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-1, +1)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_de_DE.properties

(-0, +6)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_el_GR.properties

(-0, +6)

| History

| Source

| Diff

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

(-0, +6)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_es_ES.properties

(-0, +6)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_fr_FR.properties

(-0, +6)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_no_NO.properties

(-0, +6)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java

(-1, +1)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

… 21 more files in changeset.

lams-github (v4.7): LDEV-5341 Refactor Security Service

Marcin Cieslak — Thu, 27 Oct 2022 13:47:14 +0200

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

LDEV-5341 Refactor Security Service

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-4, +2)

| 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/PortraitBatchUploadController.java

(-3, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java

(-1, +1)

| History

| Source

| Diff

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

(-6, +7)

| History

| Source

| Diff

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

(-2, +1)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-4, +4)

| History

| Source

| Diff

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

(-3, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

(-9, +8)

| History

| Source

| Diff

… 21 more files in changeset.

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

Marcin Cieslak — Tue, 11 Oct 2022 14:58:42 +0200

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

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

· /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties	(-1, +34)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_admin/web/policies/policies.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java	(-11, +17)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-3, +18)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5333 Move HTML templates from WWW to Central folder

Marcin Cieslak — Thu, 06 Oct 2022 11:44:25 +0200

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

LDEV-5333 Move HTML templates from WWW to Central folder

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/templates/gradebookReleaseLessonMarksEmailTemplate.html	(-0, +887)	\| History	\| Source
· /lams_central/web/templates/userImportPasswordChangeEmailTemplate.html	(-0, +643)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html	(-887, +0)	\| History	\| Source	\| Diff
· /lams_www/web/userImportPasswordChangeEmailTemplate.html	(-643, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Order activities in Gradebook by order in sequence by default...

Marcin Cieslak — Fri, 16 Sep 2022 10:19:50 +0200

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

LDEV-5083 Order activities in Gradebook by order in sequence by default

This functionality was present before and was mistakenly removed.

Also add Start Date column.

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_gradebook/web/gradebookMonitorContent.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5083 Remove old monitoring bits where possible...

Marcin Cieslak — Thu, 15 Sep 2022 19:01:53 +0200

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

LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

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

(-1, +1)

| History

| Source

| Diff

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

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/css/bootstrap-select.css

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/css/bootstrap-select.min5.css

(-6, +0)

| History

| Source

| Diff

· /lams_central/web/css/x-editable.css

(-13, +15)

| History

| Source

| Diff

· /lams_central/web/css/x-editable5.css

(-665, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/bootstrap-select.js

(-3, +3)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/bootstrap-select.min5.js

(-9, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/dialog5.js

(-14, +5)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/openUrls.js

(-32, +3)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/x-editable.js

(-4, +4)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/x-editable5.js

(-7, +0)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/.../gradebook/web/controller/GradebookMonitoringController.java

(-2, +2)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitorContent.jsp

(-91, +139)

| History

| Source

| Diff

· /lams_gradebook/web/gradebookMonitorContent5.jsp

(-852, +0)

| History

| Source

| Diff

… 45 more files in changeset.

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

Marcin Cieslak — Mon, 12 Sep 2022 06:58:20 +0200

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

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java	(-0, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4415 Prevent exception if user mark is missing for any reason.

Marcin Cieslak — Tue, 23 Aug 2022 11:12:15 +0200

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

LDEV-4415 Prevent exception if user mark is missing for any reason.

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4415 Prevent exception if user mark is missing for any reason.

Marcin Cieslak — Tue, 23 Aug 2022 09:54:06 +0200

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

LDEV-4415 Prevent exception if user mark is missing for any reason.

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-1, +1)

| History

| Source

| Diff

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

Marcin Cieslak — Tue, 09 Aug 2022 11:03:25 +0200

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

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-22, +28)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4897 Properly align names of lessons with multiple activities

Marcin Cieslak — Tue, 09 Aug 2022 08:37:20 +0200

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

LDEV-4897 Properly align names of lessons with multiple activities

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4897 Properly align lesson names in course gradebook export...

Marcin Cieslak — Mon, 08 Aug 2022 11:24:08 +0200

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

LDEV-4897 Properly align lesson names in course gradebook export

Also add subcourse information

· /lams_gradebook/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-22, +28)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4776 Allow course manager export all subcourse lessons gradebook

Marcin Cieslak — Wed, 03 Aug 2022 06:58:19 +0200

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

LDEV-4776 Allow course manager export all subcourse lessons gradebook

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

(-0, +4)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5083 Use consistent sorting throughout monitoring...

Marcin Cieslak — Mon, 13 Jun 2022 15:41:04 +0200

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

LDEV-5083 Use consistent sorting throughout monitoring

On LD SVG and in search box we use first name, then last name. In

Gradebook we used last name, then firs name.

This was fixed to always sort by first and then last name.

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(-16, +16)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (): LDEV-5081 Merge changes made for monitor in LDEV-5083

Marcin Cieslak — Tue, 10 May 2022 17:45:37 +0200

Marcin Cieslak committed ecc49cd on branch in lams-github

LDEV-5081 Merge changes made for monitor in LDEV-5083

· /lams_build/3rdParty.userlibraries

(-23, +29)

| History

| Source

| Diff

· /lams_build/build.xml

(-7, +66)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-3, +19)

| History

| Source

| Diff

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

(-178, +129)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

(-7, +14)

| History

| Source

| Diff

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

(-9, +10)

| History

| Source

| Diff

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

(-0, +29)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringActivity.js

(-177, +276)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js

(-163, +288)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringHandler.js

(-30, +51)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-1847, +1410)

| History

| Source

| Diff

· /lams_common/db/sql/insert_lams_config_data.sql

(-5, +3)

| History

| Source

| Diff

· /lams_common/db/sql/insert_types_data.sql

(-4, +4)

| History

| Source

| Diff

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

(-0, +22)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-15, +7)

| History

| Source

| Diff

… 22 more files in changeset.