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 boostrap5 Mindmap's monitoring

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

  1. … 26 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 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-5415 Allow skipping Gallery Walk

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

- Mindmap

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

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

WEB-005

  1. … 52 more files in changeset.
LDEV-5235 Fix a typo in attribute building

LDEV-5235 Show Mindmap in monitoring for multiuser, non-grouped mode

LDEV-5225 Improve Gallery Walk monitoring layout. Add labels.

  1. … 1 more file in changeset.
Merge branch 'LDEV-5225' into LDEV-5228

LDEV-5225 Expand Gallery Walk panel in monitoring for ratings

LDEV-5228 Add print button to Mindmap

  1. … 6 more files in changeset.
LDEV-5225 Envelop Gallery Walk monitoring info into panel

  1. … 1 more file in changeset.
LDEV-5225 Add Mindmap Gallery Walk missing monitoring file code

LDEV-5225 Add Mindmap Gallery Walk ratings in monitoring

  1. … 5 more files in changeset.
LDEV-5225 Add Mindmap Gallery Walk controls in monitoring

  1. … 5 more files in changeset.
LDEV-4932 Secure setting submission deadline with CSRF Guard

  1. … 63 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 391 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

  1. … 97 more files in changeset.
LDEV-4440 Fixed authoring and mapjs

  1. … 13 more files in changeset.
LDEV-4440 Fixed saving at authoring, noStruts

  1. … 9 more files in changeset.
LDEV-4440 Started migration of mindmap - action into controllers, tiles into clear jsp

  1. … 61 more files in changeset.