SummaryContent.jsp

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. … 30 more files in changeset.
LDEV-5397 display sequencial letters a) b) c) at the same line as answers

* proper align for jqgrid's search in monitoring

  1. … 3 more files in changeset.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 26 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 519 more files in changeset.
LDEV-4980 MCQ confidence level labels are switched

  1. … 3 more files in changeset.
LDEV-4980 MCQ confidence level labels are switched

  1. … 3 more files in changeset.
LDEV-4951 Remove traces of MCQ tool from other modules

  1. … 192 more files in changeset.
LDEV-4932 Add CSRF prevention for changing marks in MCQ

Add CSRF prevention for changing marks in MCQ

  1. … 2 more files in changeset.
LDEV-4932 Secure setting submission deadline with CSRF Guard

  1. … 63 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

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

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

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 94 more files in changeset.
LDEV-4805 Finally switch to using free-jqGrid

  1. … 27 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 391 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

  1. … 97 more files in changeset.
LDEV-4440 Finished migration of Multiple Choice

  1. … 10 more files in changeset.
Merge Asia's Image Gallery

  1. … 76 more files in changeset.
LDEV-4440 Started migration of Multiple Choices

  1. … 52 more files in changeset.
LDEV-4451 Add scss files and fix their names

  1. … 9 more files in changeset.
LDEV-4451 Ability to save confidence levels in MCQ

And also return them to Scratchie on request.

  1. … 31 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

  1. … 25 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

  1. … 25 more files in changeset.
LDEV-2866 Code refactoring

  1. … 47 more files in changeset.
LDEV-4320 Remove unnecessary lines

  1. … 2 more files in changeset.
LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

  1. … 4 more files in changeset.
LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).

  1. … 38 more files in changeset.
LDEV-3813: Tweaking JQgrid look and behaviour

LDEV-3813: Bootstrap authoring and monitoring

  1. … 51 more files in changeset.
LDEV-3582 Modify MCQ monitor UI to support paging, sort and search

  1. … 17 more files in changeset.
LDEV-3582 Modify MCQ monitor UI to support paging, sort and search

  1. … 22 more files in changeset.