lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 12 more files in changeset.
LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

    • -12
    • +35
    /lams_admin/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_gradebook/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_learning/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_monitoring/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_chat/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_daco/web/WEB-INF/tags/PageMonitor.tag
    • -12
    • +35
    /lams_tool_doku/web/WEB-INF/tags/PageMonitor.tag
  1. … 48 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

# lams_central/web/includes/javascript/rating5.js

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

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

# lams_learning/web/css/components-learner.scss

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

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

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

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

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

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

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

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

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

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

LDEV-5445 Assessment learning. Fix mode=teaher for situations when leader hasn't committed his response yet

Merge branch 'LAI-11' into v4.8

LDEV-5200 Fix branching arranging in authoring

LDEV-5397 improve Submit Files learning's UI

LDEV-5397 force card-header's text (even if it has some rich text formatting) to follow this card-header's color theme

Merge branch 'LDEV-5445' into v4.8

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

    • -9
    • +11
    /lams_gradebook/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_learning/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_monitoring/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_chat/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_daco/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +11
    /lams_tool_doku/web/WEB-INF/tags/PageLearner.tag
    • -34
    • +36
    /lams_tool_doku/web/pages/learning/learning.jsp
  1. … 38 more files in changeset.
LDEV-3115 Fix group creation on LD save in authoring

Merge branch 'LDEV-5449' into v4.8

LDEV-5449 Add "allow answer rating" option in learning

LDEV-5449 Add "allow answer rating" option in authoring

LDEV-5446 Do initial indexing before fixing duplicate UUIDs

Otherwise searching for duplicate UUIDs takes too long.

LDEV-3115 Fix group removal on LD save in authoring

It seems that Hibernate does not like having entities violating unique keys in one collection. Even for a while and even though afterward the collection contains only unique entities.

    • -3
    • +2
    /lams_central/web/css/_authoring_base.scss
LAI-11 Add AI PBL wizard

Refactor code of other AI wizards.

    • -0
    • +57
    /lams_central/web/templates/pbl/aiPblAnalysisContentTemplate.html
    • -0
    • +21
    /lams_central/web/templates/pbl/aiPblAnalysisDocumentTemplate.html
    • -0
    • +15
    /lams_central/web/templates/pbl/aiPblDiscussionContentTemplate.html
    • -0
    • +13
    /lams_central/web/templates/pbl/aiPblDiscussionDocumentTemplate.html
    • -0
    • +14
    /lams_central/web/templates/pbl/aiPblIntroductionTemplate.html
    • -0
    • +8
    /lams_central/web/templates/pbl/aiPblProblemTemplate.html
    • -0
    • +9
    /lams_central/web/templates/pbl/aiPblReportTemplate.html
    • -0
    • +23
    /lams_central/web/templates/pbl/aiPblResearchTemplate.html
LDEV-5448 properly remove HTML tags produced by CKEditor

LDEV-5397 force card-header's text (even if it has some rich text formatting) to follow this card-header's color theme

LDEV-5424 wrap timelimit widget with an accordion

LDEV-5424 fix jsp file name

LDEV-5424 tag's title attribute is no longer required

LDEV-5424 bootstrap5 Scratchie monitoring

LDEV-5397 Make sure that question numbering stays in one line

LDEV-5424 bootstrap5 Assessment's monitoring

    • -12
    • +35
    /lams_central/web/WEB-INF/tags/PageMonitor.tag
    • -1
    • +27
    /lams_central/web/css/free.ui.jqgrid.custom.scss
  1. … 13 more files in changeset.
LDEV-5440 Further code upgrade to conform new WF libraries

  1. … 47 more files in changeset.
LDEV-5440 Update CSRFGuard from 4.1.3 to 4.3.0-jakarta

Customisation was needed:

In CsrfGuardUtils use

public static String normalizeResourceURI(final String resourceURI) {

String normalizedResourceURI = resourceURI.startsWith("/") ? resourceURI : '/' + resourceURI;

// LAMS LDEV-4932 Replace multiple slashes with a single one, so it works the same as Spring MVC

normalizedResourceURI = normalizedResourceURI.replaceAll("/{2,}", "/");

return normalizedResourceURI;

}

Also update WF module schemas.

    • -1
    • +1
    /lams_build/lib/apache-poi/poi.module.xml
    • -1
    • +1
    /lams_build/lib/batik/batik.module.xml
    • -1
    • +1
    /lams_build/lib/clamav/clamav.module.xml
    • -1
    • +1
    /lams_build/lib/clamav/kotlin.logging.module.xml
    • -1
    • +1
    /lams_build/lib/clamav/kotlin.stdlib.module.xml
    • -4
    • +4
    /lams_build/lib/csrfguard/csrf.module.xml
  1. … 30 more files in changeset.
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

  1. … 72 more files in changeset.
LDEV-5440 Upgrade to Spring 6.1.4

    • -11
    • +11
    /lams_build/3rdParty.userlibraries
    • binary
    /lams_build/lib/spring/spring-aop-5.3.18.jar
    • binary
    /lams_build/lib/spring/spring-aop-6.1.4.jar
    • binary
    /lams_build/lib/spring/spring-beans-5.3.18.jar
    • binary
    /lams_build/lib/spring/spring-beans-6.1.4.jar
    • binary
    /lams_build/lib/spring/spring-context-5.3.18.jar
    • binary
    /lams_build/lib/spring/spring-context-6.1.4.jar
    • binary
    /lams_build/lib/spring/spring-context-support-5.3.18.jar
    • binary
    /lams_build/lib/spring/spring-context-support-6.1.4.jar
    • binary
    /lams_build/lib/spring/spring-core-5.3.18.jar
    • binary
    /lams_build/lib/spring/spring-core-6.1.4.jar
    • binary
    /lams_build/lib/spring/spring-expression-6.1.4.jar
    • binary
    /lams_build/lib/spring/spring-jdbc-5.3.18.jar
  1. … 12 more files in changeset.
LDEV-5440 Use WF 31 Final instead of Beta

  1. … 56 more files in changeset.