Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 further bootstrap 5 related changes

Also

* change bootstrap classes from col-*-offset-* to offset-*-

* deprecated form-group

* .hidden-xs to .d-none .d-sm-block

* .pull-left to .float-start

* .pull-right to .float-end

* add class="activity-bottom-buttons"

    • -15
    • +11
    ./learning/IndividualLearnerResults.jsp
    • -7
    • +7
    ./learning/SequentialAnswersContent.jsp
  1. … 112 more files in changeset.
LDEV-5397 copy-tags across LAMS projects

    • -0
    • +75
    ./WEB-INF/tags/WaitForLeader.tag
  1. … 36 more files in changeset.
LDEV-5397 add missing function preventLearnerAutosaveFromMultipleTabs(autosaveInterval)

  1. … 32 more files in changeset.
LDEV-5397 migrate defineLater tag and jsps to bootstrap 5

  1. … 41 more files in changeset.
LDEV-5397 Introduce WaitForLeader.tag

  1. … 67 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_build/lams_build.eml

# lams_central/web/css/components.css

# lams_gradebook/lams_gradebook.eml

# lams_monitoring/lams_monitoring.eml

# lams_monitoring/web/monitor.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_www/web/public/ckeditor-templates/bootsnippets.js

  1. … 8 more files in changeset.
LDEV-5405 Make Popover tag work with Bootstrap both version 3 and 5

  1. … 32 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5391' into LDEV-5391

# Conflicts:

# idea_project/.idea/.name

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_admin/web/WEB-INF/tags/Rating.tag

# lams_central/web/WEB-INF/tags/Rating.tag

# lams_gradebook/web/WEB-INF/tags/Rating.tag

# lams_learning/web/WEB-INF/tags/Rating.tag

# lams_monitoring/web/WEB-INF/tags/Rating.tag

# lams_tool_assessment/web/WEB-INF/tags/Rating.tag

# lams_tool_chat/web/WEB-INF/tags/Rating.tag

# lams_tool_daco/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/WEB-INF/tags/Rating.tag

# lams_tool_doku/web/pages/authoring/advance.jsp

# lams_tool_doku/web/pages/learning/galleryWalk.jsp

# lams_tool_forum/web/WEB-INF/tags/Rating.tag

# lams_tool_gmap/web/WEB-INF/tags/Rating.tag

# lams_tool_images/web/WEB-INF/tags/Rating.tag

# lams_tool_imscc/web/WEB-INF/tags/Rating.tag

# lams_tool_lamc/web/WEB-INF/tags/Rating.tag

# lams_tool_laqa/web/WEB-INF/tags/Rating.tag

# lams_tool_larsrc/web/WEB-INF/tags/Rating.tag

# lams_tool_leader/web/WEB-INF/tags/Rating.tag

# lams_tool_mindmap/web/WEB-INF/tags/Rating.tag

# lams_tool_nb/web/WEB-INF/tags/Rating.tag

# lams_tool_notebook/web/WEB-INF/tags/Rating.tag

# lams_tool_pixlr/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/.classpath

# lams_tool_preview/web/WEB-INF/tags/Rating.tag

# lams_tool_preview/web/WEB-INF/tags/StyledRating.tag

# lams_tool_sbmt/web/WEB-INF/tags/Rating.tag

# lams_tool_scratchie/web/WEB-INF/tags/Rating.tag

# lams_tool_scribe/web/WEB-INF/tags/Rating.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/Rating.tag

# lams_tool_survey/web/WEB-INF/tags/Rating.tag

# lams_tool_task/web/WEB-INF/tags/Rating.tag

# lams_tool_vote/web/WEB-INF/tags/Rating.tag

# lams_tool_whiteboard/web/WEB-INF/tags/Rating.tag

# lams_tool_wiki/web/WEB-INF/tags/Rating.tag

# lams_tool_zoom/web/WEB-INF/tags/Rating.tag

# lams_www/web/WEB-INF/tags/Rating.tag

  1. … 38 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

    • -5
    • +5
    ./monitoring/MonitoringMaincontent.jsp
  1. … 329 more files in changeset.
LDEV-5397 Improvements and fixes to Submit Files and Q&A tools

    • -177
    • +177
    ./learning/AnswersContent.jsp
    • -35
    • +35
    ./learning/CombinedAnswersContent.jsp
    • -106
    • +106
    ./learning/IndividualLearnerResults.jsp
  1. … 4 more files in changeset.
LDEV-5397 Redesign Q&A learner

Initial redesign of first pages. Still need to figure out the tablesorter components and other bits.

    • -0
    • +48
    ./WEB-INF/tags/Errors5.tag
    • -0
    • +150
    ./WEB-INF/tags/PageLearner.tag
    • -251
    • +250
    ./learning/AnswersContent.jsp
    • -59
    • +57
    ./learning/CombinedAnswersContent.jsp
    • -89
    • +69
    ./learning/IndividualLearnerResults.jsp
    • -53
    • +53
    ./learning/SequentialAnswersContent.jsp
  1. … 1 more file in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

  1. … 32 more files in changeset.
LDEV-5369 Fix Peer Review pivot rubrics results ordering

    • -412
    • +513
    ./WEB-INF/tags/StyledRating.tag
  1. … 32 more files in changeset.
LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

    • -125
    • +138
    ./authoring/newQuestionBox.jsp
  1. … 10 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 34 more files in changeset.
LDEV-5391 Improve comment rating layout

  1. … 34 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5391 Add comments to Doku gallery walk ratings

  1. … 38 more files in changeset.
LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

  1. … 41 more files in changeset.
LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

  1. … 36 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-5357' into v4.7

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

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

WEB-005

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

WEB-005

  1. … 37 more files in changeset.
LDEV-5200 Add proper padding to larger learner content

Before the patch it overlapped with progress bar on the left.

  1. … 32 more files in changeset.
LDEV-5200 Make learner content wider

Max width of 1400 px is consistent with LDEV-5192

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

  1. … 18 more files in changeset.
LDEV-5337 Add new FileUpload tag to all projects

    • -0
    • +82
    ./WEB-INF/tags/FileUpload5.tag
  1. … 62 more files in changeset.
LDEV-5330 Improve accessibility by adding labels to buttons and inputs

  1. … 32 more files in changeset.
LDEV-5330 Merge changes made for tags

    • -0
    • +43
    ./WEB-INF/tags/Alert5.tag
  1. … 200 more files in changeset.
LDEV-5330 Merge changes made for sysadmin

It included upgrading to Bootstrap 5 and using UI guidelines set for

Monitoring UI.

    • -0
    • +534
    ./WEB-INF/tags/Page5.tag
    • -0
    • +53
    ./WEB-INF/tags/TSTable5.tag
    • -0
    • +105
    ./WEB-INF/tags/Widget.tag
  1. … 188 more files in changeset.