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 switch to using lams:TSTable5 tag

  1. … 7 more files in changeset.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 25 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

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

  1. … 28 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

  1. … 23 more files in changeset.
LDEV-5442 make monitoring use new starability widget

  1. … 23 more files in changeset.
LDEV-5436 Fix marks table sorting in Doku and Whiteboard

There was never first or last name or marks sorting implemented. Just full name, ascending or descending.

  1. … 4 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. … 517 more files in changeset.
LDEV-5415 Allow skipping Gallery Walk

  1. … 15 more files in changeset.
LDEV-5397 bootstrap5 Whiteboard tool

  1. … 16 more files in changeset.
LDEV-5404 Properly close tags

LDEV-5404 Properly close tags

LDEV-5404 Escaping funny characters that break js

- Whiteboard

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

  1. … 338 more files in changeset.
LDEV-5401 Add learner-triggered absolute timer to other tools

  1. … 42 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

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

    • -0
    • +36
    ./dateRestriction.jsp
  1. … 18 more files in changeset.
LDEV-5317 Fix thread preventing server from shutting down

Using <c:import> in cross-module context prevents WildFly from shutting

down properly. The mechanism was replaced with an Ajax call.

  1. … 10 more files in changeset.
LDEV-5317 Move timeLimit.jsp from its own directory

  1. … 6 more files in changeset.
LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

  1. … 28 more files in changeset.
LDEV-5225 Improve Whiteboard Gallery Walk monitoring layout.

  1. … 2 more files in changeset.
LDEV-5222 Allow reediting answers within Gallery Walk in Whiteboard

  1. … 6 more files in changeset.
LDEV-5222 Allow activity reedit after Gallery Walk was finished

  1. … 3 more files in changeset.
LDEV-5222 In Whiteboard allow learner reedit after Gallery Walk started

  1. … 4 more files in changeset.
LDEV-5210 Allow optional Whiteboard ID prefix

  1. … 14 more files in changeset.
LDEV-5204 Add show/hide full screen in monitoring

  1. … 1 more file in changeset.
LDEV-5204 Add show/hide full screen in authoring and learning

  1. … 4 more files in changeset.
LDEV-5204 Correctly construct API URLs for proxied Whiteboard server

  1. … 4 more files in changeset.