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

  1. … 517 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. … 505 more files in changeset.
LDEV-4440 Fix Pixlr edited image update

  1. … 1 more file in changeset.
LDEV-4440 Scribe & Scratchie work in progress

  1. … 38 more files in changeset.
LDEV-4440 Pixlr nostruts library

  1. … 43 more files in changeset.
LDEV-4440 Q&A learning

  1. … 8 more files in changeset.
LDEV-4440 Pixlr & Q&A fixes

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

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

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

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 42 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-4286 Open Edit Activity in monitor page in the same frame as it was clicked (default option) throughout all tools. As some tools have used target="_blank" attribute for the link opening this page.

  1. … 8 more files in changeset.
LDEV-3800 Update PixIr Author and Monitor to Bootstrap

    • -0
    • +70
    ./advanceOptions.jsp
  1. … 21 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. … 339 more files in changeset.
LDEV-2463: escape HTML to prevent possible XSS attacks

  1. … 4 more files in changeset.
LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

  1. … 338 more files in changeset.
LDEV-2817: Remove references to nonexistent css files in tools

  1. … 21 more files in changeset.
LDEV-1730 If Tool is not group do now show the group reference

  1. … 15 more files in changeset.
LDEV-2459 use double quotes when enclosing i18n text in javascript

  1. … 47 more files in changeset.
LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 97 more files in changeset.
LDEV-2076 Sharing lams_tool_pixlr project

  1. … 146 more files in changeset.