Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

  1. … 41 more files in changeset.
LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

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

Conflicts:

lams_admin/web/userChangePass.jsp

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

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

  1. … 43 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-3000 Secure access to QTI and Word question import pages

# WARNING: head commit changed in the meantime

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

  1. … 8 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 37 more files in changeset.
LDEV-4828 Secure access to other monitors' collections

WEB-001

  1. … 1 more file in changeset.
LDEV-3959 Secure access to CKEditor file manager view

WEB-002

LDEV-5330 adding font-awesome6 to web.xml

LDEV-5200 Add proper padding to larger learner content

Before the patch it overlapped with progress bar on the left.

  1. … 32 more files in changeset.
LDEV-5200 Make learner content wider

Max width of 1400 px is consistent with LDEV-5192

  1. … 34 more files in changeset.
LDEV-5338 Rename JS and CSS files to reflect changes in classes

  1. … 6 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

    • -0
    • +82
    ./tags/FileUpload5.tag
  1. … 18 more files in changeset.
LDEV-5329 Remove obsolete configuration items

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

  1. … 32 more files in changeset.
LDEV-5330 Merge changes made for tags

  1. … 200 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
    • +105
    ./tags/Widget.tag
  1. … 188 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. … 58 more files in changeset.
LDEV-5083 Add custom JSP tags than will be used in next version

    • -0
    • +29
    ./tags/PageComponent.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

  1. … 62 more files in changeset.
LDEV-5083 Add missing custom JSP tags to TLD

  1. … 32 more files in changeset.
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 Audit Login As feature

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

  1. … 8 more files in changeset.
LDEV-5304 Secure forgot password page

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

  1. … 181 more files in changeset.
Merge branch 'LDEV-5260' into v4.7

Conflicts:

lams_build/3rdParty.userlibraries

  1. … 8 more files in changeset.