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-5424 boostrap5 Daco's monitoring

  1. … 7 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 28 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

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

  1. … 518 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Leader selection

- Data collection

  1. … 29 more files in changeset.
LDEV-5257 Get rid of obsolete prototype.js

  1. … 2 more files in changeset.
LDEV-5213 Replace volatile JS imports with their non-cached version

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

  1. … 83 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-4759 DateTimePicker and Accordians updated

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

  1. … 506 more files in changeset.
LDEV-4440 Daco learning

  1. … 6 more files in changeset.
LDEV-4440 Scratchie autosave fix

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

Implemented in Assessment, Chat, Daco, Forum and Submit.

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

Implemented in Assessment, Chat, Daco, Forum and Submit.

  1. … 74 more files in changeset.
LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

  1. … 29 more files in changeset.
LDEV-3754 LDEV-3755 Cleaning up inconsistencies in DACO found while doing Forum

  1. … 4 more files in changeset.
LDEV-3759: Further work on monitoring LDEV-3755: Further work on authoring

  1. … 16 more files in changeset.
LDEV-3759: Further work on monitoring LDEV-3755: Prototype authoring

  1. … 9 more files in changeset.
LDEV-3729: Created a combined tab navbar for monitoring

  1. … 18 more files in changeset.
LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

  1. … 337 more files in changeset.
LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

  1. … 371 more files in changeset.
LDEV-3615: Modify Data collection monitor UI to support paging, sort and search

    • -0
    • +29
    ./questionSummaries.jsp
    • -0
    • +41
    ./statisticsarea.jsp
  1. … 22 more files in changeset.
LDEV-3615: Modify Data collection monitor UI to support paging, sort and search

    • -0
    • +29
    ./questionSummaries.jsp
    • -0
    • +41
    ./statisticsarea.jsp
  1. … 23 more files in changeset.
LDEV-3465 fixed incorrect rendering of statistics tab

  1. … 1 more file in changeset.
LDEV-3205: improving monitor ui for daco tool

LDEV-3205: layout changes for Daco

LDEV-2463: escape HTML to prevent possible XSS attacks

LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 1 more file in changeset.