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/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-5339 Remove duplicate Signup Page delete button

LDEB-5335 Add structured audit logs on various admin actions

  1. … 22 more files in changeset.
LDEV-5330 Fix broken link for Cancel button

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

  1. … 6 more files in changeset.
LDEV-5330 Improve accessibility by adding labels to buttons and inputs

  1. … 27 more files in changeset.
LDEV-5330 Fix breadcrumbs for some sysadmin pages

LDEV-5330 Merge changes made for tags

    • -0
    • +43
    ./WEB-INF/tags/Alert5.tag
  1. … 192 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5330

Conflicts:

lams_admin/web/policies/policyTable.jsp

  1. … 3 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.

    • -0
    • +534
    ./WEB-INF/tags/Page5.tag
    • -0
    • +53
    ./WEB-INF/tags/TSTable5.tag
    • -0
    • +105
    ./WEB-INF/tags/Widget.tag
  1. … 177 more files in changeset.
LDEV-5320 Include policyStateId when toggling

Merge 4.6 into 4.7

  1. … 7 more files in changeset.
LDEV-5326, LDEV-5327 Secure requests to sysadmin clean up functions

  1. … 2 more files in changeset.
LDEV-5326, LDEV-5327 Move buttons to right

  1. … 1 more file in changeset.
LDEV-5327 Add run Garbage Collector button

  1. … 3 more files in changeset.
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-5083 Add custom JSP tags than will be used in next version

    • -0
    • +40
    ./WEB-INF/tags/Dropdown.tag
    • -0
    • +29
    ./WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./WEB-INF/tags/Panel.tag
  1. … 93 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

  1. … 4 more files in changeset.
LDEV-5083 Add missing custom JSP tags

    • -0
    • +45
    ./WEB-INF/tags/Input.tag
    • -0
    • +46
    ./WEB-INF/tags/Switch.tag
  1. … 62 more files in changeset.
LDEV-5083 Add missing custom JSP tags to TLD

  1. … 32 more files in changeset.
LDEV-4995 Add missing course manager role info at course edit screen

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

  1. … 4 more files in changeset.
LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

  1. … 36 more files in changeset.
LDEV-5320 Rename security filter to audit filter

  1. … 4 more files in changeset.
LDEV-5320 Add security logger

It logs calls to Spring controllers in Admin module.

  1. … 3 more files in changeset.
LDEV-5318 Fix paths and error messages in course edit form

LDEV-5302 Assign correct privileges to Course Admin

LDEV-4440 Fix organisation edit screen links

LDEV-4078 Group manager should be able to save user details