Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Add CSRF to LD export and Excel export

  1. … 12 more files in changeset.
SP-4 Provision staff members

LDEV-4932 Add CSRF to monitor and central

    • -8
    • +8
    ./lamsfoundation/lams/web/OrganisationGroupController.java
    • -1
    • +0
    ./lamsfoundation/lams/web/PasswordChangeController.java
    • -6
    • +7
    ./lamsfoundation/lams/web/PortraitSaveController.java
  1. … 46 more files in changeset.
LDEV-4932 Adding CSRF to Author

- Save, Delete, Copy, Move and rename LDs

- Create folder

  1. … 3 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

# Conflicts:

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

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

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

    • -5
    • +10
    ./lamsfoundation/lams/web/HomeController.java
  1. … 18 more files in changeset.
LDEV-4932: Adding CSRF to forum and central

CSRF additions to:

- Forum authoring methods

- Adding outcomes to activities in tools (changes to tag and central methods)

  1. … 10 more files in changeset.
LDEV-4932 Adding CSRF to central

Adding CSRF to:

- Lesson dependencies (add/remove)

- Set dates to finish lesson

    • -4
    • +5
    ./lamsfoundation/lams/web/LessonConditionsController.java
  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 Add CSRF to central (outcomes)

Adding CSRF protection to:

- Delete outcomes

  1. … 3 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-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

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

    • -13
    • +1
    ./lamsfoundation/lams/web/ProfileSaveController.java
    • -23
    • +1
    ./lamsfoundation/lams/web/UserForm.java
  1. … 1 more file in changeset.
LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

  1. … 1 more file in changeset.
Merge branch 'develop' into LDEV-4745

# Conflicts:

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

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GeneralLearnerFlowDTO.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

  1. … 10 more files in changeset.
LDEV-4920 Use correct ID when informing which questions were imported

LDEV-4920 Allow empty value for a request parameter

Merge branch 'master' into develop

# Conflicts:

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

# lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

  1. … 2 more files in changeset.
LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

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

    • -4
    • +23
    ./lamsfoundation/lams/web/QuestionsController.java
  1. … 7 more files in changeset.
LDEV-4918 Collapsible subcourses

    • -12
    • +29
    ./lamsfoundation/lams/web/DisplayGroupController.java
    • -0
    • +51
    ./lamsfoundation/lams/web/controller/CollapseOrganisationController.java
  1. … 12 more files in changeset.
LDEV-4908 When exporting VSAs in QTI, all options should be exported

LDEV-4907 Password changes corrected in audit

    • -4
    • +1
    ./lamsfoundation/lams/web/PasswordChangeController.java
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

  1. … 1 more file in changeset.
LDEV-4535 Use vanilla LAMS label for naming groups in TBL template

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

    • -3
    • +6
    ./lamsfoundation/lams/web/HomeController.java
  1. … 7 more files in changeset.
Merge branch 'SP-3'

    • -4
    • +5
    ./lamsfoundation/lams/web/HomeController.java
  1. … 6 more files in changeset.
LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

  1. … 1 more file in changeset.
LDEV-4844 Allow manual QB question merging

  1. … 5 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

LDEV-4535 Create group names even if i18n label was not found

Missing label makes groups unusable in LD.