Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_tool_sbmt/web/learner/sbmtlearner.jsp

  1. … 9 more files in changeset.
LDEV-5397 Boostrap 5 bundle already has got Popper included

  1. … 33 more files in changeset.
LDEV-5397 add icons to finish and refresh buttons

  1. … 64 more files in changeset.
LDEV-5397 add icons to finish and refresh buttons

  1. … 66 more files in changeset.
LDEV-5397 make SubmissionDeadline.tag call checkNextGateActivity()

  1. … 32 more files in changeset.
LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

    • -0
    • +117
    ./WEB-INF/tags/SubmissionDeadline.tag
  1. … 80 more files in changeset.
LDEV-5408 Add Extra Information buttons on RAT and AE tabs in monitoring

  1. … 6 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.
LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LAI-5 Hide AI wizard menu item in authoring when AI is not deployed

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-5397 spread change to LeaderDisplay.tag to all tools

  1. … 32 more files in changeset.
LDEV-5407 Fix logo CSS

LDEV-5407 Remove monitor link to return to index page for integrations

  1. … 1 more file in changeset.
LDEV-5397 Introduce Notebook.tag

    • -0
    • +108
    ./WEB-INF/tags/Notebook.tag
    • -193
    • +153
    ./WEB-INF/tlds/lams/lams.tld
  1. … 71 more files in changeset.
LDEV-5397 center leader alert

  1. … 32 more files in changeset.
LDEV-5397 copy-tags across LAMS projects

    • -0
    • +48
    ./WEB-INF/tags/Errors5.tag
  1. … 36 more files in changeset.
LDEV-5397 add missing function preventLearnerAutosaveFromMultipleTabs(autosaveInterval)

    • -0
    • +163
    ./WEB-INF/tags/PageLearner.tag
  1. … 32 more files in changeset.
LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

  1. … 42 more files in changeset.
LDEV-5397 Introduce WaitForLeader.tag

    • -0
    • +75
    ./WEB-INF/tags/WaitForLeader.tag
  1. … 67 more files in changeset.
LDEV-5404 Escaping funny characters that break js in tags

- LAMS Central

- LAMS Monitoring

- LAMS Learner

- Assessment

- Gradebook

- Peer Assessment

- Submit

- Scratchie

    • -30
    • +31
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +5
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 41 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_build/lams_build.eml

# lams_central/web/css/components.css

# lams_gradebook/lams_gradebook.eml

# lams_monitoring/lams_monitoring.eml

# lams_monitoring/web/monitor.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_www/web/public/ckeditor-templates/bootsnippets.js

  1. … 8 more files in changeset.
LDEV-5405 Make Popover tag work with Bootstrap both version 3 and 5

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

- Monitoring

    • -1
    • +1
    ./emailnotifications/archivedEmailList.jsp
LDEV-5404 Escaping funny characters that break js

- Monitoring

- Gradebook

    • -1
    • +1
    ./emailnotifications/archivedEmailList5.jsp
    • -7
    • +7
    ./emailnotifications/courseNotifications.jsp
    • -6
    • +6
    ./emailnotifications/lessonNotifications.jsp
    • -6
    • +6
    ./emailnotifications/lessonNotifications5.jsp
    • -2
    • +2
    ./emailnotifications/scheduledEmailList.jsp
    • -2
    • +2
    ./emailnotifications/scheduledEmailList5.jsp
  1. … 5 more files in changeset.
SP-9 Rewrite lesson completion chart to new ChartJS

    • -827
    • +822
    ./includes/javascript/monitorLesson.js
  1. … 4 more files in changeset.
SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

    • -1
    • +2
    ./includes/javascript/monitorLesson.js
  1. … 7 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-5402 Display path to Learning Design in authoring

  1. … 2 more files in changeset.