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

LDEV-5311 Send emails with password change link on user import

  1. … 9 more files in changeset.
LDEV-5303 Increase max length for passwords

Increase max length for passwords to 50 characters

  1. … 2 more files in changeset.
LDEV-5302 Appadmins need to have 2FA on

Only sysadmin can turn off 2FA to appadmins

  1. … 4 more files in changeset.
LDEV-5302 Login As feature is available only for sysadmins

  1. … 2 more files in changeset.
LDEV-5302 Introduce new sysadmin role with extra privileges

  1. … 36 more files in changeset.
LDEV-5302 Rename sysadmin role to appadmin

  1. … 167 more files in changeset.
LDEV-5298 Improve Uppy and Submit Files UI

Uppy font globally is smaller.

In Submit Files the upload area is thinner and has a distinct

background. The upload button matches its colour.

Fix Uppy language detection in Submit Files.

  1. … 16 more files in changeset.
LDEV-5290 Improve detection of multiple tabs being open on autosave

  1. … 32 more files in changeset.
LDEV-5287 Allow multiple collapsible Comment tags on a single page

If one folded panel gets expanded, all other ones get collapsed and

emptied.

  1. … 32 more files in changeset.
LDEV-5288 Remove timezone editing panel.

Selecting server timezone stays.

  1. … 4 more files in changeset.