Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_tool_sbmt/web/learner/sbmtlearner.jsp

  1. … 7 more files in changeset.
LDEV-5397 remove obsolete jsps

  1. … 10 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Share resources

  1. … 7 more files in changeset.
LDEV-5397 further bootstrap 5 related changes

Also

* change bootstrap classes from col-*-offset-* to offset-*-

* deprecated form-group

* .hidden-xs to .d-none .d-sm-block

* .pull-left to .float-start

* .pull-right to .float-end

* add class="activity-bottom-buttons"

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

  1. … 335 more files in changeset.
LDEV-5287 Fix preview iframe covering other Add URL controls

LDEV-4917 Escape Uppy error message

Otherwise messages with apostrophe break file upload.

  1. … 6 more files in changeset.
LDEV-5349 Reintroduce zipped website as Shared Resource

    • -0
    • +108
    ./authoring/parts/addwebsite.jsp
  1. … 10 more files in changeset.
LDEV-5298 Improve Uppy and Submit Files UI

Uppy font globally is smaller.

In Submit Files the upload area is thinner and has a distinct

background. The upload button matches its colour.

Fix Uppy language detection in Submit Files.

  1. … 16 more files in changeset.
LDEV-5296 Improve CSS of embedded images and files

LDEV-5296 adding additional images and media previews

  1. … 2 more files in changeset.
LDEV-5296 Embed images and PDFs directly in Share Resources page

  1. … 2 more files in changeset.
LDEV-5287 Always use https to get embedded content

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

Conflicts:

lams_tool_assessment/web/pages/learning/learning.jsp

LDEV-5287 Add preview to Add URL box in learning

LDEV-5287 Cosmetic changes

Remove no-gutter from comments. Improved finished icon in SR

  1. … 1 more file in changeset.
LDEV-5287 Add preview to Add URL box in learning

LDEV-5287 Improve "open in new window" link and icon layout

  1. … 1 more file in changeset.
LDEV-5287 Fix preview in authoring

LDEV-5287 Cosmetic changes

  1. … 1 more file in changeset.
LDEV-5287 Fix Open in New Window button

LDEV-5287 Show ratings and comments in author preview mode

  1. … 2 more files in changeset.
LDEV-5287 Put preview into a panel

LDEV-5287 Put URL form field above Title.

LDEV-5287 Fill blank item title with embedded content title on fetch

LDEV-5287 Use JS function for URL encoding instead of back end

  1. … 2 more files in changeset.
LDEV-5287 Use icon for preview button in Share Resources authoring

LDEV-5287 Add preview to Add URL page in Share Resources authoring

  1. … 1 more file in changeset.
LDEV-5287 Display Finish button on completing enough items

  1. … 1 more file in changeset.
LDEV-5287 Improve "preview" buttons in authoring

  1. … 2 more files in changeset.