Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4607 Confirm delete marks on output change in monitoring

  1. … 3 more files in changeset.
LDEV-4607 Remove marks on output change to "none" in monitoring

    • -1
    • +1
    ./pages/monitoring/parts/toolOutput.jsp
  1. … 10 more files in changeset.
LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor

    • -4
    • +4
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.
LDEV-4586 Letter prefixes shown on results page

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

    • -1
    • +35
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -3
    • +6
    ./pages/learning/parts/multiplechoice.jsp
  1. … 9 more files in changeset.
LDEV-4559 Comments can be left anonymously.

  1. … 91 more files in changeset.
LDEV-4575 Show disclose buttons only when corresponding option is ON

    • -14
    • +16
    ./pages/tblmonitoring/assessment.jsp
LDEV-4569 TBL UI: adjustments

* wrap lesson's name

* revice the LAMS logo at the top left corner

* Make TBL monitor to follow themes

* AEs' tab title is "AEs Questions & Marks" now

  1. … 5 more files in changeset.
LDEV-4540 Fix variable name clash when iterating over options

LDEV-4540 Prevent non-leader Assessments from using answer disclosing

LDEV-4540 Change layout of other groups' answers for MC questions

  1. … 1 more file in changeset.
LDEV-4540 Show correct answers and user's answers separately

LDEV-4540 Move groups' answers under each question

    • -138
    • +0
    ./pages/learning/results/tblsummary.jsp
  1. … 1 more file in changeset.
LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

    • -1
    • +1
    ./pages/learning/results/tblsummary.jsp
LDEV-4540 Allow disclosing correct/groups answers in plain monitoring

    • -1
    • +0
    ./pages/monitoring/parts/questionsummary.jsp
    • -14
    • +152
    ./pages/monitoring/summary.jsp
  1. … 2 more files in changeset.
LDEV-4540 Refresh learners' results page when monitor discloses answers

    • -0
    • +11
    ./pages/learning/results/tblsummary.jsp
  1. … 4 more files in changeset.
LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

  1. … 35 more files in changeset.
LDEV-4540 Add "disclose all" buttons to TBL monitor

    • -13
    • +73
    ./pages/tblmonitoring/assessment.jsp
  1. … 2 more files in changeset.
LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

    • -48
    • +53
    ./pages/learning/results/tblsummary.jsp
    • -2
    • +36
    ./pages/tblmonitoring/assessment.jsp
  1. … 10 more files in changeset.
LDEV-4540 Show other teams' answers on results page

    • -64
    • +111
    ./pages/learning/results/tblsummary.jsp
  1. … 1 more file in changeset.
LDEV-4540 Show answers of current team

    • -0
    • +75
    ./pages/learning/results/tblsummary.jsp
  1. … 1 more file in changeset.
LDEV-4540 Let author choose whether to disclose answers in monitor

  1. … 5 more files in changeset.
Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

  1. … 83 more files in changeset.
LDEV-4533 Exception details are hidden as per system config

  1. … 34 more files in changeset.
LDEV-4532 Opening collapsable panels no longer makes screen jump

    • -1
    • +1
    ./pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    ./pages/authoring/parts/shortansweroption.jsp
  1. … 4 more files in changeset.
LDEV-4531 Essay Question displays 8 rows for text entry

LDEV-4532 Burning Questions accessible on iPad

Also did the same fix to similar entries in authoring to ensure

they would work on an iPad

    • -2
    • +2
    ./pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +3
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    ./pages/authoring/parts/shortansweroption.jsp
  1. … 3 more files in changeset.
Merge branch 'LDEV-4520'

  1. … 1 more file in changeset.
LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

    • -2
    • +11
    ./pages/tblmonitoring/assessment.jsp
    • -0
    • +139
    ./pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 10 more files in changeset.
LDEV-4520 Fix export excel feature for AEs tab