Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
SP-9 Add learner view

  1. … 2 more files in changeset.
SP-9 Add traffic lights indication to rating table cells.

Organise front end code.

SP-9 Open Teamwork in the same tab. Add breadcrumbs.

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.
Merge branch 'LAI-5' into v4.7

# Conflicts:

# lams_central/web/authoring/authoring.jsp

# lams_central/web/qb/collection.jsp

  1. … 2 more files in changeset.
LAI-5 Tell AI not to repeat AEs and RAT questions when "generating more"

  1. … 1 more file in changeset.
LAI-5 Add OpenAI MCQ generation to Question Bank collection screen

  1. … 2 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

- QB

LDEV-5404 remove accidentally inserted x

LDEV-5404 Remove a type in JS code which break Index page

LDEV-5404 Escaping funny characters that break js

  1. … 26 more files in changeset.
SP-9 Add course teamwork charts

SP-9 Add course teamwork table

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

SP-9 Add basic classes and entry point on index page

  1. … 4 more files in changeset.
LAI-5 Use HTML template to build introduction activity

    • -0
    • +26
    ./templates/aiTblIntroductionTemplate.html
LDEV-5302 Fix admin role detection when editing a course

  1. … 2 more files in changeset.
SP-9 Rewrite lesson completion chart to new ChartJS

    • -7
    • +0
    ./includes/javascript/chart.bundle.min.js
  1. … 5 more files in changeset.
SP-9 Upgrade ChartJS from version 2.9 to 4.3.1

Rewrite chart generating code to match new API

    • -0
    • +14
    ./includes/javascript/chartjs/chart.umd.js
  1. … 8 more files in changeset.
LAI-5 Add Bloom's taxonomy level info in MCQ generate in Assessment

  1. … 1 more file 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-5338 Remove test code

LDEV-5338 Make unassigned learners box scrollable in grouping view

LDEV-5338 Make unassigned learners box scrollable in grouping view

    • -289
    • +294
    ./includes/javascript/groups.js
LDEV-5338 Make group boxes align to top when list of learners is long

LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 324 more files in changeset.
LAI-5 Store generated RAT question samples in session for further processing

LAI-6 Allow generating more questions with same prompt as before

    • -125
    • +253
    ./questions/questionChoice.jsp
  1. … 2 more files in changeset.