Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5083 Adjust size of discussion sentiment widget

    • -0
    • +5
    ./pages/monitoring/parts/burningQuestions5.jsp
  1. … 2 more files 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.
LDEV-5424 distribute updated RestrictedUsageAccordian.tag to all tools using it

  1. … 26 more files in changeset.
LDEV-5424 update to RestrictedUsageAccordian.tag and copy-tags

    • -3
    • +3
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 62 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-5424 wrap timelimit widget with an accordion

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

    • -0
    • +214
    ./pages/monitoring/studentChoices.jsp
    • -214
    • +0
    ./pages/monitoring/studentChoices5.jsp
LDEV-5424 tag's title attribute is no longer required

    • -4
    • +7
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 6 more files in changeset.
LDEV-5424 bootstrap5 Scratchie monitoring

    • -233
    • +0
    ./pages/monitoring/parts/burningQuestions.jsp
    • -71
    • +0
    ./pages/monitoring/parts/burningQuestions5.jsp
    • -29
    • +0
    ./pages/monitoring/parts/dateRestriction.jsp
    • -69
    • +62
    ./pages/monitoring/parts/itemSummary.jsp
    • -22
    • +25
    ./pages/monitoring/parts/statisticpart.jsp
    • -414
    • +0
    ./pages/monitoring/studentChoices.jsp
    • -50
    • +53
    ./pages/monitoring/studentChoices5.jsp
    • -2
    • +1
    ./pages/monitoring/studentChoicesTable.jsp
    • -89
    • +124
    ./pages/monitoring/summary.jsp
    • -0
    • +93
    ./pages/tblmonitoring/burningQuestions.jsp
    • -0
    • +210
    ./pages/tblmonitoring/burningQuestionsTable.jsp
  1. … 1 more file in changeset.
LDEV-5424 copy-tags

    • -12
    • +12
    ./WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +84
    ./WEB-INF/tags/PageAdmin.tag
    • -0
    • +146
    ./WEB-INF/tags/PageMonitor.tag
    • -15
    • +48
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 186 more files in changeset.
LDEV-5424 rename Page5.tag->PageAdmin.tag

  1. … 71 more files in changeset.
LDEV-5424 fix tooltips and switch to bootstrap5 versions of .js and .css files

    • -2
    • +2
    ./pages/monitoring/parts/itemSummary.jsp
    • -5
    • +5
    ./pages/monitoring/parts/statisticpart.jsp
    • -1
    • +1
    ./pages/monitoring/studentChoices5.jsp
  1. … 24 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 28 more files in changeset.
LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

    • -565
    • +0
    ./WEB-INF/tags/StyledRating5.tag
  1. … 30 more files in changeset.
LDEV-5442 copy-tags

    • -270
    • +248
    ./WEB-INF/tags/StyledRating.tag
  1. … 155 more files in changeset.
LDEV-5442 rename Rating5.tag -> Rating.tag

  1. … 42 more files in changeset.
LDEV-5442 rename StyledRating5.tag -> StyledRating.tag

    • -553
    • +0
    ./WEB-INF/tags/StyledRating5.tag
  1. … 35 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. … 134 more files in changeset.
LDEV-5442 copy-tags

  1. … 30 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. … 67 more files in changeset.
LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

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

# Conflicts:

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

LDEV-5397 Enhanced mobile experience

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

  1. … 31 more files in changeset.
LDEV-5397 fix expanding/collapsing icons

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

    • -0
    • +11
    ./includes/css/scratchie-learning.scss
LDEV-5437 prevent questions and instructions to be copy/paste or print

    • -0
    • +11
    ./includes/css/scratchie-learning.scss
LDEV-5397 Fix scratchies not being revealed for non-leaders

LDEV-5397 copy-tags

  1. … 62 more files in changeset.