lams-github

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

# Conflicts:

# lams_central/.classpath

LDEV-5386 Fix dependency problem

LDEV-5386 Modify config files for LAMS v4.8

    • -10
    • +10
    /lams_tool_assessment/.classpath
  1. … 52 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

# Conflicts:

# lams_tool_doku/conf/language/lams/ApplicationResources.properties

# lams_tool_doku/lams_tool_doku.eml

LDEV-5394 Add "send emails to all" button in Peer Review

LDEV-5393 Update marks for all peers in group after activity

LDEV-5393 Add Peer Review output (rating average) for grade book

LDEV-5083 Added missing label

"Search learners" was hardcoded.

LDEV-5391 Add limited (clustered) Gallery Walk

    • -0
    • +10
    /lams_tool_doku/web/pages/authoring/advance.jsp
LDEV-5391 Improve comment rating layout

    • -8
    • +12
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -8
    • +12
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -8
    • +12
    /lams_central/web/css/_jquery.jRating_base.scss
    • -8
    • +12
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
  1. … 20 more files in changeset.
LDEV-5391 Improve comment rating layout

    • -8
    • +12
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -8
    • +12
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -8
    • +12
    /lams_central/web/css/_jquery.jRating_base.scss
    • -8
    • +12
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
  1. … 20 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

    • -97
    • +98
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_monitoring/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_tool_forum/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_tool_images/web/WEB-INF/tags/Rating.tag
  1. … 24 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

    • -97
    • +98
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_monitoring/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_tool_forum/web/WEB-INF/tags/Rating.tag
    • -97
    • +98
    /lams_tool_images/web/WEB-INF/tags/Rating.tag
  1. … 24 more files in changeset.
LDEV-5391 Add gallery walk instructions header on learner screen

LDEV-5391 Add gallery walk instructions header on learner screen

LDEV-5391 Use CKEditor for gallery walk instructions

    • -32
    • +32
    /lams_tool_doku/web/pages/authoring/advance.jsp
LDEV-5391 Use CKEditor for gallery walk instructions

    • -32
    • +32
    /lams_tool_doku/web/pages/authoring/advance.jsp
Merge branch 'LDEV-5390' into v4.6

LDEV-5390 Always display 0.0 mark even is learner not finished Doku yet

LDEV-5390 Add Copy Marks button

Merge branch 'LDEV-5389' into v4.6

LDEV-5389 Sort learners by names by default in Peer Review monitoring

Previous default was to sort them by rating descending, so top learners are on top.

LDEV-5389 Use natural ordering of groups in summary view

Merge branch 'LDEV-5388' into v4.7

LDEV-5386 Configuration file management

LDEV-5388 Reintroduce user create date to their edit form

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

LAI-3 Updating label

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

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