Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SP-4 Fix user disabling after manager role removal

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-5302 All sysadmins are also allowed to do appadmin actions

  1. … 20 more files in changeset.
LDEV-5302 Fix access rights for appadmin

  1. … 1 more file in changeset.
LDEV-5338 Rename file to reflect its purpose better

  1. … 2 more files in changeset.
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 7 more files in changeset.
LDEV-5338 Rename class to reflect its purpose better

    • -0
    • +632
    ./org/lamsfoundation/lams/web/GroupingController.java
  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. … 29 more files in changeset.
LDEV-5341 Fix misleading alerts for standard role checks

  1. … 1 more file in changeset.
LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

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

  1. … 25 more files in changeset.
LDEV-5340 Return correct MIME type

LDEV-5340 Return correct MIME type

LDEV-5340 Allow video embedding from custom sites

  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/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. … 16 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

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

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

    • -11
    • +17
    ./org/lamsfoundation/lams/web/IndexController.java
  1. … 6 more files in changeset.
LDEV-5178 Skip password expiration check on login via integrations

    • -11
    • +17
    ./org/lamsfoundation/lams/web/IndexController.java
  1. … 2 more files in changeset.
LDEV-5334 Make shared collections available to authors

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

  1. … 13 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. … 54 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

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

rewritten.

  1. … 58 more files in changeset.
LDEV-5083 Use correct icon for monitoring

LDEV-5083 Remove link to old monitoring UI

It was broken anyway

LDEV-5324 Detect new question version as author changes its details

  1. … 14 more files in changeset.
LDEV-5320 Initial commits for audits

These are some initial commits that might change via Marcin's aspect approach.

  1. … 6 more files in changeset.
LDEV-5083 Apply LAMS colour palette to monitoring 5 UI

From Boostrap we keep gray colour.

Yellow does not have good contrast with white, but darker yellow looks

ugly. We need to make sure to use borders whenever we use yellow on

white background.

For Learning Design SVGs standard paletter is used with some opacity.

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

  1. … 2 more files in changeset.
LDEV-4617 Fix paths to JSP pages for verification email sent/confirmed