Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Use rewritten alert (toast) and confirmation pop ups

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

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 10 more files in changeset.
LDEV-5397 Use custom activity icons in progress bar

  1. … 3 more files in changeset.
LDEV-5397 Learner profile picture opens picture upload, not all profile settings

  1. … 3 more files in changeset.
LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

  1. … 10 more files in changeset.
LDEV-5200 Fix arranging activities in author with support activities present

  1. … 1 more file in changeset.
LDEV-5397 Add support activities in progress bar

  1. … 3 more files in changeset.
LDEV-5396 Change default grouping type

LDEV-5395 Open learner UI in same tab instead of pop up

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

  1. … 6 more files in changeset.
LDEV-5283 Allow removing transitions in authoring with bin button

LDEV-5329 Fix reintroduced custom monitoring URL for LTI Advantage

LDEV-5329 Reintroduce custom monitoring URL for LTI Advantage

LDEV-5368 Add upload image plugin to CKEditor

  1. … 53 more files in changeset.
LDEV-5257 Remove outdated jQuery UI slider widget

WEB-008

It is a part of jQuery UI bundle anyway.

  1. … 2 more files in changeset.
LDEV-5257 Update jQuery UI from 1.13.0 to 1.13.2

WEB-008

LDEV-5257 Update jQuery from 3.6.0 to 3.6.3

WEB-008

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

  1. … 9 more files in changeset.
LDEV-5354 Show growl-like message on course URL copy to clipboard

  1. … 2 more files in changeset.
LDEV-5354 Move course URL copy button to More Options menu

  1. … 4 more files in changeset.
LDEV-5354 Add course URL on index page

  1. … 8 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.
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 Update Bootstrap to 5.2.3

It also addresses Sass warnings for missing units.

  1. … 39 more files in changeset.
LDEV-4853 Open LD tree view folder on click on its label too

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