Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5338 Properly set chosen groups even for other grouping types

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

Conflicts:

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

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

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

  1. … 5 more files in changeset.
LDEV-5383 Allow adding user to all lessons in a course

  1. … 7 more files in changeset.
LDEV-5350 Do not remove groups used for branching on spreadsheet upload

  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. … 11 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

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

Conflicts:

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

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

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

  1. … 6 more files in changeset.
LDEV-4457 Remove empty groups after spreadsheet import

  1. … 1 more file in changeset.
LDEV-5083 Add backend for fetching running time limits in lesson

  1. … 5 more files in changeset.
LDEV-4538 At gate display only learners who have not passed it

Till now if a gate was opened, learners passed it and it was closed

again, it would show all those learners as "knocking at gate". It is

because they "attempted or completed" the activity and gate is closed.

Now TBL monitoring shows only learners who attempted the gate activity

but not completed it.

  1. … 5 more files in changeset.
LDEV-5189 Sort class members by last name when UI requires it

  1. … 4 more files in changeset.
LDEV-5041 Add lesson service utility method

  1. … 4 more files in changeset.
LDEV-4737 Course based lesson delete does not throw exception

  1. … 4 more files in changeset.
LDEV-4474 Able to change the scheduled open date time for a gate.

Also fixed a number of bugs causing the schedule gate screens to

report strange times, missing fields, etc.

  1. … 14 more files in changeset.
LDEV-4457 Create groupings based on file upload

  1. … 14 more files in changeset.
LDEV-3662: Add sysadmin interface to delete preview lessons.

  1. … 9 more files in changeset.
LDEV-3902: Bootstrapping the intro screen.

LDEV-3902: Fix lesson intro edit saving. Fix lesson intro thumbnail.

  1. … 4 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 780 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

  1. … 1858 more files in changeset.
LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, servlets etc. Rename/rewrite methods for Flashless use.

  1. … 419 more files in changeset.
LDEV-3292: Use JOIN instead of cartesian product in several named queries. Clean up and formatting.

  1. … 7 more files in changeset.
LDEV-3620: Add paging and search in Edit Class dialog.

  1. … 13 more files in changeset.
LDEV-3617: Make editing class methods transactional. Rename them so simple DAO setters in the service are not transactional too.

  1. … 4 more files in changeset.
LDEV-3614: Improve processing of Gate activities. Alter lams_activity_learners table so it reflects its real purpose: storing learners who are allowed to pass a gate. Find out who is waiting in front of a gate using learner progress (activity attempt). For sync gate take into account all possible lesson learners (lesson class) rather than only ones who started a lesson. Use an entity in JSP generation rather than a DTO which is just a wrapper for the entity. Code clean up.

  1. … 42 more files in changeset.
LDEV-3599: Add paging to learner group dialogs. Change icons from custom to ones provided with jQuery UI.

  1. … 12 more files in changeset.
LDEV-3600: In Sequence and Learners tab allow searching for Learners who has not started the lesson yet.

  1. … 14 more files in changeset.
LDEV-3599: Load only first few learners for each activity and lesson completed. Count learners for each activity, including hidden children of Branching in Flash format. Fetch full learner list on demand. Remove unnecessary methods. Load the really needed objects instead of using Hibernate to derive them from parent objects. Use SQL for counting instead of fetching full collection in Hibernate and checking its size. Prepare for paging: add offset parameter to queries.

  1. … 8 more files in changeset.
LDEV-3557 Improve performance of gradebook xls export

  1. … 10 more files in changeset.
LDEV-3554 Improve performance of gradebook pages

  1. … 16 more files in changeset.