lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5442 make monitoring use new starability widget

  1. … 9 more files in changeset.
LDEV-5442 teachers can't rate

LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

    • -553
    • +0
    /lams_admin/web/WEB-INF/tags/StyledRating5.tag
    • -270
    • +248
    /lams_central/web/WEB-INF/tags/StyledRating.tag
    • -565
    • +0
    /lams_central/web/WEB-INF/tags/StyledRating5.tag
    • -4
    • +0
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -553
    • +0
    /lams_learning/web/WEB-INF/tags/StyledRating5.tag
  1. … 21 more files in changeset.
LDEV-5442 remove jRating plugin

    • -84
    • +0
    /lams_central/web/css/_jquery.jRating_base.scss
    • -2
    • +0
    /lams_central/web/css/defaultHTML_jquery.jRating.scss
    • -5
    • +0
    /lams_central/web/css/jquery.tablesorter.theme.bootstrap5.css
    • -11
    • +0
    /lams_central/web/css/purple_jquery.jRating.scss
    • -283
    • +0
    /lams_central/web/includes/javascript/rating.js
Merge branch 'LDEV-5442' into v4.8

# Conflicts:

# lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties

LDEV-5442 switch to using lams:Rating tag instead of jRating plugin in Forum tool

    • -1
    • +0
    /lams_tool_forum/web/jsps/learning/create.jsp
    • -2
    • +1
    /lams_tool_forum/web/jsps/learning/edit.jsp
    • -2
    • +1
    /lams_tool_forum/web/jsps/learning/reply.jsp
LDEV-5397 Updating labels Greek, Japanese, German, English

LDEV-5360 Make Enter save multiline comment box

Shift+Enter adds a new line.

Caused by

https://lamssupport.atlassian.net/browse/ICL-27

LDEV-5360 Make Enter save multiline comment box

Shift+Enter adds a new line.

Caused by

https://lamssupport.atlassian.net/browse/ICL-27

LDEV-5360 Show max mark in tooltip in Assessment monitoring

LDEV-5360 Show max mark in tooltip in Assessment monitoring

LDEV-5083 Fix Weights view in monitoring

    • -26
    • +16
    /lams_gradebook/web/gradebookMonitorContent.jsp
LDEV-5397 Fix displaying the same justification for all teams

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

# Conflicts:

# lams_tool_assessment/web/pages/learning/learning.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

    • -23
    • +7
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -22
    • +6
    /lams_admin/web/WEB-INF/tags/Page5.tag
    • -14
    • +17
    /lams_admin/web/WEB-INF/tags/PageLearner.tag
    • -3
    • +6
    /lams_central/web/WEB-INF/tags/Page.tag
    • -3
    • +6
    /lams_central/web/WEB-INF/tags/Page5.tag
    • -14
    • +17
    /lams_central/web/WEB-INF/tags/PageLearner.tag
    • -23
    • +7
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -14
    • +17
    /lams_gradebook/web/WEB-INF/tags/PageLearner.tag
    • -23
    • +7
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -22
    • +6
    /lams_learning/web/WEB-INF/tags/Page5.tag
    • -14
    • +17
    /lams_learning/web/WEB-INF/tags/PageLearner.tag
    • -9
    • +21
    /lams_learning/web/WEB-INF/tags/StyledRating5.tag
  1. … 124 more files in changeset.
LDEV-4997 Escape image names with spaces when setting Etherpad content

LDEV-3997 Use custom context label as primary source of course name

LDEV-5360 Indicate auto-graded answers

LDEV-5360 Allow even longer marker comments

Caused by

https://lamssupport.atlassian.net/browse/ICL-18

LDEV-5360 Allow multiline marker comments

Caused by

https://lamssupport.atlassian.net/browse/ICL-27

Merge branch 'LDEV-5442' into v4.8

LDEV-5442 switch learning to the new star rating widget

    • -9
    • +21
    /lams_central/web/WEB-INF/tags/StyledRating5.tag
  1. … 7 more files in changeset.
LDEV-5442 copy-tags

    • -26
    • +66
    /lams_admin/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_gradebook/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_monitoring/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_chat/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_daco/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_doku/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_forum/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_gmap/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_images/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_imscc/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_lamc/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_laqa/web/WEB-INF/tags/Rating5.tag
    • -26
    • +66
    /lams_tool_larsrc/web/WEB-INF/tags/Rating5.tag
  1. … 16 more files in changeset.
LDEV-5442 introduce LAMS star rating widget built on top of the original starability widget

    • -0
    • +72
    /lams_central/web/css/rating.scss
    • -0
    • +345
    /lams_central/web/includes/javascript/rating5.js
LDEV-5442 introduce original starability widget

    • -0
    • +164
    /lams_central/web/css/starability-basic.css
    • -0
    • +161
    /lams_central/web/css/starability/_starability-base.scss
    • -0
    • +39
    /lams_central/web/css/starability/_starability-result.scss
    • -0
    • +24
    /lams_central/web/css/starability/_variables.scss
    • -0
    • +9
    /lams_central/web/css/starability/starability/all.scss
    • -0
    • +7
    /lams_central/web/css/starability/starability/basic.scss
    • -0
    • +59
    /lams_central/web/css/starability/starability/checkmark.scss
    • -0
    • +63
    /lams_central/web/css/starability/starability/coinFlip.scss
    • -0
    • +38
    /lams_central/web/css/starability/starability/fade.scss
    • -0
    • +39
    /lams_central/web/css/starability/starability/grow.scss
    • -0
    • +39
    /lams_central/web/css/starability/starability/growRotate.scss
    • -0
    • +53
    /lams_central/web/css/starability/starability/heart.scss
    • -0
    • +53
    /lams_central/web/css/starability/starability/heartbeat.scss
    • -0
    • +13
    /lams_central/web/css/starability/starability/slot.scss
LDEV-3224 Discard blank essay answer overwriting a non-blank one

LDEV-5360 Accept "0" as proper mark for unmarked answer

Caused by

https://lamssupport.atlassian.net/browse/ICL-28

LDEV-5426 Use only supported time zones

LDEV-5290 Identify tabs better when checking for multiple open tabs

A minimised window can skip setInterval() ticks. This lead to incorrect detection of multiple tabs open - a single open tab could produce this message.

    • -3
    • +6
    /lams_admin/web/WEB-INF/tags/Page5.tag
    • -3
    • +6
    /lams_central/web/WEB-INF/tags/Page.tag
    • -3
    • +6
    /lams_central/web/WEB-INF/tags/Page5.tag
    • -3
    • +6
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -3
    • +6
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -3
    • +6
    /lams_learning/web/WEB-INF/tags/Page5.tag
    • -3
    • +6
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
  1. … 55 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

LDEV-5401 Add tooltip to "Finish now" button