Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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 wrap timelimit widget with an accordion

  1. … 1 more file in changeset.
LDEV-5424 fix jsp file name

    • -214
    • +0
    ./monitoring/studentChoices5.jsp
LDEV-5424 bootstrap5 Scratchie monitoring

    • -233
    • +0
    ./monitoring/parts/burningQuestions.jsp
    • -71
    • +0
    ./monitoring/parts/burningQuestions5.jsp
    • -207
    • +0
    ./monitoring/parts/burningQuestionsTable.jsp
    • -29
    • +0
    ./monitoring/parts/dateRestriction.jsp
    • -69
    • +62
    ./monitoring/parts/itemSummary.jsp
    • -22
    • +25
    ./monitoring/parts/statisticpart.jsp
    • -50
    • +53
    ./monitoring/studentChoices5.jsp
    • -0
    • +93
    ./tblmonitoring/burningQuestions.jsp
    • -0
    • +210
    ./tblmonitoring/burningQuestionsTable.jsp
  1. … 2 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

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

  1. … 28 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

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

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

# lams_tool_lamc/web/learning/AnswersContent.jsp

# lams_tool_laqa/web/learning/AnswersContent.jsp

# lams_tool_scratchie/web/pages/learning/learning.jsp

  1. … 138 more files in changeset.
LDEV-5290 Identify tabs better when checking for multiple open tabs

A minimised window can skip setInterval() ticks. This lead to incorrect detection of multiple tabs open - a single open tab could produce this message.

  1. … 69 more files in changeset.
Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_tool_whiteboard/web/pages/learning/learning.jsp

LDEV-5397 fix expanding/collapsing icons

LDEV-5437 prevent questions and instructions to be copy/paste or print

  1. … 1 more file in changeset.
LDEV-5437 prevent questions and instructions to be copy/paste or print

  1. … 1 more file in changeset.
LDEV-5397 Fix scratchies not being revealed for non-leaders

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

  1. … 150 more files in changeset.
LDEV-5397 fix portraits sources

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

  1. … 8 more files in changeset.
LDEV-5420 Add questions print button to Scratchie

  1. … 2 more files in changeset.
LDEV-5397 round scratchies

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

    • -30
    • +0
    ./monitoring/parts/advanceOptions.jsp
  1. … 511 more files in changeset.
LDEV-5363 Make RAT questions sync optional

  1. … 11 more files in changeset.
LDEV-5397 fix inability to double click when such option is ON

LDEV-5401 Display individual extensions in time limit widget

  1. … 5 more files in changeset.
LDEV-5397 improve burning questions' CSS at the results page

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. … 21 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/web/timezoneManagement.jsp

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_doku/conf/language/lams/ApplicationResources.properties

# lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_survey/conf/language/lams/ApplicationResources_de_DE.properties

# lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties

# lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties

  1. … 9 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. … 14 more files in changeset.
LDEV-5427 fix a typo

LDEV-5427 Start using new svgs for scatchie images

    • -0
    • +65
    ./learning/parts/scratchieSvg.jsp
  1. … 16 more files in changeset.