Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 18 more files in changeset.
LDEV-4993 Remove unnecessary characters from TBL authoring page

    • -1
    • +1
    ./authoring/template/tool/assessoption.jsp
LDEV-4989 Password Gate initial implementation

  1. … 33 more files in changeset.
LDEV-4987 Fix file download notification

The bug was introduced in LDEV-4932

LDEV-4975 Remove now redundant jquery.sizzle.js

    • -7
    • +0
    ./includes/javascript/jquery.sizzle.js
LDEV-4975 Remove now redundant jquery.mobile.js

    • -2
    • +0
    ./includes/javascript/jquery.mobile.js
LDEV-4978 Remove reference to an non-existing entity property

The reference was introduced by an incorrect recent merge with master,

regarding LDEV-4932.

LDEV-4975 Upgrade jquery to version 3.4.1

  1. … 6 more files in changeset.
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