Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
temp call for returning Tool Output Definitions

    • -0
    • +113
    ./lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
  1. … 3 more files in changeset.
Changes to support tool output based branching. Work in progress!

  1. … 18 more files in changeset.
Added validation for grouping activities - if the number of groups in the design is more than the specified number of groups then there is a validation error.

  1. … 2 more files in changeset.
Made spelling of branchingActivityUIID entry consistent between DTO and WDDXTAGS

    • -1
    • +1
    ./lamsfoundation/lams/util/wddx/WDDXTAGS.java
Made the userlist in the GroupDTO optional, so that it isn't passed to authoring.

  1. … 2 more files in changeset.
Fixing up Grouping related code so it will cope with more cases during grouping, and so that groupingDAO can better find all the groups in a learning design.

    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
  1. … 2 more files in changeset.
Added adminURL

LDEV-1256

LDEV-1134: Preview now lets the author run through multiple branches, but if a stop point is reached then it stops the lesson.

  1. … 1 more file in changeset.
LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times. Did some small refactoring to have only one piece of code that creates the branching mapping related to a group as we have many bits that need to do this (authoring, import, chosen branching in monitoring and now preview!)

  1. … 2 more files in changeset.