Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5041 Add "Finish now" feature

    • -4
    • +13
    ./pages/monitoring/parts/timeLimit.jsp
  1. … 1 more file in changeset.
LDEV-5041 Add absolute time limit feature to Assessment

    • -12
    • +62
    ./pages/monitoring/parts/timeLimit.jsp
    • -32
    • +178
    ./pages/monitoring/summary.jsp
  1. … 7 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

    • -134
    • +139
    ./pages/learning/learning.jsp
    • -0
    • +70
    ./pages/monitoring/parts/timeLimit.jsp
  1. … 4 more files in changeset.
LDEV-5041 Rewrite Assessment time limit with websockets

    • -43
    • +107
    ./pages/learning/learning.jsp
  1. … 9 more files in changeset.
LDEV-5025 Allow leaving comments even after user rated

  1. … 31 more files in changeset.
LDEV-5025 Fix page reloading, not from cache

  1. … 1 more file in changeset.
LDEV-4925 Fix new lines on learner results page in Peer Review

  1. … 31 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

    • -9
    • +11
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 2 more files in changeset.
LDEV-5052 Adjust rating layout in Assessment monitoring

    • -7
    • +7
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.
LDEV-5052 Fix page reloading, not from cache

  1. … 1 more file in changeset.
LDEV-5052 Make "not disclosed" info print out in italics

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

  1. … 32 more files in changeset.
LDEV-5052 Add group name when displaying rating in monitor

    • -3
    • +5
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 1 more file in changeset.
LDEV-5052 Refresh page and scroll to comments on rating

  1. … 32 more files in changeset.
LDEV-5025 Put proper text information when answers not yet disclosed

  1. … 1 more file in changeset.
LDEV-5025 Show own group ratings only when rated other groups

  1. … 2 more files in changeset.
LDEV-5025 Highlight own group when displaying Assessment answer rating

  1. … 1 more file in changeset.
LDEV-5025 Show detailed answer ratings in Assessment monitoring

    • -8
    • +60
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 3 more files in changeset.
LDEV-5025 Show average answer rating in Assessment monitoring

    • -7
    • +27
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 3 more files in changeset.
LDEV-5025 Allow rating only for Leaders

LDEV-5025 Show rating for the given team's own answer

    • -16
    • +26
    ./pages/learning/results/essay.jsp
  1. … 1 more file in changeset.
LDEV-5025 Do not centre an other group's answer in the results table

LDEV-5025 Allow Assessment other groups' answer rating and commenting

  1. … 9 more files in changeset.
LDEV-5030 Sanitise user names for initial Etherpad content

  1. … 32 more files in changeset.
LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

  1. … 32 more files in changeset.
LDEV-4996 Adjust Etherpad autogrow feature

  1. … 31 more files in changeset.
LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

    • -4
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

  1. … 30 more files in changeset.
LDEV-5002 Cosmetic and label changes

  1. … 1 more file in changeset.
LDEV-5002 Cosmetic and label changes

  1. … 1 more file in changeset.