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 introduce submissionDeadline.tag

* switched to using this tag in all tools

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

  1. … 81 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Vote

  1. … 12 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. … 108 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 336 more files in changeset.
LDEV-5219 Use versioned JS import for gate check JS file

  1. … 52 more files in changeset.
LDEV-5219 Check gate after Vote activity

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

  1. … 33 more files in changeset.
LDEV-5143 Improve layout of wait for leader and change leader screens.

  1. … 15 more files in changeset.
LDEV-5138 Set leader only on his activity entry, not on any user entry

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

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 197 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 390 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 501 more files in changeset.
LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

  1. … 138 more files in changeset.
LDEV-4440 Use a text in button body and not as value attribute

LDEV-4440 <input> tag can't have a closing tag in HTML

Also change <input type="submit"></input> into <button>, as otherwise

button's label is displayed incorrectly

  1. … 15 more files in changeset.
LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

  1. … 26 more files in changeset.
LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

  1. … 32 more files in changeset.
LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

  1. … 60 more files in changeset.
LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

  1. … 83 more files in changeset.
LDEV-4227: Restoring the next activity arrow lost in the previous check in.

LDEV-4227: Disabling submission buttons when user tries to go from screen to screen to stop double submission

LDEV-3724: Removing <html:base/> references which cause junk to be shown in the online presence / chat area.

LDEV-3936: Adding jquery for progress bar support.

LDEV-3827 Remove JQM mobile interface

    • -173
    • +0
    ./mobile/IndividualLearnerResults.jsp
    • -159
    • +0
    ./mobile/RevisitedAllNominations.jsp
  1. … 41 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. … 333 more files in changeset.
LDEV-3686: Update vote learner for bootstrap

    • -87
    • +101
    ./IndividualLearnerResults.jsp
  1. … 6 more files in changeset.
LDEV-3670: Hiding open text entries in learner

  1. … 4 more files in changeset.
LDEV-3670: Hiding open text entries in learner

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

  1. … 161 more files in changeset.