lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

    • -5
    • +10
    /lams_central/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_gradebook/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_learning/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_tool_doku/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
    • -5
    • +10
    /lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
  1. … 27 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

Merge branch 'LDEV-5372' into v4.6

LDEV-5372 Add whitelist of integrated servers lesson finish URLs

    • -2
    • +2
    /lams_learning/web/loadToolActivity.jsp
LDEV-5372 Add whitelist of integrated servers lesson finish URLs

    • -2
    • +2
    /lams_learning/web/loadToolActivity.jsp
LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

    • -4
    • +78
    /lams_central/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_gradebook/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_learning/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_tool_chat/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_tool_daco/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_tool_doku/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag
    • -4
    • +78
    /lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag
  1. … 22 more files in changeset.
LDEV-5371 Change maxlength for email and username fields on "Forgotten password?" page

Change from 50 to 256

LDEV-5371 Change maxlength for email and username fields on "Forgotten password?" page

Change from 50 to 256

LDEV-5369 Add choice of rubrics learner view in Peer Review authoring

LDEV-5369 Add pivot of standard Peer Review rubrics view

    • -0
    • +136
    /lams_tool_preview/web/pages/learning/rubricsPivot.jsp
LDEV-5363 Add subgroup column in TBL course gradebook export

LDEV-5363 Export all TBL lessons in course if user is course manager

# WARNING: head commit changed in the meantime

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

LDEV-4832 Allow LD location based editing of QB questions

A user is allowed to edit a question if it is used in a learning design

which is in user's private folder, public folder or a course folder

where the user is a monitor.

LDEV-5365 Use sticky headers for at least 10 teams

LDEV-4832 Allow editing of QB questions and collections by sysadmin

LDEV-4832 Allow editing of questions in shared QB collections

LDEV-5365 Use different method for table header stickiness

The new metho allows horizontal scrolling.

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

LDEV-5368 Add "img-responsive" class to generated image tags

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

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

lams_tool_assessment/web/pages/monitoring/summary.jsp

Merge branch 'LDEV-5368' into v4.6

LDEV-5368 Add upload image plugin to CKEditor

    • -0
    • +154
    /lams_central/web/ckeditor/plugins/uploadimage/plugin.js
  1. … 39 more files in changeset.
LDEV-5359 Add answered question count next to section name

LDEV-5360 Add additional marking info to spreadsheet export

LDEV-5360 Use core User instead of AssessmentUser for markedBy column

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

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

Conflicts:

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

LDEV-5363 Remove duplicate method

SP-4 Remove duplicates before introducing unique index