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

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

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

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

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

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

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 29 more files in changeset.
LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

    • -14
    • +49
    ./authoring/parts/questionlistRestricted.jsp
  1. … 7 more files in changeset.
LDEV-5083 Adjust size of discussion sentiment widget

  1. … 2 more files in changeset.
LDEV-5424 abandon tabbed monitoring interface in favor of the breadcrumbs

* Remove dots from the analytics chart as per Ernie's request

    • -2
    • +42
    ./monitoring/parts/advanceoptions.jsp
    • -2
    • +7
    ./monitoring/parts/discloseAnswers.jsp
  1. … 8 more files in changeset.
LDEV-5424 Fix issues. Add Scrollspy

  1. … 4 more files in changeset.
LDEV-5424 introduce new variation of monitoring interface. Assessment tool

  1. … 5 more files in changeset.
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

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

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

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

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

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

    • -1
    • +1
    ./monitoring/parts/masterDetailLoadUp.jsp
  1. … 30 more files in changeset.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 26 more files in changeset.
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
    ./monitoring/parts/advanceoptions.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. … 52 more files in changeset.
LDEV-5449 Add "allow answer rating" option in learning

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

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

  1. … 5 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

    • -44
    • +65
    ./learning/results/allquestions.jsp
    • -18
    • +19
    ./learning/results/multiplechoice.jsp
    • -111
    • +110
    ./monitoring/parts/advanceoptions.jsp
    • -36
    • +0
    ./monitoring/parts/dateRestriction.jsp
    • -1
    • +2
    ./monitoring/parts/discloseAnswers.jsp
    • -23
    • +26
    ./monitoring/parts/masterDetailLoadUp.jsp
    • -13
    • +13
    ./monitoring/parts/mcqStudentChoices.jsp
    • -166
    • +156
    ./monitoring/parts/questionsummary.jsp
    • -24
    • +18
    ./monitoring/parts/toolOutput.jsp
    • -265
    • +240
    ./monitoring/parts/usersummary.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

SP-9 Reintroduce histogram to Assessment monitoring

SP-9 Reintroduce histogram to Assessment monitoring

LDEV-5424 switch to bootstrap5 versions of js and jsps

    • -43
    • +42
    ./monitoring/parts/discloseAnswers.jsp
    • -120
    • +0
    ./monitoring/parts/discloseAnswers5.jsp
    • -61
    • +86
    ./monitoring/parts/mcqStudentChoices.jsp
    • -134
    • +0
    ./monitoring/parts/mcqStudentChoices5.jsp
    • -1
    • +1
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 5 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
    ./monitoring/parts/usersummary.jsp
LDEV-5424 no need for bootstrap 3 versions any longer

    • -114
    • +0
    ./learning/resultsbootstrap3/essay.jsp
    • -34
    • +0
    ./learning/resultsbootstrap3/numerical.jsp
    • -41
    • +0
    ./learning/resultsbootstrap3/ordering.jsp
    • -89
    • +0
    ./learning/resultsbootstrap3/truefalse.jsp
    • -36
    • +0
    ./learning/resultsbootstrap3/vsa.jsp
  1. … 2 more files in changeset.
LDEV-5442 fix method name

    • -1
    • +1
    ./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

    • -60
    • +85
    ./monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.
LDEV-5442 rename rating5.js -> rating.js

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

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

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

LDEV-5360 Show max mark in tooltip in Assessment monitoring

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

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