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. … 30 more files in changeset.
LDEV-5424 boostrap5 Peerreview tool's monitoring

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

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

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

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

  1. … 19 more files in changeset.
LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

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

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

  1. … 150 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. … 10 more files in changeset.
LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

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

  1. … 23 more files in changeset.
LDEV-5083 Properly close each group accordion item in TBL summary

LDEV-4233 Prevent checkbox event from triggering multiple times

    • -128
    • +130
    ./monitoring/manageUsers.jsp
LDEV-5412 fix wrong calculation of assigned evaluations

  1. … 2 more files in changeset.
LDEV-5397 bootstrap5 related improvements and fixes

  1. … 27 more files in changeset.
LDEV-5397 minor changes to Peer Review UI

  1. … 2 more files in changeset.
LDEV-5397 show question descriptions inside card-body instead of card-header

  1. … 6 more files in changeset.
LDEV-5397 replace "container-lg" with custom "container-main" class

so it will be easier switching between container's classes in the future if needed

  1. … 21 more files in changeset.
LDEV-5397 fix a few bootstrap5 related issues

  1. … 10 more files in changeset.
LDEV-5397 make formActionUrl attribute non required

  1. … 6 more files in changeset.
LDEV-5397 switch to portrait5.js

  1. … 3 more files in changeset.
LDEV-5397 Make Peerreview ARIA compliant

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

  1. … 7 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. … 95 more files in changeset.
LDEV-5397 remove obsolete jsps

  1. … 10 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. … 111 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Peer evaluation

  1. … 1 more file in changeset.