Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5354 Move course URL copy button to More Options menu

  1. … 4 more files in changeset.
LDEV-5354 Add course URL on index page

  1. … 7 more files in changeset.
LDEV-5354 Rename encoding methods so they can incorporate course ID

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

Conflicts:

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

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 11 more files in changeset.
LDEV-5350 Fix issue with detecting groupings in LD

  1. … 2 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

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

Conflicts:

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

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

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

  1. … 6 more files in changeset.
LDEV-4457 Remove empty groups after spreadsheet import

LDEV-4497 Make sure "ad" word is never a part of content folder ID

UUIDs are cut into folders of two characters and used in image paths.

AdBlock can block an image if there is "ad" in its path. Just make sure

this path piece never occurs.

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

LDEV-5341 Add transaction support for all Security Service methods

  1. … 1 more file in changeset.
LDEV-5200 Prevent invalidated session error from propagating

There seems to be a problem with Infinispan session invalidation similar

to this

https://issues.redhat.com/browse/UNDERTOW-478

We already have got a patched version, but similar problems occur. They

probably have to do with async servlet processing.

Until we upgrade WildFly we need to keep these safety measures.

LDEV-5200 Prevent invalidated session error from propagating

There seems to be a problem with Infinispan session invalidation similar

to this

https://issues.redhat.com/browse/UNDERTOW-478

We already have got a patched version, but similar problems occur. They

probably have to do with async servlet processing.

Until we upgrade WildFly we need to keep these safety measures.

LDEV-4408 Allow listing invalidated sessions

LDEV-4408 Allow listing invalidated sessions

LDEV-5302 Do not shows sysadmin role in course role assignment

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

Conflicts:

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

SP-4 Rewrite user (un)enrolment

Previous code was not taking account edge situations and course manager

implications.

  1. … 1 more file in changeset.
SP-4 Fix roles processing

There was a problem when removing a user from an organisation.

Managers were also incorrectly processed.

Also a rewrite of user data gathering and user accounts creation logic.

  1. … 1 more file in changeset.
LDEV-5335 Fix audit logging when no user is authenticated

LDEV-5302 Rename patch so it gets picked up on migration

LDEV-5302 All sysadmins are also appadmins

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java

LDEV-5342 Fix fetching LD modified date when no user is logged in

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. … 34 more files in changeset.
LDEV-5341 Refactor Security Service

  1. … 34 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/ExtServerManagementController.java

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

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

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

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

lams_admin/web/integration/ltiConsumerList.jsp

lams_admin/web/signupmanagement/list.jsp

  1. … 15 more files in changeset.
LDEV-5335 Log adjustments and fixes

  1. … 8 more files in changeset.
LDEB-5335 Add structured audit logs on various admin actions

  1. … 17 more files in changeset.
LDEV-5277 Fix course naming and enrolment issue