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.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

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

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 138 more files in changeset.
LDEV-5290 Identify tabs better when checking for multiple open tabs

A minimised window can skip setInterval() ticks. This lead to incorrect detection of multiple tabs open - a single open tab could produce this message.

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

  1. … 150 more files in changeset.
LDEV-5397 Enhanced mobile experience

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

# Conflicts:

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

  1. … 3 more files in changeset.
LDEV-5432 Confirm with learner whether he wants to submit answers

  1. … 1 more file in changeset.
LDEV-5397 fix initialization of buttons when Assessment is shown in TBL's iRAT tab

  1. … 2 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.
Merge v4.7 into LDEV-5397

  1. … 79 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. … 23 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-5397 bootstrap5 Rating.tag

Also some minor modifications to Assessment learning

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

- Assessment

  1. … 18 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5360' into v4.6

  1. … 3 more files in changeset.
LDEV-5366 Make auto expand configurable in Tool settings in sysadmin

Disabled by default

  1. … 7 more files in changeset.
LDEV-5366 Auto expand justification panel on first click

LDEV-5359 Do not show autosubmit tip to non-leaders

LDEV-5359 Do not enforce validation on section change

LDEV-5359 Add Assessment section learning

  1. … 6 more files in changeset.
LDEV-3265 Allow to skip required questions in Preview mode

  1. … 2 more files in changeset.
LDEV-4271 Improve layout of "answers may be disclosed" info panel

LDEV-5287 Do not refresh on item finish if no minimum items finished