monitoring

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. … 25 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 516 more files in changeset.
LDEV-5331 Add missing title and autocomplete attr to submission deadline

  1. … 18 more files in changeset.
LDEV-4825 Introduce item analysis tooltips in MCQ tool

  1. … 1 more file in changeset.
LDEV-4825 Introduce RAG colouring for item analysis in other places

  1. … 2 more files in changeset.
LDEV-4391 Turn off auto complete for datetime picker fields

If a text input field is used for datetimepicker, having previously

chosen dates auto filled is annoying and makes it difficult to operate

the picker.

  1. … 16 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 83 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

  1. … 463 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. … 181 more files in changeset.
LDEV-4932 Add CSRF Excel export in tools

  1. … 9 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

  1. … 109 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-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

  1. … 9 more files in changeset.
LDEV-4825 Display QB stats in MCQ tool monitoring

  1. … 4 more files in changeset.
LDEV-4818 Add title property to MCQ questions

  1. … 34 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. … 385 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 502 more files in changeset.
LDEV-4746 Use QB option directly instead of MCQ option

Keeping a reference from MCQ option to QB option proved unnecessary and

problematic. It is sufficient for QB question to keep this reference.

  1. … 25 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. … 7 more files in changeset.
LDEV-4440 Migration of Chat - controllers, no tiles and no struts

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

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

  1. … 47 more files in changeset.