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.
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5342 Show LD last modified date also in Save As dialog

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

Conflicts:

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

lams_central/web/includes/javascript/orgGrouping.js

  1. … 1 more file in changeset.
LDEV-3120 Use only subcourse learners when applying course grouping

  1. … 1 more file in changeset.
LDEV-5348 ease up the soft shadow for images in the templates

LDEV-5200 Make learner content wider

Max width of 1400 px is consistent with LDEV-5192

  1. … 34 more files in changeset.
LDEV-5200 Use consistent background colour in learner and monitor UIs

  1. … 2 more files in changeset.
LDEV-4901 Try to fix stale session left after integrations login

LDEV-5337 Fix grouping panel layout

LDEV-5338 Rename JS and CSS files to reflect changes in classes

    • -0
    • +833
    ./includes/javascript/groups.js
    • -833
    • +0
    ./includes/javascript/orgGroup.js
  1. … 1 more file in changeset.
LDEV-5338 Allow modifications to all kinds of groupings

  1. … 1 more file in changeset.
LDEV-5338 Rename file to reflect its purpose better

  1. … 1 more file in changeset.
LDEV-5338 Rename paths to reflect grouping flow better

  1. … 4 more files in changeset.
LDEV-5343 adding boundaries to CKEditor tabs widget

  1. … 1 more file in changeset.
LDEV-5337 Rewrite Org Groupings view to Bootstrap 5 and LAMS palette

    • -0
    • +50
    ./css/orgGrouping.css
    • -67
    • +54
    ./includes/javascript/orgGrouping.js
  1. … 1 more file in changeset.
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. … 34 more files in changeset.
LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

  1. … 1 more file in changeset.
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.

    • -5
    • +6
    ./includes/javascript/ckconfig_custom.js
LDEV-5340 Allow video embedding from custom sites

    • -1
    • +17
    ./includes/javascript/ckconfig_custom.js
  1. … 1 more file in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

    • -0
    • +82
    ./WEB-INF/tags/FileUpload5.tag
    • -78
    • +49
    ./includes/javascript/orgGroup.js
  1. … 10 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-3115 Make sure that activity selection box is not in LD SVG

LDEV-5178 Skip password expiration check on login via integrations

  1. … 2 more files in changeset.
LDEV-5333 Move HTML templates from WWW to Central folder

    • -0
    • +887
    ./templates/gradebookReleaseLessonMarksEmailTemplate.html
    • -0
    • +643
    ./templates/userImportPasswordChangeEmailTemplate.html
  1. … 5 more files in changeset.
LDEV-5334 Make shared collections available to authors

  1. … 4 more files in changeset.
LDEV-5329 Remove obsolete configuration items

  1. … 3 more files in changeset.
LDEV-5273 Do not show non-existent QB option on VSA allocate screen

    • -32
    • +35
    ./qb/vsa/vsaQuestionAllocate.jsp
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.