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. … 44 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

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

WEB-005

  1. … 37 more files in changeset.
LDEV-5349 Reintroduce zipped website as Shared Resource

    • -0
    • +108
    ./pages/authoring/parts/addwebsite.jsp
    • -1
    • +12
    ./pages/authoring/parts/itemlist.jsp
  1. … 10 more files in changeset.
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-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    ./WEB-INF/tags/FileUpload5.tag
  1. … 62 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

    • -0
    • +43
    ./WEB-INF/tags/Alert5.tag
  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
    • +534
    ./WEB-INF/tags/Page5.tag
    • -0
    • +53
    ./WEB-INF/tags/TSTable5.tag
    • -0
    • +105
    ./WEB-INF/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
    • +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.
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-5083 Fix popovers and rewrite tRAT tooltips to popovers

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

  1. … 181 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-5296 Improve CSS of embedded images and files

LDEV-5296 adding additional images and media previews

  1. … 2 more files in changeset.
LDEV-5296 Embed images and PDFs directly in Share Resources page

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

  1. … 32 more files in changeset.
LDEV-5287 Always use https to get embedded content

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

Conflicts:

lams_tool_assessment/web/pages/learning/learning.jsp

    • -110
    • +175
    ./pages/learning/learning.jsp
LDEV-5287 Add preview to Add URL box in learning

LDEV-5287 Cosmetic changes

Remove no-gutter from comments. Improved finished icon in SR

  1. … 1 more file 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-5287 Add preview to Add URL box in learning

LDEV-5287 No need to manually set embedded iframe height anymore