lams_learning

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

    • -5
    • +10
    ./web/WEB-INF/tags/StyledRating.tag
  1. … 41 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java

  1. … 2 more files in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

  1. … 4 more files in changeset.
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

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

    • -4
    • +78
    ./web/WEB-INF/tags/StyledRating.tag
  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. … 43 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  1. … 37 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-5341 Add transaction support for all Security Service methods

  1. … 2 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-5083 Fix encoding issue in Learners tab

LDEV-5341 Refactor Security Service

  1. … 31 more files in changeset.
LDEV-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    ./web/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/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/WEB-INF/tags/Page5.tag
    • -0
    • +53
    ./web/WEB-INF/tags/TSTable5.tag
    • -0
    • +105
    ./web/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/WEB-INF/tags/Dropdown.tag
    • -0
    • +29
    ./web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./web/WEB-INF/tags/Panel.tag
  1. … 93 more files in changeset.
LDEV-5083 Add missing custom JSP tags

    • -0
    • +45
    ./web/WEB-INF/tags/Input.tag
    • -0
    • +46
    ./web/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-5083 Rewrite TBL Assessment AES disclose and discussion element

    • -0
    • +297
    ./web/discussion/monitor5.jsp
  1. … 6 more files in changeset.
LDEV-5083 Trigger Flux update on each activity entrance

Till now the update was triggered on activity completion. It is a better

approach, but it only worked on finishing tool activities. Gates and,

for example, Leader Selection activity were skipped and would not

trigger learner progress update.

Now update gets triggered on learner joining a lesson and traversing

through each activity, which is good enough. Emitted items get throttled

anyway.

  1. … 2 more files in changeset.
LDEV-4366 Fix Kumalive role detection

  1. … 1 more file in changeset.
LDEV-5081 Merge changes made for monitor in LDEV-5083

  1. … 36 more files in changeset.
LDEV-4769 Updating Chinese Traditional

    • -106
    • +207
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  1. … 28 more files in changeset.
LDEV-5083 Update learner progress timeline using Flux

  1. … 6 more files in changeset.
LDEV-5083 Update LD canvas and chart on learner joining a lesson

  1. … 5 more files in changeset.