Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5436' into v4.8

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

# lams_tool_images/web/pages/learning/learning.jsp

  1. … 34 more files in changeset.
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

# lams_central/web/includes/javascript/rating5.js

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

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

# lams_learning/web/css/components-learner.scss

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

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

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

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

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

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

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

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

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

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  1. … 13 more files in changeset.
LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

  1. … 51 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

  1. … 23 more files in changeset.
LDEV-5442 rename Rating5.tag -> Rating.tag

  1. … 42 more files in changeset.
LDEV-5442 switch learning to the new star rating widget

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

  1. … 150 more files in changeset.
LDEV-5397 Enhanced mobile experience

  1. … 1 more file in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 518 more files in changeset.
LDEV-5397 increase font weight and size for image gallery's captions

LDEV-5397 show warnings and nofications before activity's instructions

  1. … 14 more files in changeset.
LDEV-5397 switch from lams:errors to lams:errors5

  1. … 15 more files in changeset.
Merge v4.7 into LDEV-5397

  1. … 78 more files in changeset.
LDEV-5397 bootstrap5 related improvements and fixes

  1. … 26 more files in changeset.
LDEV-5397 replace "container-lg" with custom "container-main" class

so it will be easier switching between container's classes in the future if needed

  1. … 23 more files in changeset.
LDEV-5397 bootstrap5 Image Gallery tool

  1. … 10 more files in changeset.
LDEV-5397 switch to updated version of tablesorter

  1. … 5 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

  1. … 95 more files in changeset.
LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

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

- Image gallery, missed one file

LDEV-4917 Add Italian to Uppy i18n in Image gallery

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

- Image gallery

  1. … 11 more files in changeset.
LDEV-5397 remove obsolete jsps

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

  1. … 337 more files in changeset.
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

  1. … 56 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

  1. … 56 more files in changeset.
LDEV-5298 Improve Uppy and Submit Files UI

Uppy font globally is smaller.

In Submit Files the upload area is thinner and has a distinct

background. The upload button matches its colour.

Fix Uppy language detection in Submit Files.

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

  1. … 54 more files in changeset.
LDEV-5219 Check gate after Image Gallery activity