Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 12 more files in changeset.
LDEV-5348 improve course buttons layout

LDEV-5348 hide excess txt in btn

LDEV-5348 Update to new logo

  1. … 2 more files in changeset.
LDEV-4601 Modify date format for scheduling lesson start and end

LDEV-5324 Allow creating essay questions new versions

LDEV-5350 Detect grouping on LD choice in Add Lesson dialog

  1. … 2 more files in changeset.
LDEV-5350 Add grouping preview and group count to Add Lesson dialog

  1. … 1 more file in changeset.
LDEV-5330 adding font-awesome6 to web.xml

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

LDEV-5350 Add Course Grouping selection to Add Lesson dialog

  1. … 10 more files in changeset.
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/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

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

    • -105
    • +94
    ./includes/javascript/groups.js
  1. … 4 more files in changeset.
LDEV-3119 Any org super user can edit course groupings

Till now only Course Manager could edit Course Groupings. It is an

unnecessary limitation. Plus integrations set only monitor and author

roles in course, never course manager. And some universities would like

to be able to work with course groupings.

    • -103
    • +92
    ./includes/javascript/orgGroup.js
  1. … 4 more files in changeset.
LDEV-5200 Update Bootstrap to 5.2.3

It also addresses Sass warnings for missing units.

  1. … 25 more files in changeset.
LDEV-4853 Open LD tree view folder on click on its label too

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.