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

  1. … 31 more files in changeset.
LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

  1. … 31 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

    • -2
    • +2
    ./jsps/authoring/message/topiclist.jsp
  1. … 50 more files in changeset.
LDEV-4917 Add error pop up on attempt of uploading incorrect file

  1. … 10 more files in changeset.
LDEV-4917 Fix Uppy initialisation in Forum learning New Topic

LDEV-4917 Minor adjustments to existing Uppy uploads

  1. … 2 more files in changeset.
LDEV-4917 In Forum make file upload smaller, without preview

    • -13
    • +12
    ./includes/javascript/message.js
LDEV-4917 Add Uppy upload to Learning Desing zip import in authoring

    • -1
    • +1
    ./jsps/authoring/parts/msgattachment.jsp
  1. … 3 more files in changeset.
LDEV-4917 Add Uppy upload to Forum tool

    • -7
    • +23
    ./jsps/authoring/message/create.jsp
    • -1
    • +7
    ./jsps/authoring/parts/msgattachment.jsp
    • -2
    • +7
    ./jsps/learning/message/msgattachment.jsp
    • -1
    • +7
    ./jsps/learning/message/topicreplyform.jsp
  1. … 6 more files in changeset.
LDEV-5054 Fix Learning Outcome removal Ajax call

  1. … 31 more files in changeset.
LDEV-5025 Allow leaving comments even after user rated

  1. … 31 more files in changeset.
LDEV-4925 Fix new lines on learner results page in Peer Review

  1. … 31 more files in changeset.
LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 34 more files in changeset.
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 33 more files in changeset.
LDEV-5030 Sanitise user names for initial Etherpad content

  1. … 32 more files in changeset.
LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

  1. … 32 more files in changeset.
LDEV-4996 Adjust Etherpad autogrow feature

  1. … 31 more files in changeset.
LDEV-4997 Renormalize line endings with git

  1. … 420 more files in changeset.
LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

  1. … 32 more files in changeset.
LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

  1. … 32 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  1. … 462 more files in changeset.
LDEV-5002 Distribute Etherpad tag to all projects

    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  1. … 86 more files in changeset.
LDEV-5002 Distribute Etherpad tag to all projects

    • -0
    • +98
    ./WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./WEB-INF/tags/ImgButtonWrapper.tag
  1. … 86 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 193 more files in changeset.
LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

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

  1. … 94 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. … 5 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

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

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

  1. … 109 more files in changeset.
LDEV-4932 Forum CSRF update marks in monitor

Add CSRF prevention on Forum update marks

  1. … 2 more files in changeset.