Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

  1. … 5 more files in changeset.
LDEV-5383 Allow adding user to all lessons in a course

  1. … 5 more files in changeset.
LDEV-4501 Prevent exceptions on missing user references from LogEvents

This time in entity there is no reference to User objects. It reflects

DB structure without foreign key: there is just integer ID.

  1. … 2 more files in changeset.
LDEV-4501 Prevent exceptions on missing user references from LogEvents

  1. … 2 more files in changeset.
# WARNING: head commit changed in the meantime

Merge branch 'LDEV-5381' into v4.7

  1. … 1 more file in changeset.
LDEV-5277 Allow duplicate prefixes for LTI consumers

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

LDEV-5277 Allow duplicate prefixes for integrated servers

  1. … 1 more file in changeset.
LDEV-5375 Add AI configuration page

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

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java

  1. … 1 more file in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

  1. … 4 more files in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

  1. … 4 more files in changeset.
# WARNING: head commit changed in the meantime

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

  1. … 8 more files in changeset.
LDEV-1261 Skip empty row on admin import users

LDEV-5302 Fix access privileges for sysadmins

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

LDEV-1323 Allow empty user list in course

LDEV-5302 All sysadmins are also allowed to do appadmin actions

  1. … 10 more files in changeset.
Merge branch 'LDEV-5336' into v4.7

  1. … 2 more files in changeset.
LDEV-1323 Allow course enrolment with numerous users

Currently LAMS accepts 1000 form parameters at most. If there more than

1000 participants in a course (for example when an integration

incorrectly adds all semester of students to a course), then course

management panel becomes unusable: participants can not be added or

removed.

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

  1. … 30 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. … 4 more files in changeset.
LDEV-5335 Log adjustments and fixes

LDEV-5335 Log adjustments and fixes

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

  1. … 8 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-5330 Hide LDAP settings

They are rarely used and do not require rewriting at the moment.

LDEV-5330 Merge changes made for sysadmin

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

Monitoring UI.

  1. … 187 more files in changeset.