Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Adding CSRF to central

Adding CSRF to:

- Lesson dependencies (add/remove)

- Set dates to finish lesson

  1. … 2 more files in changeset.
LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

  1. … 10 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

  1. … 40 more files in changeset.
LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

  1. … 9 more files in changeset.
LDEV-4932 Add CSRF to central (outcomes)

Adding CSRF protection to:

- Delete outcomes

  1. … 2 more files in changeset.
LDEV-4932 Adding CSRF to admin

Adding CSRF token:

- When adding/editing learning outcomes

- Adding/editing and removing themes

  1. … 4 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

  1. … 2 more files in changeset.
LDEV-4932 Secure setting submission deadline with CSRF Guard

  1. … 63 more files in changeset.
LDEV-4932 Remove obsolete form input

LDEV-4932 Use same approach to token injection in all forms

LDEV-4932 Extra comment in web.xml

LDEV-4932 List actions to protect instead of checking everything

  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.

    • -70
    • +0
    ./WEB-INF/tlds/security/csrfguard.tld
  1. … 7 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
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
  1. … 7 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
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
  1. … 7 more files in changeset.
LDEV-4931 Adding ids to support Admin tests

  1. … 2 more files in changeset.
LDEV-4930 Avoid displaying excessive user parameters on edit profile jsp

  1. … 3 more files in changeset.
Merge branch 'master' into LDEV-4886

  1. … 1 more file in changeset.
LDEV-4880 Correctly check whether variable is undefined

    • -1
    • +1
    ./includes/javascript/jquery.jqGrid.confidence-level-formattter.js
LDEV-4927 Show other users' answers right after user answers

* Some minor tweaks in monitor pages

  1. … 6 more files in changeset.
LDEV-4887 QTI import done within TBL template

  1. … 3 more files in changeset.
LDEV-4920 Import QTI questions to MCQ after adding them to QB

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

# Conflicts:

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

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

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

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

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

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

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

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

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

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

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

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

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

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

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

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

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

  1. … 35 more files in changeset.
LDEV-4918 Collapsible subcourses

  1. … 11 more files in changeset.
LDEV-4898 Fix race condition when generating a LD SVG

    • -12
    • +20
    ./includes/javascript/addLesson.js
  1. … 1 more file in changeset.
LDEV-4861 Prevent adding the same question twice

  1. … 5 more files in changeset.
LDEV-4771 Re-introduce multiple activity authoring dialogs

LDEV-4880 Add confidence level variations

    • -6
    • +43
    ./includes/javascript/jquery.jqGrid.confidence-level-formattter.js
  1. … 19 more files in changeset.
LDEV-4911 Create structure for monitoring learning

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java

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

lams_central/web/includes/javascript/authoring/authoringProperty.js

    • -3241
    • +3299
    ./includes/javascript/authoring/authoringGeneral.js
    • -1957
    • +1938
    ./includes/javascript/authoring/authoringProperty.js
  1. … 4 more files in changeset.