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_central/web/includes/javascript/orgGrouping.js

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

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

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

  1. … 5 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 19 more files in changeset.
LDEV-4932 Add CSRF to monitor and central

  1. … 50 more files in changeset.
LDEV-4791 Fix link to delete course grouping controller

LDEV-4440 Fix URLs in course grouping creation

  1. … 4 more files in changeset.
LDEV-4440 Central migration

  1. … 52 more files in changeset.
LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

  1. … 4 more files in changeset.
LDEV-4484 Print Grouping Page

  1. … 10 more files in changeset.
LDEV-3834: Fix groups to branches mapping dialog. Several other minor fixes.

  1. … 9 more files in changeset.
LDEV-4017: Bootstrap organisation (course) grouping and groups dialogs.

  1. … 9 more files in changeset.
LDEV-3834: Add course and branching groups mapping dialog.

  1. … 5 more files in changeset.
LDEV-3834: Fix JS method name.

LDEV-3834: Add course and branching groups mapping dialog.

  1. … 5 more files in changeset.
LDEV-3119: Cosmetic changes to course grouping interface.

  1. … 4 more files in changeset.
LDEV-3119: Cosmetic changes to course grouping interface.

  1. … 5 more files in changeset.
LDEV-3466: Make several more course and lesson management windows non-modal.

  1. … 7 more files in changeset.
LDEV-3466: Make several more course and lesson management windows non-modal.

  1. … 7 more files in changeset.
LDEV-3225: Remove grouping from contribution list if all learners were assigned to groups and can not move anymore. Remove chosen branching from contribution list (Sequence tab only) if all learners were assigned to branches. Fix bugs for Organisation Groups and Flashless Monitoring.

  1. … 6 more files in changeset.
LDEV-3120: Use course groups in lessons.

  1. … 11 more files in changeset.