Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4853 Fix Add Lesson button when choosing recent LD

LDEV-5428 Remove lesson presence and chat

  1. … 40 more files in changeset.
LDEV-4853 Add lesson on double-click in Add Lesson dialog

  1. … 1 more file in changeset.
LDEV-5342 Add LD modified date to Add Lesson dialogs

Also add a tooltip on the date

  1. … 4 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 338 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-4601 Modify date format for scheduling lesson start and end

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

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

  1. … 3 more files in changeset.
LDEV-5255 Fix Preview button in Add Lesson dialog for recent LDs

LDEV-5200 Clean up and comments

  1. … 8 more files in changeset.
LDEV-5200 Fix SVG resizing in Add Lesson dialog

  1. … 1 more file in changeset.
LDEV-2991 Fix NaN error in lesson instance calculation

When there are no learners allocated to a lesson, splitting lerners into

separate lesson produced a description with an error.

LDEV-5005 Add "recent learning designs" section to Add Lesson dialog

  1. … 2 more files in changeset.
LDEV-4975 Upgrade jquery to version 3.4.1

  1. … 16 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

  1. … 19 more files in changeset.
LDEV-4898 Fix race condition when generating a LD SVG

  1. … 1 more file in changeset.
LDEV-4879 Create lesson in subgroups at one go

  1. … 4 more files in changeset.
LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

  1. … 3 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

  1. … 28 more files in changeset.
LDEV-4804 Prevent Add Lesson button from being double clicked

  1. … 1 more file in changeset.
LDEV-4714 Fix SVG generation in Add Lesson and monitoring

  1. … 2 more files in changeset.
LDEV-4440 Small fixes after merge

  1. … 1 more file in changeset.
Merge Asia's and Michal's progress in core projects

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

  1. … 52 more files in changeset.
LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

  1. … 15 more files in changeset.
LDEV-4601 Removing debugging

LDEV-4601 Tweaking date validation and display of scheduled dates

  1. … 1 more file in changeset.
LDEV-4601 Schedule the end date when teacher creates a lesson.

  1. … 8 more files in changeset.
LDEV-4505 Learners identified by Lastname, Surname in Monitoring

  1. … 8 more files in changeset.