Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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 In Learners tab do not open activity pop up for gates

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-5200 Fix search field height

LDEV - 5348: Minor monitor improvements

- move count down timer to manage lesson

- Make class dialog bigger so no need to resize (given new font size)

    • -5
    • +5
    ./includes/javascript/monitorLesson.js
LDEV-5200 Make learner content wider

Max width of 1400 px is consistent with LDEV-5192

  1. … 34 more files in changeset.
LDEV-5200 Add pop ups and labels to learners tab

    • -2
    • +11
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-5083 Fix encoding issue in Learners tab

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-5346 General UI improvements TBL monitoring

Alignments, layout and labels

  1. … 11 more files in changeset.
LDEV-5200 Fix lesson renaming

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-5338 Rename class to reflect its purpose better

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

    • -0
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-4274 Fix learner progress reports "Send now" button

    • -0
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-5200 Use consistent dbl click handler on gate & grouping activities

    • -6
    • +20
    ./includes/javascript/monitorLesson.js
LDEV-5200 Remove obsolete "requires attention" icon click handler

    • -16
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-5200 Allow monitor JS script minimisation

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
  1. … 35 more files in changeset.
LDEV-4989 Recognise Password Gate as a gate for monitoring icons

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
LDEV-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    ./WEB-INF/tags/FileUpload5.tag
  1. … 62 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

    • -21
    • +3
    ./includes/javascript/monitorLesson.js
  1. … 15 more files in changeset.
LDEV-5332 Identify questions and options by display order

iRAT and tRAT activities should be based on same questions from Question

Bank, with same IDs. It is not always the case, especially when

importing exported LDs.

Now corresponding questions are identified by display order, which

should be the same in both RAT activities.

    • -20
    • +0
    ./tblmonitor/teamsOptionResultsCell.jsp
    • -10
    • +14
    ./tblmonitor/teamsQuestionResults.jsp
    • -23
    • +21
    ./tblmonitor/teamsQuestionResultsCell.jsp
  1. … 3 more files in changeset.
LDEV-5332 Add Question Results table in Teams tab

    • -0
    • +20
    ./tblmonitor/teamsOptionResultsCell.jsp
    • -0
    • +99
    ./tblmonitor/teamsQuestionResults.jsp
    • -0
    • +25
    ./tblmonitor/teamsQuestionResultsCell.jsp
  1. … 7 more files in changeset.
LDEV-5332 Drop support for MCQ as iRAT activity

  1. … 1 more file 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. … 187 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 Improve table and icons colouring

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

    • -2
    • +2
    ./emailnotifications/archivedEmailList5.jsp
    • -2
    • +2
    ./emailnotifications/lessonNotifications5.jsp
    • -2
    • +2
    ./emailnotifications/scheduledEmailList5.jsp
    • -23
    • +17
    ./gate/permissionGateContent.jsp
    • -924
    • +983
    ./includes/javascript/monitorLesson.js
    • -3137
    • +0
    ./includes/javascript/monitorLesson5.js
  1. … 45 more files in changeset.
LDEV-5083 Refactor new UI CSS files

    • -1
    • +4
    ./css/components-monitoring-responsive.css
    • -1075
    • +157
    ./css/components-monitoring.css
  1. … 3 more files in changeset.
LDEV-5083 On load update sequence tab only one

    • -1
    • +0
    ./includes/javascript/monitorLesson5.js