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 rename Page5.tag->PageAdmin.tag

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

  1. … 150 more files in changeset.
LDEV-5397 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

  1. … 49 more files in changeset.
LDEV-5391 Add Gallery Walk cluster view

  1. … 10 more files in changeset.
LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

  1. … 52 more files in changeset.
LDEV-5338 Rename class to reflect its purpose better

  1. … 6 more files in changeset.
LDEV-5337 Rewrite Chosen Groups view to Bootstrap 5 and LAMS palette

  1. … 18 more files in changeset.
LDEV-4886 Automated tests for v4.0

  1. … 19 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 198 more files in changeset.
LDEV-4911 Adding ides to test monitor starting new lesson

  1. … 4 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-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

  1. … 10 more files in changeset.
LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

  1. … 29 more files in changeset.
LDEV-4440 trying to solve problems with grouping upload

  1. … 2 more files in changeset.
LDEV-4440 Monitoring - noStruts and no tiles

  1. … 55 more files in changeset.
LDEV-4440 Migration of monitoring - changes at jsp files

  1. … 24 more files in changeset.
LDEV-4484 Print Grouping Page

  1. … 10 more files in changeset.
LDEV-4457 Create groupings based on file upload

  1. … 15 more files in changeset.
LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

  1. … 12 more files in changeset.
LDEV-3885: Add view grouping interface.

  1. … 2 more files in changeset.
LDEV-3820: Updating grouping pages to Bootstrap

  1. … 21 more files in changeset.
LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, servlets etc. Rename/rewrite methods for Flashless use.

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

  1. … 169 more files in changeset.
LDEV-3120: Use course groups in lessons.

    • -0
    • +154
    ./chosenGroupingFlash.jsp
  1. … 10 more files in changeset.
LDEV-2170 moved playerProduct swf for flex apps.

  1. … 3 more files in changeset.
Hopefully solving the problem of grouping/branching not appearing

    • binary
    ./playerProductInstall.swf
  1. … 1 more file in changeset.
LDEV-2036: ViewMode wasn't being checked correctly, labels added to make instructions clearer LDEV-2044: Label for live edit checkbox was in dictionary files but not being used, corrected

  1. … 6 more files in changeset.
LDEV-2036 Grouping now showing in viewMode (src typo) LDEV-2026 Flashless presence showing all characters perfect (html), in Flash latin accents are removed to ensure that they display correctly (mx2004 issue?) LDEV-2025 Flash presence now displaying OK in IE6 LDEV-2040 New checkboxes were not being skinned

  1. … 27 more files in changeset.