lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4746 Show all correct answers in AE tab in monitoring

LKC-221 Set question mark when replacing question from QA

LDEV-3600 Display learner even if current activity is marked as complete

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

    • -3
    • +3
    /lams_central/web/WEB-INF/tags/Page.tag
    • -2
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -3
    • +3
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_gradebook/web/releaseLessonMarks.jsp
    • -3
    • +3
    /lams_learning/web/WEB-INF/tags/Page.tag
  1. … 30 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5357

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

    • -3
    • +3
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
    • -3
    • +3
    /lams_tool_nb/web/WEB-INF/tags/Page.tag
  1. … 14 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

    • -3
    • +3
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +1
    /lams_central/web/passwordChangeContent.jsp
  1. … 38 more files in changeset.
LDEV-3000 Secure access to QTI and Word question import pages

Merge branch 'LDEV-5358' into v4.6

LDEV-5358 Always sort groups by name, case insensitive

# WARNING: head commit changed in the meantime

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

    • -1
    • +1
    /lams_admin/web/import/importGroups.jsp
    • -1
    • +1
    /lams_admin/web/import/importexcel.jsp
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

  1. … 42 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

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

WEB-005

    • -1
    • +1
    /lams_admin/web/import/importGroups.jsp
    • -1
    • +1
    /lams_admin/web/import/importexcel.jsp
    • -4
    • +3
    /lams_central/web/authoringConfirm.jsp
    • -2
    • +2
    /lams_central/web/qb/importQuestionsXml.jsp
  1. … 23 more files in changeset.
LDEV-1261 Skip empty row on admin import users

LDEV-5257 Remove outdated jQuery UI slider widget

WEB-008

It is a part of jQuery UI bundle anyway.

LDEV-5257 Update jQuery UI from 1.13.0 to 1.13.2

WEB-008

LDEV-5257 Update jQuery from 3.6.0 to 3.6.3

WEB-008

LDEV-4832 Secure access to editing QB question

WEB-006

LDEV-4828 Secure access to other monitors' collections

WEB-001

LDEV-3959 Secure access to CKEditor file manager view

WEB-002

LDEV-4341 Always save org grouping to top course

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

LDEV-5174, SP-412 Count but don't skip incorrect MCQ attempts

LDEV-5174, SP-412 Count but don't skip incorrect MCQ attempts

LDEV-5200, LKC-114 Reset Flux updating student choices on AE tab change

    • -0
    • +3
    /lams_monitoring/web/tblmonitor/aes.jsp
LDEV-5200 Always load student choices by default in AE monitoring view

    • -4
    • +4
    /lams_monitoring/web/tblmonitor/aes.jsp
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5204, UMAN-16 After load prefix author so steps can not be undone

    • -0
    • +1523
    /lams_build/conf/whiteboard/src/js/whiteboard.js
LDEV-5204, UMAN-16 Make buttons on iPad smaller

    • -1
    • +3
    /lams_build/conf/whiteboard/readme.txt
    • -0
    • +216
    /lams_build/conf/whiteboard/src/css/main.css