lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5342 Fix fetching LD modified date when no user is logged in

LDEV-5200 Use consistent dbl click handler on gate & grouping activities

LDEV-5200 Remove obsolete "requires attention" icon click handler

LDEV-5200 Allow monitor JS script minimisation

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. … 21 more files in changeset.
LDEV-5341 Fix misleading alerts for standard role checks

Merge branch 'LDEV-5342' into v4.6

LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

    • -1
    • +2
    /lams_central/web/authoring/authoring.jsp
Merge branch 'LDEV-5341' into v4.6

LDEV-5341 Refactor Security Service

  1. … 21 more files in changeset.
LDEV-5340 Return correct MIME type

LDEV-5340 Return correct MIME type

LDEV-4769 Updating English (AU), Spanish, Greek, Norwegian, Chinese and French

Merge branch 'LDEV-5340' into v4.6

LDEV-3265 Allow to skip required questions in Preview mode

LDEV-5317 Fix time limit widget on doKu summary page

LDEV-4989 Recognise Password Gate as a gate for monitoring icons

LDEV-5317 Fix time limit widget in TBL monitoring tRAT

LDEV-5340 Do additional escaping for commented out properties

Controller does not understand that an example property is commented out

in JavaScript and still parses it.

LDEV-4900 Copy answers to non-leader on force complete Assessment

LDEV-5340 Allow video embedding from custom sites

LDEV-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    /lams_admin/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_gradebook/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_learning/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_monitoring/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +82
    /lams_tool_assessment/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +82
    /lams_tool_chat/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_tool_daco/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +82
    /lams_tool_doku/web/WEB-INF/tags/FileUpload5.tag
  1. … 49 more files in changeset.
Merge branch 'LDEV-5337' into v4.7

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

Conflicts:

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

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

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.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/integration/ltiConsumerList.jsp

lams_admin/web/signupmanagement/list.jsp

LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

    • -0
    • +82
    /lams_central/web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +66
    /lams_central/web/css/orgGroup.css
    • -146
    • +0
    /lams_central/web/css/orgGroup.scss
    • -78
    • +49
    /lams_central/web/includes/javascript/orgGroup.js
    • -184
    • +207
    /lams_central/web/orgGroup.jsp
  1. … 5 more files in changeset.
Merge branch 'LDEV-5339' into v4.6

LDEV-5339 Remove duplicate Signup Page delete button

    • -1
    • +0
    /lams_admin/web/signupmanagement/list.jsp
Merge branch 'LDEV-5335' into v4.6

LDEV-5335 Log adjustments and fixes

LDEV-5335 Log adjustments and fixes