Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 58 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

  1. … 2 more files in changeset.
LDEV-5083 Update time limits on dashboard using Flux

  1. … 7 more files in changeset.
LDEV-4928 While exporting skip empty VSA options

LDEV-5083 Update all data on AE Assessment student choices using Flux

  1. … 2 more files in changeset.
LDEV-5083 Update all data on iRAT student choices using Flux

  1. … 3 more files in changeset.
LDEV-5083 Rewrite TBL Assessment AES tab to new UI

  1. … 7 more files in changeset.
LDEV-5083 Rewrite TBL iRAT student choices and time limit tab to new UI

  1. … 8 more files in changeset.
LDEV-5083 Rewrite TBL iRAT tab to new UI

  1. … 5 more files in changeset.
LDEV-5083 Rewrite TBL Teams tab modals to new UI

  1. … 8 more files in changeset.
LDEV-2714 Remove AssessmentQuestion when removing reference

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

  1. … 2 more files in changeset.
LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

  1. … 29 more files in changeset.
LDEV-5081 Merge changes made for monitor in LDEV-5083

  1. … 32 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

  1. … 8 more files in changeset.