Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_scratchie/web/pages/authoring/authoring.jsp

  1. … 5 more files in changeset.
LDEV-5452 Allow changing question version in live Assessment and Scratchie

Also fix existing learners' answers rewiring.

  1. … 8 more files in changeset.
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-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.
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.
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

    • -3
    • +21
    ./includes/css/scratchie-learning.scss
  1. … 7 more files in changeset.
LDEV-5420 Add questions print button to Scratchie

  1. … 2 more files in changeset.
LDEV-5397 copy-tags

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

    • -1
    • +1
    ./pages/learning/parts/scratchieSvg.jsp
LDEV-5425 copy-tags

    • -71
    • +10
    ./WEB-INF/tags/SubmissionDeadline.tag
  1. … 154 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -5
    • +0
    ./pages/learning/submissionDeadline.jsp
    • -30
    • +0
    ./pages/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

    • -2
    • +2
    ./pages/monitoring/studentChoices5.jsp
  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.