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.
LAI-9 Hide "AI review all" button when if are no learners' results yet

  1. … 1 more file in changeset.
Merge branch 'LAI-9' into v4.8

# Conflicts:

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

# lams_tool_doku/web/pages/monitoring/summary.jsp

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

  1. … 26 more files in changeset.
LAI-9 Use and store JSON for AI reviews

  1. … 1 more file 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.
LAI-9 Add comparison tables based on Doku AI reviews

Move AI JS code to separate file

  1. … 1 more file 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.
LAI-9 Make AI learning outcomes persistent

  1. … 4 more files in changeset.
LAI-9 Extract learning outcomes from LD and activity descriptions

  1. … 2 more files in changeset.
LAI-9 Make AI-generated reviews persistent

  1. … 5 more files in changeset.
LAI-9 Use fixed criteria and HTML formatting to produce Doku AI review

  1. … 1 more file 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.
LAI-9 Add AI review API calls

  1. … 6 more files in changeset.
LAI-9 Add AI review UI in activity monitoring

  1. … 2 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 Escape JS-breaking characters in i18n labels

  1. … 4 more files in changeset.
LDEV-5391 Add Gallery Walk cluster view

  1. … 10 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

# lams_tool_lamc/web/WEB-INF/tags/Rating.tag

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

  1. … 38 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-5391 Add closed clustering of groups in gallery walk

  1. … 12 more files in changeset.
LDEV-5390 Always display 0.0 mark even is learner not finished Doku yet

LDEV-5390 Add Copy Marks button

  1. … 3 more files in changeset.
LDEV-5378 Add max mark setting to dokumaran

  1. … 7 more files in changeset.