Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

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

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

# lams_learning/web/css/components-learner.scss

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

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

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

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

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

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

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

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

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

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

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

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

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

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

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

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

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

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

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

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

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

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

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

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

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

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

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

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

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

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

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

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

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

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

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

    • -1
    • +18
    ./pages/monitoring/parts/advanceoptions.jsp
    • -1
    • +1
    ./pages/monitoring/parts/usersummary.jsp
    • -44
    • +51
    ./pages/monitoring/statisticpart.jsp
  1. … 8 more files in changeset.
LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

  1. … 51 more files in changeset.
LDEV-5449 Add "allow answer rating" option in learning

LDEV-5449 Add "allow answer rating" option in authoring

    • -1
    • +18
    ./pages/monitoring/parts/advanceoptions.jsp
  1. … 5 more files in changeset.
LDEV-5424 tag's title attribute is no longer required

    • -4
    • +7
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
    • -1
    • +1
    ./pages/monitoring/parts/toolOutput.jsp
  1. … 4 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

    • -2
    • +2
    ./pages/learning/parts/allquestions.jsp
    • -44
    • +65
    ./pages/learning/results/allquestions.jsp
    • -28
    • +26
    ./pages/monitoring/editactivity.jsp
    • -151
    • +4
    ./pages/monitoring/monitoring.jsp
    • -111
    • +110
    ./pages/monitoring/parts/advanceoptions.jsp
    • -36
    • +0
    ./pages/monitoring/parts/dateRestriction.jsp
    • -1
    • +2
    ./pages/monitoring/parts/discloseAnswers.jsp
    • -23
    • +26
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -13
    • +13
    ./pages/monitoring/parts/mcqStudentChoices.jsp
    • -166
    • +156
    ./pages/monitoring/parts/questionsummary.jsp
    • -24
    • +18
    ./pages/monitoring/parts/toolOutput.jsp
  1. … 13 more files in changeset.
LDEV-5447 Bring back colour backgrounds when sharing MCQ groups answers in assessment

LDEV-5444 Do not display histogram when there are no answers yet

    • -57
    • +62
    ./pages/monitoring/statisticpart.jsp
SP-9 Reintroduce histogram to Assessment monitoring

LDEV-5424 copy-tags

    • -12
    • +12
    ./WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +84
    ./WEB-INF/tags/PageAdmin.tag
    • -0
    • +146
    ./WEB-INF/tags/PageMonitor.tag
    • -15
    • +48
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 186 more files in changeset.
LDEV-5424 rename Page5.tag->PageAdmin.tag

  1. … 71 more files in changeset.
SP-9 Reintroduce histogram to Assessment monitoring

LDEV-5424 switch to bootstrap5 versions of js and jsps

    • -43
    • +42
    ./pages/monitoring/parts/discloseAnswers.jsp
    • -120
    • +0
    ./pages/monitoring/parts/discloseAnswers5.jsp
    • -61
    • +86
    ./pages/monitoring/parts/mcqStudentChoices.jsp
    • -134
    • +0
    ./pages/monitoring/parts/mcqStudentChoices5.jsp
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

    • -29
    • +29
    ./pages/monitoring/parts/usersummary.jsp
LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

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

    • -36
    • +0
    ./pages/learning/resultsbootstrap3/vsa.jsp
  1. … 2 more files in changeset.
LDEV-5442 fix method name

    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
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

    • -1
    • +2
    ./pages/learning/results/allquestions.jsp
    • -60
    • +85
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.
LDEV-5442 copy-tags

    • -270
    • +248
    ./WEB-INF/tags/StyledRating.tag
  1. … 155 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

    • -1
    • +1
    ./pages/learning/results/allquestions.jsp
    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 22 more files in changeset.
LDEV-5442 rename Rating5.tag -> Rating.tag

  1. … 41 more files in changeset.
LDEV-5442 make monitoring use new starability widget

    • -1
    • +1
    ./pages/monitoring/parts/discloseAnswers5.jsp
    • -7
    • +3
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 22 more files in changeset.
LDEV-5442 teachers can't rate

    • -0
    • +1
    ./pages/learning/results/allquestions.jsp
LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

    • -553
    • +0
    ./WEB-INF/tags/StyledRating5.tag
  1. … 35 more files in changeset.
LDEV-5360 Show max mark in tooltip in Assessment monitoring

    • -8
    • +23
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
    • -375
    • +391
    ./pages/monitoring/parts/usersummary.jsp
LDEV-5360 Show max mark in tooltip in Assessment monitoring

    • -8
    • +23
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
    • -0
    • +16
    ./pages/monitoring/parts/usersummary.jsp
LDEV-5397 Fix displaying the same justification for all teams

    • -1
    • +1
    ./pages/learning/results/allquestions.jsp
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

    • -363
    • +373
    ./pages/monitoring/parts/usersummary.jsp
  1. … 132 more files in changeset.
LDEV-5360 Indicate auto-graded answers

    • -55
    • +54
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -2
    • +2
    ./pages/monitoring/parts/questionsummary.jsp
    • -6
    • +6
    ./pages/monitoring/parts/usersummary.jsp
  1. … 2 more files in changeset.
LDEV-5360 Allow even longer marker comments

Caused by

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

    • -1
    • +1
    ./pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./pages/monitoring/parts/usersummary.jsp
  1. … 1 more file in changeset.