• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge LDEV-1284 changes to ldap2_0_4 branch

  1. … 1 more file in changeset.
LDEV-1218: Adding the batch size for the learner progress screen to the monitoring call.

  1. … 5 more files in changeset.
LDEV-1301: Changing some of the I18N labels for the configuration screen to reuse existing labels. Removed the LearnerProgressBatchSize as we aren't using it for the Learner Progress screen after all.

  1. … 4 more files in changeset.
LDEV-1285: Adding a new Activity type "Options With Sequences" so the Flash will know whether to expect sequences or not. The type is stored in the database otherwise we won't know which type it will be if the user saves the Optional without any child activities. The back end treats all Optional activities the same.

  1. … 7 more files in changeset.
fix missing semi-colon

LDEV-1252 adding new table lams_user_organisation_collapsed; refactored jsps/action/data access to accomodate collapsible courses; added callback servlet UpdateCollapsedGroupServlet.

  1. … 20 more files in changeset.
LDEV-1278: Adding calls that allow the sending of learner progress records in batches. This requires specific HQL to lookup the records, and a new entry (for the size of the batches) in the configuration table.

  1. … 10 more files in changeset.
LDEV-1251, LDEV-1064. Refactored the way lessons are retrieved for the index page (fixed LDEV-1064); added interface 1.2 (jquery extension), allowing sorting of lessons via drag and drop (LDEV-1251); added ordered_lesson_ids column to lams_organisation (LDEV-1251).

  1. … 13 more files in changeset.
remove LamsHome and FileManagerDir from lams_configuration (wasn't removed during previous updates)

fix typo and add inserts for ldap configs. LDEV-1301, LDEV-1365

LDEV-1301 i18n configuration items, categorise items, add validation

  1. … 12 more files in changeset.
LDEV-1348: Tweaking the db handling of branch activity mappings. If a user deletes and then readds an identical mapping for grouped based branching, we get a new entry created and the old entry deleted. Can't guarantee what order Hibernate will persist the changes to the db, so e can't have a unique key on group/sequence on the table.

  1. … 2 more files in changeset.
LDEV-1284: set run sequences folder's parent folder id, and append 'Run Sequences' to its name, clarified comments.

merging changes from ldap2_0_4 branch to HEAD

  1. … 13 more files in changeset.
LDEV-1301: Added new fields to the configuration items, to support the I18N of descriptions and heading on the page, along with some basic validation.

  1. … 4 more files in changeset.
support multiple base DNs; support paged search results from ldap; remove bulk update method from spring's transactions; improve bulk update results report

  1. … 12 more files in changeset.
LDEV-1284 change integration classes to courses (also creates workspace/folders)

    • -0
    • +180
    ./Alter21Integration.java
merge changes from ldap2_0_4 branch back to HEAD

  1. … 6 more files in changeset.
add support for user enabled/disabled flag in ldap

  1. … 6 more files in changeset.
merge changes from ldap2_0_4 branch back to HEAD

  1. … 14 more files in changeset.
add default names for some ldap attributes, add LDAPLocaleAttr

  1. … 5 more files in changeset.
add ldap attributes for all LAMS user attributes

  1. … 6 more files in changeset.
file alter_205_ldap.sql was initially added on branch ldap2_0_4.

file alter_2_0_5_ldap.sql was initially added on branch ldap2_0_4.

merge ldap changes from HEAD to this branch, branched from 2.0.4

  1. … 56 more files in changeset.
Removing entry_id column that should not have been there.

  1. … 2 more files in changeset.
LDEV-1109: Fixing bugs in the authoring support for tool output based branching and getting the progress engine working. A rough implementation of the condition checking down for one MCQ condition for demonstration purposes. Two new methods added to the tool contract.

  1. … 36 more files in changeset.
LDEV-1109: Implement more of the authoring support for tool output based branching. Added the table to store the conditions designed in authoring and refactored the branch mapping table to support the conditions. Modified the authoring code to expect the new objects from the authoring client.

  1. … 10 more files in changeset.
Changes to support tool output based branching. Work in progress!

  1. … 32 more files in changeset.
LDEV-1134: Branching: Added stopAfterActivity flag to activity, which will allow us to "end" a lesson at the end of the activity. Authoring changes done.

  1. … 9 more files in changeset.