Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5404 Escaping funny characters that break js

- Scratchie

LDEV-5404 Escaping funny characters that break js

- Scratchie

    • -1
    • +1
    ./pages/authoring/parts/addItemFooter.jsp
    • -1
    • +1
    ./pages/monitoring/parts/burningQuestions.jsp
    • -3
    • +3
    ./pages/monitoring/parts/itemSummary.jsp
    • -1
    • +1
    ./pages/monitoring/parts/statisticpart.jsp
Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

# lams_tool_lamc/web/WEB-INF/tags/Rating.tag

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

  1. … 38 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 328 more files in changeset.
LDEV-5401 Add learner-triggered absolute timer to other tools

    • -181
    • +234
    ./pages/authoring/advance.jsp
    • -12
    • +14
    ./pages/monitoring/studentChoices5.jsp
  1. … 40 more files in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

  1. … 32 more files in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

    • -412
    • +513
    ./WEB-INF/tags/StyledRating.tag
  1. … 32 more files in changeset.
LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

    • -10
    • +62
    ./pages/authoring/parts/addItemFooter.jsp
  1. … 10 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 34 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 34 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5385 Allow real numbers in Scratchie marks

  1. … 13 more files in changeset.
LDEV-5200 Re-expand Burning Questions collapse panels after reload

    • -1
    • +28
    ./pages/monitoring/parts/burningQuestions5.jsp
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

  1. … 41 more files in changeset.
LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

  1. … 36 more files in changeset.
# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

    • -80
    • +18
    ./pages/monitoring/studentChoices.jsp
  1. … 7 more files in changeset.
LDEV-5365 Use sticky headers for at least 10 teams

LDEV-5365 Use different method for table header stickiness

The new metho allows horizontal scrolling.

    • -71
    • +19
    ./pages/monitoring/studentChoices.jsp
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

    • -25
    • +82
    ./pages/monitoring/studentChoices.jsp
    • -12
    • +21
    ./pages/monitoring/studentChoices5.jsp
    • -182
    • +181
    ./pages/monitoring/studentChoicesTable.jsp
  1. … 10 more files in changeset.
LDEV-5365 Add sticky column header to Scratchie student choices table

    • -23
    • +80
    ./pages/monitoring/studentChoices.jsp
LDEV-5361 Add "require all answers" setting to Scratchie

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5357' into v4.7

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

  1. … 44 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 28 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 37 more files in changeset.
LDEV-5257 Remove outdated jQuery UI slider widget

WEB-008

It is a part of jQuery UI bundle anyway.

  1. … 2 more files in changeset.
LDEV-5200, LKC-110 Fix burning questions expand button

    • -31
    • +0
    ./pages/monitoring/parts/burningQuestions5.jsp
LDEV-5200, LKC-106 Make question numbering consistent between views

  1. … 1 more file in changeset.
LDEV-5347 Add Flux update to Burning Questions tab

Also indicate when there are no burning questions yet.

    • -153
    • +4
    ./pages/monitoring/parts/burningQuestions5.jsp
    • -0
    • +172
    ./pages/monitoring/parts/burningQuestionsTable.jsp
  1. … 4 more files in changeset.