Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5360 Add additional marking info to spreadsheet export

LDEV-5360 Use core User instead of AssessmentUser for markedBy column

Merge remote-tracking branch 'origin/LDEV-5360' into v4.6

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

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

  1. … 11 more files in changeset.
LDEV-5366 Make auto expand configurable in Tool settings in sysadmin

Disabled by default

  1. … 3 more files in changeset.
LDEV-5360 Use core User instead of AssessmentUser for markedBy column

AssessmentUser may not exist for an Assessment monitor.

LDEV-5360 Put grade column next to marker column on the right

  1. … 3 more files in changeset.
LDEV-5360 Add marker information to spreadsheet export

LDEV-5360 Add marker information to other monitoring views

  1. … 4 more files in changeset.
LDEV-5360 Add marker's comment to question result

  1. … 4 more files in changeset.
LDEV-5359 Enable paging and sections to non-leaders

LDEV-5359 Add "all remaining questions" option for section

  1. … 2 more files in changeset.
LDEV-5359 Add Assessment section learning

  1. … 4 more files in changeset.
LDEV-5359 Add Assessment section model and authoring

  1. … 3 more files in changeset.
LDEV-4746 Show all correct answers in AE tab in monitoring

LKC-221 Set question mark when replacing question from QA

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 10 more files in changeset.
LDEV-5352 Add traffic lights colours to iRAT students' choices table

  1. … 1 more file in changeset.
LDEV-5351 Add marking teacher front end

  1. … 6 more files in changeset.
LDEV-5351 Add marking teacher model

LDEV-5200 Fix encoding in Assessment chart

  1. … 1 more file in changeset.
LDEV-5344 point to the correct table part

The jsp initially is loading the correct .jsp, but then java is returning the wrong path

  1. … 2 more files in changeset.
Merge branch 'LDEV-5336' into v4.7

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 34 more files in changeset.
LDEV-5341 Refactor Security Service

  1. … 35 more files in changeset.
LDEV-3265 Allow to skip required questions in Preview mode

  1. … 2 more files in changeset.
LDEV-4900 Copy answers to non-leader on force complete Assessment

LDEV-5336 Add table with all learners' results

  1. … 3 more files in changeset.
LDEV-5332 General clean up

  1. … 1 more file in changeset.
LDEV-5328 Squash DB patches and update versions

  1. … 141 more files in changeset.