Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

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

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 29 more files in changeset.
LDEV-5424 boostrap5 Mindmap's monitoring

  1. … 2 more files in changeset.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 25 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

  1. … 30 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 28 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

  1. … 22 more files in changeset.
LDEV-5442 rename Rating5.tag -> Rating.tag

  1. … 42 more files in changeset.
LDEV-5442 make monitoring use new starability widget

  1. … 23 more files in changeset.
LDEV-5442 switch learning to the new star rating widget

  1. … 21 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 149 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 512 more files in changeset.
LDEV-5397 divs not having any special roles can't have aria-labels

  1. … 11 more files in changeset.
LDEV-5397 make sure all buttons have proper "type" attribute

  1. … 24 more files in changeset.
LDEV-5397 show warnings and nofications before activity's instructions

  1. … 14 more files in changeset.
LDEV-5397 switch from lams:errors to lams:errors5

  1. … 15 more files in changeset.
LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

  1. … 49 more files in changeset.
Merge v4.7 into LDEV-5397

  1. … 79 more files in changeset.
LDEV-5397 various improvements

  1. … 3 more files in changeset.
LDEV-5415 Allow skipping Gallery Walk

  1. … 15 more files in changeset.
LDEV-5397 miscellaneous minor UI fixes

  1. … 5 more files in changeset.
LDEV-5397 bootstrap5 Mindmap tool

  1. … 4 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

  1. … 95 more files in changeset.
LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

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

- Mindmap

  1. … 7 more files in changeset.
LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

    • -62
    • +10
    ./learning/submissionDeadline.jsp
  1. … 81 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. … 113 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 330 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-5331 Add missing title and autocomplete attr to submission deadline

  1. … 18 more files in changeset.
LDEV-5235 Fix a typo in attribute building