Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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 Fix Uppy and do adjustments to layout for Submit Files

  1. … 7 more files in changeset.
LDEV-5397 increase colour contrast

LDEV-5369 Fix Peer Review pivot rubrics results ordering

  1. … 32 more files in changeset.
LDEV-5399 Replacing old Bootstrap css classes with new ones

  1. … 1 more file in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

    • -412
    • +513
    ./WEB-INF/tags/StyledRating.tag
  1. … 32 more files in changeset.
LDEV-5399 Add image deprecated Bootstrap 3 classes to components.css

In Bootstrap 5.2, there are css classes that are not longer, that we used in the content templates.

For css classes that aren't in B 5.2, we've got to add the to our own css so we can keep learning designs created in previous LAMS versions backwards compatible.

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-5397 accessibility improvements on page structure

  1. … 2 more files in changeset.
LDEV-5398 Allow adding new QB collections in TBL wizard

LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

    • -30
    • +75
    ./includes/javascript/qb-question.js
    • -19
    • +26
    ./qb/authoring/addQuestionHeader.jsp
    • -213
    • +221
    ./qb/authoring/addessay.jsp
    • -107
    • +114
    ./qb/authoring/addtruefalse.jsp
  1. … 5 more files in changeset.
LDEV-5398 Prevent creating QB collections with duplicate name

  1. … 1 more file in changeset.
LDEV-5398 Check if creating QB collections is allowed

  1. … 2 more files in changeset.
LDEV-5397 UI improvements and accessibility fixes

  1. … 2 more files in changeset.
LDEV-5121 Allow choosing QB collection in TBL wizard

    • -352
    • +374
    ./authoring/template/tbl/tbl.jsp
  1. … 8 more files in changeset.
LDEV-5398 Allow creating new QB collections on the fly

    • -312
    • +350
    ./questions/questionChoice.jsp
  1. … 2 more files in changeset.
LDEV-5200 Fix arranging activities in author with support activities present

  1. … 1 more file in changeset.
LDEV-5397 Accessibility increase contrast

LDEV-5397 Add support activities in progress bar

  1. … 3 more files in changeset.
LDEV-5397 Improve accessibility and layout of rewritten Noticeboard learner UI

  1. … 6 more files in changeset.
LDEV-5397 Rewrite Noticeboard learner UI to Bootstrap 5.2

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

LDEV-5395 Add new progress bar

  1. … 50 more files in changeset.
LDEV-5395 Add main frame for learner UI

  1. … 53 more files in changeset.
LDEV-5395 Open learner UI in same tab instead of pop up

  1. … 2 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 33 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 33 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.