Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5041 Add absolute time limit feature to Assessment

  1. … 5 more files in changeset.
LDEV-5041 Control relative time limit in Assessment monitor

  1. … 5 more files in changeset.
LDEV-5041 Rewrite Assessment time limit with websockets

  1. … 3 more files in changeset.
LDEV-5041 Rewrite Assessment time limit to Java 8 time classes

LDEV-5052 Adjust rating layout in Assessment monitoring

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

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

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

  1. … 1 more file in changeset.
LDEV-5025 Put own group first in Assessment answer rating table

LDEV-5025 Show detailed answer ratings in Assessment monitoring

  1. … 2 more files in changeset.
LDEV-5025 Show average answer rating in Assessment monitoring

  1. … 1 more file in changeset.
LDEV-5025 Allow Assessment other groups' answer rating and commenting

  1. … 11 more files in changeset.
LDEV-5024 Import QB questions to AE in TBL template

  1. … 6 more files in changeset.
LDEV-5024 Detect and process QB question modification

LDEV-4997 Renormalize line endings with git

  1. … 420 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. … 27 more files in changeset.
LDEV-5015 Set iRA confidence level type on TBL template save

LDEV-5015 Fix question duplication on TBL template save

LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

  1. … 3 more files in changeset.
LDEV-5009 Add student's choices table to Assessment regular monitor

  1. … 4 more files in changeset.
LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Conflicts:

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

  1. … 1 more file in changeset.
LDEV-5002 Show Etherpads in Assessment monitoring user summary page

  1. … 1 more file in changeset.
LDEV-5002 Add advanced authoring option to control Etherpads display

  1. … 1 more file in changeset.
LDEV-5002 Add advanced authoring option to control Etherpads display

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

  1. … 1 more file in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

  1. … 3 more files in changeset.
LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

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

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

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

lams_tool_assessment/web/pages/learning/learning.jsp

  1. … 3 more files in changeset.
LDEV-4961 Export Assessment confidence levels

  1. … 1 more file in changeset.
LDEV-4945 Fix mysql comments on patch files

LDEV-4976 Add DB cascades to reflect Hibernate inheritance

  1. … 3 more files in changeset.