Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  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.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 19 more files in changeset.
LDEV-5335 Log adjustments and fixes

  1. … 8 more files in changeset.
LDEB-5335 Add structured audit logs on various admin actions

  1. … 22 more files in changeset.
LDEV-5332 Identify questions and options by display order

iRAT and tRAT activities should be based on same questions from Question

Bank, with same IDs. It is not always the case, especially when

importing exported LDs.

Now corresponding questions are identified by display order, which

should be the same in both RAT activities.

  1. … 5 more files in changeset.
LDEV-5332 Add Question Results table in Teams tab

  1. … 10 more files in changeset.
LDEV-5332 General clean up

  1. … 6 more files in changeset.
LDEV-5332 Drop support for MCQ as iRAT activity

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 56 more files in changeset.
LDEV-5083 Update time limits on dashboard using Flux

  1. … 6 more files in changeset.
LDEV-5083 Add frontend for displaying running time limits in lesson

  1. … 4 more files in changeset.
LDEV-5083 Add backend for fetching running time limits in lesson

  1. … 6 more files in changeset.