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 Share Resources' monitoring

  1. … 6 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-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 315 more files in changeset.
LDEV-4440 Shared resource userlist.jsp

LDEV-4440 Shared resources monitoring fixes

  1. … 3 more files in changeset.
LDEV-4440 Share Resources & Q&A tools.

  1. … 72 more files in changeset.
LDEV-3797: Bootstrap monitoring

  1. … 18 more files in changeset.
LDEV-2917: Use <!DOCTYPE html> everywhere.

  1. … 170 more files in changeset.
LDEV-3205: improving monitor ui for Share resources tool

  1. … 5 more files in changeset.
LDEV-2868 * updated jquery.js, jquery-ui.js and jqgrid.js, jquery.layout.js, jqury.mobile.js, jqeury.form.js, jquery.autocomplete.js * removed repetitions of those libraries throughout all Lams * fixed some issues brought up by these updates * jquery.sizzle.js cut out from jquery.js and now it's a separate file

  1. … 764 more files in changeset.
LDEV-2929 fixed problem: Tablesorter with 0 rows throws JS error

  1. … 6 more files in changeset.
LDEV-2705 Improve reporting for Share Resources

  1. … 8 more files in changeset.
LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

  1. … 184 more files in changeset.
RTL changes

  1. … 74 more files in changeset.
Changes pages to suit the "stripes" css styles. Popup() code moved to lams-central so that it isn't duplicated across tools.

  1. … 34 more files in changeset.
Added "copy-tags" to the build to make it easier to update the tags. Updated the jsp pages to support stripes and the separate learner stylesheet.

  1. … 269 more files in changeset.
Monitoring multiple session done.

  1. … 7 more files in changeset.
Added a date tag - keep all our dates consistent! Uses the JSTL fmt:formatDate to do localisation.

  1. … 13 more files in changeset.
New feature from Ernie: Shared Resources Authoring

Tool name in the left panel is "Share Resoruces". It should be "Share Resources"

Drop down menu for the resources available in Basic

Monitor

even when no student has reached the activity the "Edit Activity" tab says "This Activity is no longer editable"

In Summary: We need to add the time and date that the student has access a resource

In Summary: Can we hide/show the entries from the teacher as well ?

In Summary: can the title column have the hyperlink to the resource?

(just in case the teacher wants to view it)

Instructions: view the instructions and files.

Learner

The name of the person that has added a resource is not being displayed (when students can add resources/URLs)

  1. … 20 more files in changeset.
Monitoring works .

  1. … 5 more files in changeset.
Monitoring code basic. No any test.

  1. … 14 more files in changeset.