Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Add CSRF to password change

  1. … 1 more file in changeset.
LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

  1. … 1 more file in changeset.
LDEV-4969 Fix form validation

LDEV-4966, LDEV-4137 Reposition notifications dialog after showing

LDEV-4966, LDEV-4137 Reposition notifications dialog after showing

LDEV-4967 missing quotes

LDEV-4967 including appropriate contentType header

LDEV-4967 including appropriate contentType header

LDEV-4946 Display control buttons again

LDEV-4962 Fix portraits with complex UUIDs

  1. … 4 more files in changeset.
LDEV-4962 Fix portraits with complex UUIDs

  1. … 1 more file in changeset.
LDEV-4958 Set content folder ID in form when creating a QB question

Merge branch 'master' into v4.0

# Conflicts:

# lams_central/web/common/taglibs.jsp

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

    • -1
    • +0
    ./ckeditor/plugins/jlatexmath/buttons.jsp
  1. … 168 more files in changeset.
LDEV-4946 Make LTI add lesson screen work with new LD tree

LDEV-4898 Fix race condition when generating a LD SVG

    • -28
    • +41
    ./includes/javascript/authoring/authoringGeneral.js
LDEV-4941 Prevent "stealing" a QB question

Prevent changing an existing question's collection if it is not in one

of user's own collections

  1. … 7 more files in changeset.
LDEV-4932 Add CSRF to QB bank calls

  1. … 18 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

    • -5
    • +1
    ./authoring/template/tool/assessmcq.jsp
    • -3
    • +1
    ./authoring/template/tool/assessment.jsp
    • -4
    • +1
    ./authoring/template/tool/mcquestion.jsp
    • -27
    • +44
    ./includes/javascript/authoring/authoringGeneral.js
    • -20
    • +31
    ./includes/javascript/orgGroup.js
  1. … 80 more files in changeset.
LDEV-4932 Add CSRF Excel export in tools

  1. … 9 more files in changeset.
LDEV-4932 Add CSRF to LD export and Excel export

  1. … 9 more files in changeset.
LDEV-4644 Reintroduce an incorrectly deleted CSS file

LDEV-4932 Start using /common/taglibs.jsp in lams_central

    • -10
    • +4
    ./authoring/template/createresult.jsp
    • -5
    • +1
    ./authoring/template/tool/assessmcq.jsp
    • -3
    • +1
    ./authoring/template/tool/assessment.jsp
    • -3
    • +1
    ./authoring/template/tool/assessmentQTI.jsp
    • -3
    • +1
    ./authoring/template/tool/assessoption.jsp
    • -3
    • +1
    ./authoring/template/tool/assessredooption.jsp
    • -3
    • +1
    ./authoring/template/tool/mcoption.jsp
  1. … 54 more files in changeset.
LDEV-4932 Add CSRF to monitor and central

    • -20
    • +31
    ./includes/javascript/orgGroup.js
    • -5
    • +22
    ./includes/javascript/orgGrouping.js
  1. … 46 more files in changeset.
LDEV-4932 Adding CSRF to add lesson

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

- Save, Delete, Copy, Move and rename LDs

- Create folder

    • -27
    • +44
    ./includes/javascript/authoring/authoringGeneral.js
  1. … 2 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

    • -13
    • +28
    ./includes/javascript/addLesson.js
  1. … 13 more files in changeset.
LDEV-4932 Add CSRF to OutcomeAuthor tag

  1. … 30 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

  1. … 2 more files in changeset.