Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4954 Start now lesson in monitor using POST

    • -1
    • +2
    ./includes/javascript/monitorLesson.js
LDEV-4955 Properly disable lesson on schedule

    • -3
    • +8
    ./includes/javascript/monitorLesson.js
LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

  1. … 171 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 Add CSRF to monitor and central

    • -1
    • +0
    ./emailnotifications/archivedEmailList.jsp
    • -1
    • +0
    ./emailnotifications/courseNotifications.jsp
    • -1
    • +0
    ./emailnotifications/lessonNotifications.jsp
    • -11
    • +15
    ./includes/javascript/monitorLesson.js
  1. … 36 more files in changeset.
LDEV-4932 Add CSRF to OutcomeAuthor tag

  1. … 30 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
    • +1
    ./emailnotifications/courseNotifications.jsp
    • -1
    • +1
    ./emailnotifications/lessonNotifications.jsp
    • -2
    • +2
    ./emailnotifications/scheduledEmailList.jsp
    • -28
    • +37
    ./includes/javascript/monitorLesson.js
  1. … 6 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

    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
    • -12
    • +9
    ./includes/javascript/monitorLesson.js
  1. … 19 more files in changeset.
LDEV-4911 Added ids to support automated testing

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

    • -13
    • +20
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-4911 Adding ides to test monitor starting new lesson

    • -2
    • +3
    ./includes/javascript/monitorLesson.js
  1. … 2 more files in changeset.
LDEV-4898 Fix race condition when generating a LD SVG

    • -13
    • +20
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-4900 Distribute modified Page tag to all tools

  1. … 30 more files in changeset.
LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

  1. … 6 more files in changeset.
LDEV-4834 Use panel-less LO widget in QB question authoring

    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 69 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 50 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 90 more files in changeset.
LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

  1. … 35 more files in changeset.
LDEV-4816 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

LDEV-4811 Solve the problem of working with several open monitor dialogs

  1. … 2 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

  1. … 87 more files in changeset.
LDEV-4796 Fix refresh button issue after clicking "Expand all" one

  1. … 1 more file in changeset.
LDEV-4793 Fixing TBLmonitor's issues with iPad

  1. … 1 more file in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

  1. … 63 more files in changeset.
LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

  1. … 34 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 42 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 42 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 118 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

    • -1
    • +1
    ./emailnotifications/archivedEmailList.jsp
    • -1
    • +1
    ./emailnotifications/courseNotifications.jsp
    • -1
    • +1
    ./emailnotifications/lessonNotifications.jsp
  1. … 45 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

  1. … 81 more files in changeset.