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. … 29 more files in changeset.
LDEV-5424 boostrap5 Share Resources' monitoring

  1. … 1 more file in changeset.
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. … 52 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

  1. … 30 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 27 more files in changeset.
LDEV-5424 no need for bootstrap 3 versions any longer

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

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

  1. … 42 more files in changeset.
LDEV-5442 make monitoring use new starability widget

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

  1. … 20 more files in changeset.
LDEV-5397 switch to Bootstrap Validation CSS classes

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

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

  1. … 514 more files in changeset.
LDEV-5397 divs not having any special roles can't have aria-labels

  1. … 11 more files in changeset.
LDEV-5397 make sure all buttons have proper "type" attribute

  1. … 24 more files in changeset.
LDEV-5397 minor bug fixes

  1. … 3 more files in changeset.
LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

  1. … 15 more files in changeset.
LDEV-5397 introduce hideHeader and hideTitle attributes to PageLearner tag

* bootstrap5 lessonIntro.jsp, loadToolActivity.jsp, and similar pages. Use new attributes there

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

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

  1. … 79 more files in changeset.
LDEV-5397 redesign comments UI

  1. … 15 more files in changeset.
LDEV-5397 improvements to Share resources tool

LDEV-5397 miscellaneous minor UI fixes

  1. … 4 more files in changeset.
LDEV-5397 bootstrap5 Share Resources

  1. … 8 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. … 102 more files in changeset.
LDEV-4917 Add Italian to Uppy i18n in Shared resources

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

# Conflicts:

# lams_tool_sbmt/web/learner/sbmtlearner.jsp

  1. … 7 more files in changeset.