Fiona Malikoff

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

    • -106
    • +96
    /lkc_gradebook/web/gradebookCourseMonitor.jsp
LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

    • -22
    • +31
    /lams_central/web/css/_learner_base.scss
    • -0
    • +5
    /lams_central/web/css/free.ui.jqgrid.min.css
    • -55
    • +29
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -104
    • +94
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -48
    • +30
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4437 Propogates Monitor Leader mark changes to group members

Merge branch 'LDEV-4415' Marks can now be weighted

Merge branch 'LDEV-4415' Marks can now be weighted

LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

LDEV-4435 Portraits displayed for View Learners grouping option

    • -4
    • +10
    /lams_learning/web/grouping/choose.jsp
LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

LDEV-4431 Portraits shown in Monitor and Course Gradebook

    • -5
    • +18
    /lkc_gradebook/web/gradebookCourseMonitor.jsp
LDEV-4431 Portraits shown in Monitor and Course Gradebook

    • -5
    • +18
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -7
    • +33
    /lams_gradebook/web/gradebookMonitor.jsp
Merge remote-tracking branch 'origin/master' into LDEV-4415

LDEV-4415 Lesson marks always recalculated after Live Edit

Also tries to respect any teacher modified lesson marks when

activity marks are changed by doing a 'take the old marks off

and add the new mark on' calculation for weighting.

LDEV-4415 Lesson marks always recalculated after Live Edit

Also tries to respect any teacher modified lesson marks when

activity marks are changed by doing a 'take the old marks off

and add the new mark on' calculation for weighting.

LDEV-4423 Additional portrait entries

    • -13
    • +15
    /lams_tool_wiki/web/pages/learning/wiki.jsp
LDEV-4415 Course export uses percentages, tour supports weights

LDEV-4415 Gradebook calculations and UI support weighting

LDEV-4415 Gradebook calculations and UI support weighting

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • -2
    • +64
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4427 System Admin can delete profile pictures

    • -0
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
LDEV-4420 Lesson status changes recorded in audit log.

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress.

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

    • -0
    • +1
    /lams_central/web/css/_learner_base.scss
    • -4
    • +13
    /lams_learning/web/notebook/view.jsp
    • -14
    • +1
    /lams_monitoring/web/css/_monitorLesson_base.scss
LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

    • -0
    • +5
    /lams_central/web/css/_learner_base.scss
    • -4
    • +4
    /lams_tool_chat/web/pages/learning/learning.jsp
  1. … 30 more files in changeset.
LDEV-4417 LDEV-4417 Popover portraits in Monitoring

LDEV-4412: Audit log entries are created when lessons are removed.

LDEV-4417 Popover portraits in Monitoring

LDEV-4417 LDEV-4417 Popover portraits in Monitoring

LDEV-4417 branch rebased to master and merge conflict of lams.jar resolved.

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran