lams_build

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4997 Initial migration of Doku tool to Etherpad as central service

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/build.xml

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
  1. … 28 more files in changeset.
LDEV-4997 Add Etherpad client as WildFly library module

    • -0
    • +29
    ./lib/etherpad/etherpad.module.xml
    • binary
    ./lib/etherpad/etherpad_lite_client-1.2.13.jar
LDEV-4997 Add Etherpad client as WildFly library module

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

    • -0
    • +29
    ./lib/etherpad/etherpad.module.xml
    • binary
    ./lib/etherpad/etherpad_lite_client-1.2.13.jar
LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 192 more files in changeset.
Merge branch 'master' into v4.0

# Conflicts:

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

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

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

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

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

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

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

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

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

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

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

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

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

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

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

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

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

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

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

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

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

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

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

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

# lams_tool_scratchie/web/pages/authoring/basic.jsp

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

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

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

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

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

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

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

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

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
  1. … 92 more files in changeset.
LDEV-4932 Adjust CSRF Guard logging

Logger uses LAMS format and logs only warnings (attacks) rather than all

its checks.

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

LDEV-4939 Update 3rd party library config file

LDEV-4932 Update version and source code of CSRF Guard

  1. … 2 more files in changeset.
LDEV-4932 Squash multiple slashes into one when matching secured paths

    • binary
    ./lib/csrfguard/csrfguard-3.1.0-custom-2020.01.07.jar
LDEV-4939 Provide only Batik modules that LAMS uses

Prevent Batik / JDK 11 package name clash.

    • binary
    ./lib/batik/batik-awt-util.jar
    • binary
    ./lib/batik/batik-svggen.jar
LDEV-4932 CSRF Guard configuration is needed only in one place

  1. … 1 more file in changeset.
Revert "LDEV-4932 Initial integration of CSRF Guard"

This reverts commit c5a709e4cb42d0729ad3fbd814714fb27dd844df.

It should have been in a separate branch.

    • -1
    • +0
    ./conf/j2ee/jboss-deployment-structure.xml
  1. … 5 more files in changeset.
LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +34
    ./lib/csrfguard/csrf.module.xml
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
  1. … 5 more files in changeset.
LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +34
    ./lib/csrfguard/csrf.module.xml
    • binary
    ./lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
  1. … 5 more files in changeset.
LDEV-4883 Fix HttpClient warning “Invalid expires attribute”

  1. … 3 more files in changeset.
LDEV-4589 Adjust LTI Deep Linking & Membership services for Blackboard

  1. … 2 more files in changeset.
LDEV-4589 Make org.apache.httpcomponents.core module available

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
LDEV-4589 Make org.apache.httpcomponents.core module available

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
LDEV-4589 Add support for LTI membership service

Includes interim logging.

  1. … 9 more files in changeset.
LDEV-4589 Add support for LTI membership service

Includes interim logging.

  1. … 9 more files in changeset.
Merge branch 'master' into develop

LDEV-4810 Add batik lib to 3rdParty.userlibraries

Merge branch 'master' into develop

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
LDEV-4810 Reintroduce Batik lib, required for producing Jlatexmath's SVG

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • binary
    ./lib/batik/batik-all-1.7.jar
LDEV-4810 Update Jlatexmath library to 1.0.8 version

    • binary
    ./lib/jlatexmath/jlatexmath-1.0.6.jar
    • binary
    ./lib/jlatexmath/jlatexmath-1.0.8.jar
    • -1
    • +1
    ./lib/jlatexmath/jlatexmath.module.xml
LDEV-4784 Update POI library to 4.0.1 version

    • binary
    ./lib/apache-poi/commons-compress-1.18.jar
    • -0
    • +34
    ./lib/apache-poi/compress.module.xml
    • binary
    ./lib/apache-poi/poi-4.0.1.jar
    • binary
    ./lib/apache-poi/poi-ooxml-3.17.jar
    • binary
    ./lib/apache-poi/poi-ooxml-4.0.1.jar
    • binary
    ./lib/apache-poi/poi-ooxml-schemas-4.0.1.jar
    • binary
    ./lib/apache-poi/xmlbeans-2.6.0.jar
    • binary
    ./lib/apache-poi/xmlbeans-3.0.2.jar
  1. … 1 more file in changeset.
LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

  1. … 263 more files in changeset.
LDEV-4755 Add ClamAV client library

    • -0
    • +1
    ./conf/j2ee/jboss-deployment-structure.xml
    • binary
    ./lib/clamav/clamav-client-2.0.2.jar
    • -0
    • +34
    ./lib/clamav/clamav.module.xml
    • binary
    ./lib/clamav/kotlin-logging-1.6.22.jar
    • binary
    ./lib/clamav/kotlin-stdlib-1.3.11.jar
    • -0
    • +34
    ./lib/clamav/kotlin.logging.module.xml
    • -0
    • +29
    ./lib/clamav/kotlin.stdlib.module.xml
LDEV-4753 Change default log level to DEBUG with info about production