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

# Conflicts:

# lams_admin/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

# lams_gradebook/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/css/components-learner.scss

# lams_monitoring/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

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

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

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

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

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

# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/WEB-INF/tags/PageLearner.tag

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

# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

# lams_tool_task/web/WEB-INF/tags/PageLearner.tag

# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

# lams_www/web/WEB-INF/tags/PageLearner.tag

  1. … 13 more files in changeset.
LDEV-5449 Add "allow answer rating" option in learning

LDEV-5442 rename Rating5.tag -> Rating.tag

  1. … 42 more files in changeset.
LDEV-5442 teachers can't rate

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

  1. … 21 more files in changeset.
LDEV-5397 solve the problem with additional scrollbar in Brave browser

  1. … 8 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. … 105 more files in changeset.
LDEV-5397 bootstrap5 discussion sentiment

  1. … 5 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. … 34 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. … 116 more files in changeset.
LDEV-5157 Reorganise and add programming languages support

Added C, Objective C, C++, C#, Skala and Kotlin.

  1. … 8 more files in changeset.
LDEV-5157 Colour code syntax of students' answers in monitoring

  1. … 10 more files in changeset.
LDEV-5157 Colour code syntax of disclosed answers in Assessment

  1. … 1 more file in changeset.
LDEV-5157 Colour code syntax on Assessment results page

  1. … 2 more files in changeset.
LDEV-5097 Skip empty sessions for rating calculation

  1. … 1 more file in changeset.
LDEV-5097 Skip empty sessions for rating calculation

  1. … 1 more file in changeset.
LDEV-5025 Reset rating permission before each question

Otherwise subsequent questions also allow rating while they should not

yet.

LDEV-5100 Hide refresh button for TBL monitor in Assessment essay rating

LDEV-5097 Embed teacher's view of Assessment result in TBL monitoring

  1. … 4 more files in changeset.
LDEV-5097 Prepare a teacher's view of Assessment result

  1. … 9 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

  1. … 3 more files in changeset.
LDEV-5052 Make "not disclosed" info print out in italics

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 34 more files in changeset.
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 33 more files in changeset.
LDEV-5025 Put proper text information when answers not yet disclosed

  1. … 1 more file in changeset.
LDEV-5025 Show own group ratings only when rated other groups

  1. … 2 more files in changeset.
LDEV-5025 Highlight own group when displaying Assessment answer rating

  1. … 1 more file in changeset.
LDEV-5025 Allow rating only for Leaders

LDEV-5025 Show rating for the given team's own answer

  1. … 1 more file in changeset.