Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 52 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 37 more files in changeset.
LDEV-4271 Add Next/Previous Page buttons in paged Assessment learner

  1. … 1 more file in changeset.
LDEV-5200, LKC-111 Fix iRAT student choices table update

    • -9
    • +6
    ./pages/monitoring/parts/mcqStudentChoices5.jsp
LDEV-5200, LKC-107 Add "student choices" button to AE panels

    • -11
    • +15
    ./pages/tblmonitoring/assessment.jsp
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

    • -1
    • +21
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
  1. … 11 more files in changeset.
LDEV-5351 Use Boostrap tooltips instead of plain HTML titles

    • -0
    • +6
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -2
    • +7
    ./pages/monitoring/parts/questionsummary.jsp
    • -2
    • +8
    ./pages/monitoring/parts/usersummary.jsp
LDEV-5352 Slightly improve UI

    • -9
    • +15
    ./pages/monitoring/parts/mcqStudentChoices5.jsp
LDEV-5352 Use colours in question column, not in options columns

    • -11
    • +32
    ./pages/monitoring/parts/mcqStudentChoices5.jsp
LDEV-5352 Add traffic lights colours to iRAT students' choices table

    • -3
    • +14
    ./pages/monitoring/parts/mcqStudentChoices5.jsp
  1. … 1 more file in changeset.
LDEV-5351 Add marking teacher front end

    • -1
    • +15
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -1
    • +28
    ./pages/monitoring/parts/questionsummary.jsp
    • -2
    • +22
    ./pages/monitoring/parts/usersummary.jsp
  1. … 2 more files in changeset.
LDEV-5200 Fix encoding in Assessment chart

LDEV-5200 Fix encoding in Assessment chart

  1. … 1 more file 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-5346 General UI improvements TBL monitoring

Alignments, layout and labels

  1. … 10 more files in changeset.
LDEV-5344 point to the correct table part

The jsp initially is loading the correct .jsp, but then java is returning the wrong path

  1. … 1 more file in changeset.
LDEV-5331 Add missing title and autocomplete attr to submission deadline

    • -0
    • +1
    ./pages/learning/submissionDeadline.jsp
    • -1
    • +1
    ./pages/monitoring/parts/dateRestriction.jsp
  1. … 16 more files in changeset.
LDEV-3265 Allow to skip required questions in Preview mode

  1. … 2 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-5336 Add table with all learners' results

    • -2
    • +2
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -144
    • +171
    ./pages/monitoring/summary.jsp
  1. … 7 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 Change name and icon of "Hide Student Choices" button

  1. … 5 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.

    • -1
    • +1
    ./pages/monitoring/parts/discloseAnswers5.jsp
    • -29
    • +25
    ./pages/tblmonitoring/assessment.jsp
    • -75
    • +0
    ./pages/tblmonitoring/assessment5.jsp
    • -127
    • +125
    ./pages/tblmonitoring/teams.jsp
    • -148
    • +0
    ./pages/tblmonitoring/teams5.jsp
  1. … 50 more files in changeset.
LDEV-5324 Do not call missing function on validation success

  1. … 3 more files in changeset.
LDEV-5083 Make Assessment charts colours consistent with new UI