Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5363 Export all TBL lessons in course if user is course manager

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

Conflicts:

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

  1. … 11 more files in changeset.
LDEV-5363 Allow monitors to export course gradebook reports

LDEV-5363 Add TBL course gradebook export

  1. … 5 more files in changeset.
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

  1. … 35 more files in changeset.
LDEV-5341 Refactor Security Service

  1. … 33 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 6 more files in changeset.
LDEV-5333 Move HTML templates from WWW to Central folder

  1. … 6 more files in changeset.
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.

  1. … 1 more file in changeset.
LDEV-5083 Remove old monitoring bits where possible

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

rewritten.

  1. … 59 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

  1. … 2 more files in changeset.
LDEV-4415 Prevent exception if user mark is missing for any reason.

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

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

LDEV-4897 Properly align names of lessons with multiple activities

LDEV-4897 Properly align lesson names in course gradebook export

Also add subcourse information

  1. … 1 more file in changeset.
LDEV-4776 Allow course manager export all subcourse lessons gradebook

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.

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

  1. … 36 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

  1. … 8 more files in changeset.
LDEV-5311 Send emails with password change link on user import

  1. … 9 more files in changeset.
LDEV-5083 Add activity mark and time taken to learner timeline

  1. … 13 more files in changeset.
LDEV-5083 Rewrite Release Marks panel

Also improvements to jqGrid layout

  1. … 5 more files in changeset.
LDEV-5083 Fix gradebook export button blocking

  1. … 3 more files in changeset.
LDEV-5083 Add gradebook tables with Bootstrap 5 & Font Awesome 6 theme

  1. … 8 more files in changeset.
LDEV-5295 Filter out non-learners from Gradebook

LDEV-5257 Secure fileDownloadToken cookie

  1. … 9 more files in changeset.
LDEV-5256 Sanitise jqGrid sorting options before using them in queries

  1. … 3 more files in changeset.
LDEV-5256 Prevent SQL injection for results order

  1. … 3 more files in changeset.
LDEV-4609 Prevent SQL injection for results order in Gradebook