Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5083 Don't show lesson status changer if it was Removed

    • -2
    • +4
    ./includes/javascript/monitorLesson.js
LDEV-5200 Prevent 4th learner icon from going under counter circle

    • -1
    • +1
    ./includes/javascript/monitorLesson.js
  1. … 1 more file in changeset.
LDEV-5436 Add comma in usernames in various places

    • -5
    • +3
    ./includes/javascript/monitorLesson.js
  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

    • -2
    • +2
    ./includes/javascript/monitorLesson.js
  1. … 33 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-4601 Fix lesson scheduling

    • -3
    • +6
    ./includes/javascript/monitorLesson.js
LDEV-5096 Move Close Gate button up

Some teachers think it is a Close Dialog button and get confused.

LDEV-4601 Fix lesson start/finish date format

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. … 135 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. … 68 more files in changeset.
LDEV-5401 Add tooltip to "Finish now" button

  1. … 1 more file in changeset.
LDEV-5401 Hide individual extension from widget after learner finished

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

LDEV-5428 Remove lesson presence and chat

    • -87
    • +0
    ./includes/javascript/monitorLesson.js
  1. … 37 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

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

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

  1. … 3 more files in changeset.
LDEV-4014 Make "Delete" button in red when force completing backwards

LDEV-5401 Keep showing individual extensions after timer expires

LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

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

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

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

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

    • -2
    • +2
    ./includes/javascript/monitorLesson.js
  1. … 145 more files in changeset.
LDEV-5397 copy-tags

  1. … 31 more files in changeset.
LDEV-5425 copy-tags

    • -71
    • +10
    ./WEB-INF/tags/SubmissionDeadline.tag
  1. … 154 more files in changeset.
LDEV-5401 Display individual extensions in time limit widget

  1. … 4 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 copy-tags

    • -11
    • +10
    ./WEB-INF/tags/LeaderDisplay.tag
    • -133
    • +163
    ./WEB-INF/tags/PageLearner.tag
  1. … 154 more files in changeset.
LDEV-5426 Switch from custom time zones to built-in Java ones

    • -0
    • +111
    ./allQuestionsList.jsp
    • -0
    • +72
    ./assessmentAnswers.jsp
  1. … 39 more files in changeset.
LDEV-5083 Fix scrolling of wide LDs in monitoring