Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

LDEV-5332 Add VSA support to Question Results table

In Scratchie VSA answers were not linked to corresponding QB options,

making it impossible to count correct answer. From now on if answer is

correct, it will get linked to its QB option. Old VSA lessons though

will not yield good Question Results table.

  1. … 2 more files in changeset.
LDEV-5332 Identify questions and options by display order

iRAT and tRAT activities should be based on same questions from Question

Bank, with same IDs. It is not always the case, especially when

importing exported LDs.

Now corresponding questions are identified by display order, which

should be the same in both RAT activities.

  1. … 4 more files in changeset.
Merge branch 'LDEV-5332' into v4.7

LDEV-5332 Add Question Results table in Teams tab

  1. … 6 more files in changeset.
LDEV-5178 Skip password expiration check on login via integrations

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

  1. … 6 more files in changeset.
LDEV-5334 Make shared collections available to authors

  1. … 2 more files in changeset.
LDEV-5329 Remove obsolete configuration items

  1. … 12 more files in changeset.
LDEV-5330 Merge changes made for sysadmin

It included upgrading to Bootstrap 5 and using UI guidelines set for

Monitoring UI.

  1. … 189 more files in changeset.
LDEV-5320 replace CR for values

As logs are parsed one line at the time, if some of these contain CRs, then these cannot be parsed properly and regexp for log monitors aren't triggered properly

LDEV-5302 Fix bug when adding appadmin role

LDEV-5327 Add Clear Cache button

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.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/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

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

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

  1. … 55 more files in changeset.
LDEV-5328 Squash DB patches and update versions

  1. … 140 more files in changeset.
Revert "LDEV-5320 Add LAMS instance information to audit logs"

This reverts commit 3db824f7e69ecba2b1e53b1060cf849cfe23ae9c.