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.
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

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

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

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

  1. … 34 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

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

# Conflicts:

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

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/learning/results/allquestions.jsp

# lams_tool_assessment/web/pages/learning/results/allquestions5.jsp

  1. … 3 more files in changeset.
LDEV-5052 Prevent floating question description from hiding options

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

  1. … 150 more files in changeset.
LDEV-5397 make required item label more prominent

  1. … 6 more files in changeset.
LDEV-5397 minor CSS fixes

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

  1. … 13 more files in changeset.
LDEV-5397 show confidence levels' labels horizontally

  1. … 5 more files in changeset.
LDEV-5397 make CKEditor ARIA compliant

A new rule should be observed when CKEditor tag is used: either "ariaLabel" or "ariaLabelledby" attribute is required

  1. … 4 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. … 102 more files in changeset.
LDEV-5397 further migration of Assessment's learning to Bootstrap 5

  1. … 9 more files in changeset.
LDEV-5397 migrate Assessment's learning to Bootstrap 5

  1. … 24 more files in changeset.
LDEV-5397 add hidden labels for all links

Also some other minor fixes

  1. … 4 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. … 115 more files in changeset.
LDEV-5374 Add max mark information configuration in Assessment authoring

  1. … 5 more files in changeset.
LDEV-5374 Add max mark information to Assessment questions and results

  1. … 2 more files in changeset.
LDEV-5359 Add answered question count next to section name

  1. … 2 more files in changeset.
LDEV-5366 Move justification panel to question panel for visibility

LDEV-5359 Use default section name for blank names

  1. … 1 more file in changeset.
LDEV-5359 Add Assessment section learning

  1. … 6 more files in changeset.
LDEV-4271 Add Next/Previous Page buttons in paged Assessment learner

  1. … 1 more file in changeset.
LDEV-5309 Prevent numerical from submitting whole form on Enter button

LDEV-4875 Prevent VSA from submitting whole form on Enter button

LDEV-4385 List possible and chosen matching pairs answers

  1. … 3 more files in changeset.
LDEV-5268 Remove table hover as it ain't need it

LDEV-5268 Remove table hover as it ain't need it

LDEV-5268 Improve word count detection in essay questions

LDEV-5268 Add word counter to CKEditor essay question

Also improve warning message for plain text area.