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.
LDEV-5424 improvements to TBL monitor pages

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

  1. … 150 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

  1. … 5 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

  1. … 3 more files in changeset.
LDEV-5337 Add "return to monitoring button" to Team Setup screen

  1. … 3 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Monitoring

- Gradebook

  1. … 19 more files in changeset.
LDEV-5200, LKC-114 Reset Flux updating student choices on AE tab change

LDEV-5200 Always load student choices by default in AE monitoring view

LDEV-5346 General UI improvements TBL monitoring

Alignments, layout and labels

  1. … 11 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 19 more files in changeset.
LDEV-5332 Identify questions and options by display order

iRAT and tRAT activities should be based on same questions from Question

Bank, with same IDs. It is not always the case, especially when

importing exported LDs.

Now corresponding questions are identified by display order, which

should be the same in both RAT activities.

  1. … 3 more files in changeset.
LDEV-5332 Add Question Results table in Teams tab

    • -0
    • +20
    ./teamsOptionResultsCell.jsp
    • -0
    • +99
    ./teamsQuestionResults.jsp
    • -0
    • +25
    ./teamsQuestionResultsCell.jsp
  1. … 7 more files in changeset.
LDEV-5332 Drop support for MCQ as iRAT activity

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 51 more files in changeset.
LDEV-5083 Make Student Choices the default view in RAT and AE tabs

  1. … 1 more file in changeset.
LDEV-5083 Remove Gates tab

  1. … 3 more files in changeset.
LDEV-5083 Improve accessibility by allowing focus with TAB button

  1. … 4 more files in changeset.
LDEV-5083 Reduce empty spaces on TBL pages

  1. … 4 more files in changeset.
LDEV-5083 Fix gates buttons on Sequence tab

  1. … 2 more files in changeset.
LDEV-5083 Rewrite TBL Assessment AES tab to new UI

  1. … 7 more files in changeset.
LDEV-5083 Use same centering method in all TBL tabs

LDEV-5083 Rewrite TBL Gates tab and modals to new UI

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

  1. … 7 more files in changeset.
LDEV-5083 Rewrite Teams tab to Bootstrap 5

  1. … 2 more files in changeset.
LKC-89 Keep max-width and max-height between automatic LD refresh

LDEV-5081 Make "regular monitoring" button show old monitoring UI

LDEV-5081 Merge changes made for monitor in LDEV-5083

  1. … 35 more files in changeset.
LDEV-5242 Make regular monitor Assessment view consistent with TBL AE

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5223' into v4.5

  1. … 3 more files in changeset.