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. … 28 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-5436 Use comma as name separator

Also fix names in few other places.

  1. … 8 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-5424 bootstrap5 Leader tool's monitoring

    • -19
    • +28
    ./monitoring/changeLeaderDialog.jsp
    • -98
    • +0
    ./monitoring/changeLeaderDialog5.jsp
  1. … 3 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

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

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

  1. … 147 more files in changeset.
LDEV-5397 divs not having any special roles can't have aria-labels

  1. … 11 more files in changeset.
LDEV-5397 standartize the way modal-dialogs look like

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

  1. … 1 more file in changeset.
LDEV-5397 show warnings and nofications before activity's instructions

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

    • -192
    • +161
    ./learning/leaderselection.jsp
  1. … 79 more files in changeset.
LDEV-5397 bootstrap5 related improvements and fixes

  1. … 27 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 some minor UI improvements

  1. … 4 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

  1. … 95 more files in changeset.
LDEV-5397 simplify .lcard related CSS classes

* lcard's header is .lcard-header-lg by default now

* move rules from .lcard-no-borders and .shadow into .lcard class

* remove not used .nextActivity class

  1. … 11 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 remove href="#nogo" and similar nonexistant same-page link

Due to screenreader requirements we can no longer use links having href="#target" when a page does not have this corresponding target. There are a couple of techniques instead of it:

1. links' onclick event should end with "return false;" ("false" can be replaced with anything else but true)

It applies to onclick events specified as tag attributes as well as added with Javascript or jQuery

2. turn links into <button type="button">

3. <a data-bs-toggle="collapse"> having href="#nogo" are OK. presumably as their onclick events return false;

  1. … 7 more files in changeset.
LDEV-5397 update to LeaderSelection bootstrap 5

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-5397 migrate LeaderSelection tool to bootstrap 5

    • -116
    • +109
    ./learning/leaderselection.jsp
LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

  1. … 42 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 335 more files in changeset.
LDEV-5083 Rewrite TBL Teams tab modals to new UI

    • -0
    • +98
    ./monitoring/changeLeaderDialog5.jsp
  1. … 8 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 Leader Selection activity