Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5200 Fix lesson renaming

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

LDEV-4274 Fix learner progress reports "Send now" button

LDEV-5200 Use consistent dbl click handler on gate & grouping activities

LDEV-5200 Remove obsolete "requires attention" icon click handler

LDEV-5200 Allow monitor JS script minimisation

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. … 35 more files in changeset.
LDEV-4989 Recognise Password Gate as a gate for monitoring icons

LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 19 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. … 58 more files in changeset.
LDEV-5083 On load update sequence tab only one

LDEV-5083 Clear completed learner icons before re-adding them

LDEV-5083 Move timing limits from Lesson Completion to Required Tasks

It makes more sense to keep them there.

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

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

  1. … 4 more files in changeset.
LDEV-5083 Add Lesson Instructions panel

  1. … 2 more files in changeset.
LDEV-5083 Add started / total learners count to Lesson Completion panel

  1. … 2 more files in changeset.
LDEV-5083 Fix mark editing in Gradebook

  1. … 1 more file in changeset.
LDEV-5083 Always show number of learners in tool activity

LDEV-5083 Fix disappearing searched learner icon

LDEV-5083 Remove Other button in left navigation bar

  1. … 2 more files in changeset.
LDEV-5083 Move Live Edit button Edit Lesson panel

  1. … 3 more files in changeset.
LDEV-5083 Remove Gates tab

  1. … 3 more files in changeset.
LDEV-5083 Improve Gates control on Sequence tab

  1. … 1 more file in changeset.
LDEV-5083 Fix various layout issues

This patch covers most of issues raised the UX designer.

  1. … 10 more files in changeset.
LDEV-5083 Fix "more learners" dialog layout

  1. … 1 more file in changeset.
LDEV-5083 Fix learner dragging on canvas SVG

  1. … 1 more file in changeset.
LDEV-5083 Refactor monitor JS code

  1. … 3 more files in changeset.
LDEV-5083 Hide student search widget on tabs where it can not be used

LDEV-5083 Remember last opened tab when refreshing

  1. … 1 more file in changeset.