Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-26: Cleaned up some typos, removed old debugging.

merging changes from ldap2_0_4 branch to HEAD

    • -0
    • +69
    ./lamsfoundation/lams/usermanagement/dto/BulkUpdateResultDTO.java
  1. … 7 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.
merge change from ldap2_0_4 branch back to HEAD

merge changes from ldap2_0_4 branch back to HEAD

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

  1. … 4 more files in changeset.
LDEV-1134: Fixed the View Branches screen for tool output based branching - I can't list the users based on groups as they aren't in groups (and I can't put them in groups as the groups have to be linked to the condition and if the user goes to the default branch there is no condition). So for tool output based branching I have to find the users via their progress records.

  1. … 5 more files in changeset.
LDEV-1134: Complete implementation of conditions in MCQ and Forum.

    • -223
    • +0
    ./lamsfoundation/lams/tool/OutputDefinitionFactory.java
    • -0
    • +234
    ./lamsfoundation/lams/tool/OutputFactory.java
  1. … 10 more files in changeset.
merge LangUtil into LanguageUtil

    • -103
    • +0
    ./lamsfoundation/lams/util/LangUtil.java
    • -1
    • +70
    ./lamsfoundation/lams/util/LanguageUtil.java
  1. … 5 more files in changeset.
merge changes from ldap2_0_4 branch back to HEAD

    • -0
    • +103
    ./lamsfoundation/lams/util/LangUtil.java
  1. … 9 more files in changeset.
LDEV-1134: Tweaks to make preview work - handling special cases when the branch selected is not the user's normal branch.

write audit log when ldap users are created on the fly.

move some audit log messages from lams_admin to lams_common (in order for system-generated audit messages such as when users are auto-created to be used)

  1. … 5 more files in changeset.
LDEV-1109: Fixing branching support in LAMS import/export.

Adds different handling for filenames according to browser. Now filenames would show properly. Fixes LDEV-1243

  1. … 1 more file in changeset.
cleaning up lamsauthentication.{xml|dtd} related stuff

  1. … 11 more files in changeset.
adding ldap database synchronisation and screen

  1. … 7 more files in changeset.
Fixed the conversion of the Long's to cope with WDDX's numeric format.

add boolean config option LDAPEncryptPasswordFromBrowser - allows admin to turn off sha1'ing of password in javascript

  1. … 4 more files in changeset.
WDDXProcessor will now convert any object type to a string, when reading from the WDDX packet.

Somehow lost setting the default activity for all Complex Activities.

LDEV-1109: Fixing bugs in the authoring support - the branch mappings for tool output based branching wasn't been sent to Flash

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
    • +3
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
  1. … 22 more files in changeset.
putting ldap's add/create/update user into it's own spring transaction'd bean; added some more config parameters for ldap

    • -0
    • +41
    ./lamsfoundation/lams/usermanagement/service/ILdapService.java
    • -0
    • +261
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
  1. … 5 more files in changeset.
adding authenticationMethodId to UserDTO so profile.jsp knows not to display 'edit profile/password'

  1. … 1 more file in changeset.
LDEV-1109: Fixed up a couple of bugs with copying the learning design that crept in due to the addition of the tool output based branching - the branch mappings weren't being copied properly.

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.

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
    • +5
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +235
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -0
    • +178
    ./lamsfoundation/lams/learningdesign/BranchCondition.java
    • -0
    • +125
    ./lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
  1. … 6 more files in changeset.
LDEV-1134: Adding more support for the tool output based branching. Added a couple of simple tool output definitions for MCQ and Forum and added a class to the core to help tools create the tool output definitions (OutputDefinitionFactory), which required a change to MessageService. Also added the call to the core tool service to support calling the tools for their output definitions.

    • -0
    • +223
    ./lamsfoundation/lams/tool/OutputDefinitionFactory.java
    • -8
    • +15
    ./lamsfoundation/lams/util/MessageService.java
more LDAP support; UserManagementService.setRolesForUserOrganisations has LazyInitialisationException problem

  1. … 6 more files in changeset.