lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4831 Bypass 2FA if using Login-as

Merge branch 'master' into v4.0

# Conflicts:

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

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

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

LDEV-2866 Name tools' controller classes uniformly

  1. … 13 more files in changeset.
LKC-231 Calculate percentages properly in Excel export

(cherry picked from commit 1dc5f5ec294283f43ce1deaa33066bdf1190ff1d)

LKC-231 Calculate percentages properly in Excel export

LDEV-4746 Allow even larger output for SQL concat function

LDEV-4746 Fix strip_tags SQL function when input is NULL

LDEV-4932 Add CSRF to QB bank calls

    • -0
    • +1
    /lams_central/web/qb/authoring/addVsa.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
  1. … 18 more files in changeset.
SP-4 Staff gets only monitor and author roles, not learner

Merge branch 'v4.0' of https://github.com/lamsfoundation/lams into v4.0

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
    • +237
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -9
    • +6
    /lams_central/web/authoring/authoring.jsp
  1. … 80 more files in changeset.
LDEV-4932 Adjust CSRF Guard logging

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

its checks.

SP-4 Add teacher to subcourses

LDEV-4649 Use correct scale field when importing learning outcomes

Merge branch 'LDEV-4932'

# Conflicts:

# lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java

LDEV-4932 Add CSRF Excel export in tools

Merge branch 'SP-4'

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_build/3rdParty.userlibraries

LDEV-4939 Update 3rd party library config file

Merge remote-tracking branch 'origin/master' into v4.0

LDEV-4932 Add CSRF to LD export and Excel export

    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
    • -2
    • +2
    /lams_central/web/profile/portrait.jsp
LDEV-4644 Reintroduce an incorrectly deleted CSS file

    • -0
    • +45
    /lams_central/web/css/outcome.scss
LDEV-4932 Start using /common/taglibs.jsp in lams_central

    • -5
    • +1
    /lams_central/web/authoring/authoring.jsp
  1. … 54 more files in changeset.
SP-4 Provision staff members

LDEV-4932 Add CSRF to monitor and central

    • -20
    • +31
    /lams_central/web/includes/javascript/orgGroup.js
    • -13
    • +8
    /lams_central/web/profile/portrait.jsp
  1. … 36 more files in changeset.
LDEV-4366 Renormalize incorrect line endings for git to work better

    • -319
    • +319
    /lams_learning/web/css/kumalive.scss
LDEV-4366 Renormalize incorrect line endings for git to work better

    • -319
    • +319
    /lams_learning/web/css/kumalive.scss
LDEV-3119 Renormalize incorrect line endings for git to work better

LDEV-4932 Update version and source code of CSRF Guard

LDEV-4932 Squash multiple slashes into one when matching secured paths

    • -1
    • +1
    /lams_build/lib/csrfguard/csrf.module.xml
    • binary
    /lams_build/lib/csrfguard/csrfguard-3.1.0-custom-2020.01.07.jar