Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5402 Display path to Learning Design in authoring

  1. … 2 more files in changeset.
LDEV-5386 Library management

  1. … 70 more files in changeset.
LDEV-4199 Reintroduce group based branching monitoring page

It is difficult to determine which groups have been mapped to branches in monitoring and whether they are not broken. We needed a page to be able to review groupings.

    • -0
    • +40
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
  1. … 5 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

  1. … 6 more files in changeset.
LDEV-5350 Do not remove groups used for branching on spreadsheet upload

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

  1. … 11 more files in changeset.
LDEV-5363 Remove duplicate method

LDEV-5363 Add TBL course gradebook export

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

  1. … 43 more files in changeset.
LDEV-5358 Always sort groups by name, case insensitive

  1. … 6 more files in changeset.
# WARNING: head commit changed in the meantime

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

  1. … 8 more files in changeset.
LDEV-4341 Always save org grouping to top course

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

  1. … 9 more files in changeset.
LDEV-5354 Rename encoding methods so they can incorporate course ID

  1. … 2 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_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-5200 Add redirect in case integrations uses TBL monitoring URL

LDEV-5200 Add completed activities and lesson info on learners tab

  1. … 4 more files in changeset.
LDEV-5350 Fix issue with detecting groupings in LD

  1. … 1 more file in changeset.
LDEV-5350 Detect grouping on LD choice in Add Lesson dialog

  1. … 4 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

  1. … 9 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

  1. … 6 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.

  1. … 6 more files in changeset.
LDEV-5200 Add paging to learners tab in monitoring

LDEV-5200 Add paging to learners tab in monitoring

  1. … 2 more files in changeset.
LDEV-5338 Allow modifications to all kinds of groupings

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

  1. … 6 more files in changeset.
LDEV-5338 Rename class to reflect its purpose better

    • -0
    • +398
    ./lamsfoundation/lams/monitoring/web/GroupingController.java
    • -0
    • +532
    ./lamsfoundation/lams/monitoring/web/GroupingUploadController.java
  1. … 3 more files 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. … 32 more files in changeset.
LDEV-5341 Fix misleading alerts for standard role checks

  1. … 1 more file in changeset.
LDEV-5341 Refactor Security Service

  1. … 30 more files in changeset.