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 switch to using lams:TSTable5 tag

  1. … 7 more files in changeset.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 26 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-5424 tag's title attribute is no longer required

  1. … 6 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

  1. … 27 more files in changeset.
LDEV-5397 fix missing Forum's instructions

LDEV-5424 pull up content into RestrictedUsageAccordian.tag

    • -40
    • +0
    ./monitoring/parts/daterestriction.jsp
  1. … 2 more files in changeset.
LDEV-5424 boostrap5 Forum's monitoring

    • -97
    • +94
    ./monitoring/parts/advanceOptions.jsp
    • -17
    • +28
    ./monitoring/parts/daterestriction.jsp
    • -109
    • +103
    ./monitoring/viewmarks.jsp
  1. … 9 more files in changeset.
LDEV-5442 rename Rating5.tag -> Rating.tag

  1. … 42 more files in changeset.
LDEV-5442 switch to using lams:Rating tag instead of jRating plugin in Forum tool

  1. … 4 more files in changeset.
LDEV-5397 Change label from Finish to Post

LDEV-5397 fix label's 'for' attribute

LDEV-5436 Project-wide user sorting by last then first name

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

LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -31
    • +0
    ./monitoring/parts/advanceOptions.jsp
  1. … 507 more files in changeset.
LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

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

  1. … 24 more files in changeset.
LDEV-5397 upadte alerts on submitting posts

LDEV-5397 turn off expanding children on clicking on forum topic body

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. … 13 more files in changeset.
Merge v4.7 into LDEV-5397

    • -144
    • +144
    ./learning/message/bodyarea.jsp
    • -101
    • +108
    ./learning/message/topicview.jsp
  1. … 71 more files in changeset.
LDEV-5397 bootstrap5 related improvements and fixes

  1. … 26 more files in changeset.
LDEV-5397 bootstrap5 Forum tool

    • -15
    • +29
    ./learning/message/msgattachment.jsp
    • -18
    • +5
    ./learning/message/msgviewwrapper.jsp
    • -6
    • +29
    ./learning/message/topiceditform.jsp
    • -11
    • +21
    ./learning/message/topicform.jsp
    • -67
    • +66
    ./learning/message/topiclist.jsp
    • -12
    • +37
    ./learning/message/topicreplyform.jsp
    • -38
    • +12
    ./learning/message/topicview.jsp
    • -9
    • +3
    ./learning/message/topicviewwrapper.jsp
  1. … 6 more files in changeset.
LDEV-5397 <lams:textarea> has now simple "id" attribute without "__lamstextarea" suffix

As ids containing "__lamstextarea" complicate creation of ARIA labels.

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

    • -10
    • +10
    ./learning/message/topiclist.jsp
  1. … 96 more files in changeset.
LDEV-4917 Add Italian to Uppy i18n in Forum

Fix the UI a bit too.

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

- Forum

    • -1
    • +1
    ./monitoring/parts/daterestriction.jsp
  1. … 7 more files in changeset.