Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

  1. … 52 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. … 519 more files in changeset.
LDEV-5397 switch from lams:errors to lams:errors5

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

  1. … 79 more files in changeset.
LDEV-5397 bootstrap5 doKu tool

  1. … 6 more files in changeset.
LDEV-5204 Fix leader finished detection

Also fix misleading session invalidated warnings

  1. … 4 more files in changeset.
LDEV-5397 display tooltip even though element is disabled

  1. … 3 more files in changeset.
LDEV-5414 Reattach message handlers to websocket after reconnect

  1. … 77 more files in changeset.
LDEV-5414 Refactor and improve resilience of websockets thorough LAMS

  1. … 132 more files in changeset.
LDEV-5404 Escape JS-breaking characters in i18n labels

  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. … 105 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-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
LDEV-5331 Add submission deadline to Doku and Whiteboard

  1. … 19 more files in changeset.
LDEV-5247 Fix user name parameter sent to Etherpad

LAMS allows apostrophes but not quotation marks in names, so it is safer

to use quotations when operating with javascript.

  1. … 33 more files in changeset.
LDEV-5223 Prevent ep_resize from rendering short initial Etherpad

  1. … 34 more files in changeset.
LDEV-5223 Fix Etherpad resizing

  1. … 33 more files in changeset.
LDEV-5219 Use versioned JS import for gate check JS file

  1. … 55 more files in changeset.
LDEV-5219 Check gate after Doku activity

  1. … 2 more files in changeset.
LDEV-5142 Fix endless refresh loop on time limit expire in Doku

LDEV-5142 Fix timing limits issues in Doku

  1. … 1 more file in changeset.
LDEV-5142 Introduce advanced time limits for Doku

  1. … 24 more files in changeset.
LDEV-5143 Allow changing leader in Dokumaran monitoring

  1. … 8 more files in changeset.
LDEV-5141 Correctly display Finish button to non-leaders

  1. … 1 more file in changeset.
LDEV-5141 Allow Author to always continue in Preview mode

  1. … 3 more files in changeset.
LDEV-5120 Add Gallery Walk instructions

  1. … 5 more files in changeset.
LDEV-5120 Add disabled Next buttons in Gallery Walk to avoid confusion

  1. … 2 more files in changeset.
LDEV-5127 Adjust reported pad height when toolbar is not displayed

  1. … 32 more files in changeset.