Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_tool_sbmt/web/learner/sbmtlearner.jsp

  1. … 9 more files in changeset.
LDEV-5397 Boostrap 5 bundle already has got Popper included

  1. … 33 more files in changeset.
LDEV-5397 add icons to finish and refresh buttons

  1. … 64 more files in changeset.
LDEV-5397 add icons to finish and refresh buttons

  1. … 66 more files in changeset.
LDEV-5397 make SubmissionDeadline.tag call checkNextGateActivity()

  1. … 32 more files in changeset.
LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

    • -0
    • +117
    ./WEB-INF/tags/SubmissionDeadline.tag
  1. … 79 more files in changeset.
LDEV-5397 spread change to LeaderDisplay.tag to all tools

  1. … 32 more files in changeset.
LDEV 5397 remove href="#nogo" and similar nonexistant same-page link

Due to screenreader requirements we can no longer use links having href="#target" when a page does not have this corresponding target. There are a couple of techniques instead of it:

1. links' onclick event should end with "return false;" ("false" can be replaced with anything else but true)

It applies to onclick events specified as tag attributes as well as added with Javascript or jQuery

2. turn links into <button type="button">

3. <a data-bs-toggle="collapse"> having href="#nogo" are OK. presumably as their onclick events return false;

  1. … 7 more files in changeset.
LDEV-5397 Introduce Notebook.tag

    • -0
    • +108
    ./WEB-INF/tags/Notebook.tag
    • -193
    • +153
    ./WEB-INF/tlds/lams/lams.tld
  1. … 70 more files in changeset.
LDEV-5397 center leader alert

  1. … 32 more files in changeset.
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"

  1. … 113 more files in changeset.
LDEV-5397 copy-tags across LAMS projects

  1. … 35 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

    • -0
    • +75
    ./WEB-INF/tags/WaitForLeader.tag
  1. … 66 more files in changeset.
LDEV-5404 Escaping funny characters that break js in tags

- LAMS Central

- LAMS Monitoring

- LAMS Learner

- Assessment

- Gradebook

- Peer Assessment

- Submit

- Scratchie

    • -0
    • +1
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -0
    • +1
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 42 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Submit files

Note that we have to also do this for tags, something I didn't do before. So that's a pending task for all previously changed tools

    • -30
    • +30
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -4
    • +4
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
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

  1. … 329 more files in changeset.
LDEV-5397 Improvements and fixes to Submit Files and Q&A tools

  1. … 7 more files in changeset.
LDEV-5397 accessibility improvements

LDEV-5397 Fixing rows as it is not longer needed in Bootstrap 5

LDEV-5397 Remove unused footer and patch up reflections

LDEV-5397 change container responsiveness to lg instead

LDEV-5397 Submit files definelater and minor adjustments.

  1. … 2 more files in changeset.
LDEV-5397 Fix notebook submit in Submit Files

LDEV-4913 Fix minimum uploads setting

  1. … 2 more files in changeset.
LDEV-5397 Reverting to Marcin's toasts and some small alignments

LDEV-5397 Submit files adjust learner submit files list

  1. … 1 more file in changeset.