lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5442 fix issues with star rating widget

LDEV-5425 delete notebook leftovers

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

    • -565
    • +0
    /lams_admin/web/WEB-INF/tags/StyledRating5.tag
    • -565
    • +0
    /lams_learning/web/WEB-INF/tags/StyledRating5.tag
  1. … 16 more files in changeset.
LDEV-5424 no need for bootstrap 3 versions any longer

LDEV-5442 fix method name

Merge branch 'LDEV-5442' into LDEV-5424

# Conflicts:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

LDEV-5442 copy-tags

    • -20
    • +1
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -19
    • +0
    /lams_admin/web/WEB-INF/tags/Page5.tag
    • -100
    • +136
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -270
    • +248
    /lams_admin/web/WEB-INF/tags/StyledRating.tag
    • -9
    • +1
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -20
    • +1
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -100
    • +136
    /lams_gradebook/web/WEB-INF/tags/Rating.tag
    • -270
    • +248
    /lams_gradebook/web/WEB-INF/tags/StyledRating.tag
    • -9
    • +1
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -20
    • +1
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -19
    • +0
    /lams_learning/web/WEB-INF/tags/Page5.tag
    • -100
    • +136
    /lams_learning/web/WEB-INF/tags/Rating.tag
    • -270
    • +248
    /lams_learning/web/WEB-INF/tags/StyledRating.tag
    • -9
    • +1
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
  1. … 145 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

    • -0
    • +345
    /lams_central/web/includes/javascript/rating.js
    • -345
    • +0
    /lams_central/web/includes/javascript/rating5.js
  1. … 9 more files in changeset.
LDEV-5442 rename Rating5.tag -> Rating.tag

    • -257
    • +0
    /lams_admin/web/WEB-INF/tags/Rating5.tag
    • -100
    • +136
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -5
    • +1
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -257
    • +0
    /lams_gradebook/web/WEB-INF/tags/Rating5.tag
    • -257
    • +0
    /lams_monitoring/web/WEB-INF/tags/Rating5.tag
    • -257
    • +0
    /lams_tool_chat/web/WEB-INF/tags/Rating5.tag
    • -257
    • +0
    /lams_tool_daco/web/WEB-INF/tags/Rating5.tag
    • -257
    • +0
    /lams_tool_doku/web/WEB-INF/tags/Rating5.tag
    • -257
    • +0
    /lams_tool_forum/web/WEB-INF/tags/Rating5.tag
  1. … 28 more files in changeset.
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.