• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Adding Japanese

LDEV-1280: Implementing assign groups to branch in monitor screen (for define later). Required adding new functionality to branch related objects and a new call in lesson that allows monitoring to check if the branching activity has been attempted (we don't let the user remove groups or users from a branch once the branching activity has been commenced). Also moved the UTF-8 ajax fix to a common class in lams.jar so it can be used for all AJAX calls if desired.

  1. … 7 more files in changeset.
Adding Malay

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. … 8 more files in changeset.
merge ldap changes from HEAD to this branch, branched from 2.0.4

    • -11
    • +3
    ./conf/windows/jboss/login-config.xml
Adding Chinese (China)

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

  1. … 6 more files in changeset.
Adding German, Dutch

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. … 35 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.
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 and new method call to ToolContentManager, requiring a change to all tools.

  1. … 20 more files in changeset.
Changes to LDAP support

more LDAP support; UserManagementService.setRolesForUserOrganisations has LazyInitialisationException problem

    • -11
    • +3
    ./conf/windows/jboss/login-config.xml
  1. … 9 more files in changeset.
Changes to support tool output based branching. Work in progress!

  1. … 32 more files in changeset.
Made the userlist in the GroupDTO optional, so that it isn't passed to authoring.

  1. … 6 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.

  1. … 9 more files 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. … 3 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.
LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

  1. … 19 more files in changeset.
changing shib authentication to 'on/off' rather than try to have db/shib authentication happening at the same time

  1. … 12 more files in changeset.
removing unused application-policy

    • -16
    • +0
    ./conf/windows/jboss/login-config.xml
forgot to add shib auth method to the unix lamsauthentication.xml; doesn't do anything, but UniversalLoginModule expects it

LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

Branching: The start and end co-ordinates were missing during the import.

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

  1. … 13 more files in changeset.
Branching: Tweaking the branch objects so that the contribution flags are right for teacher chosen activities (and hence the button will appear to do the selection in monitoring) and some changes to make the teacher chosen screen logic easier.

  1. … 11 more files in changeset.
fixed wddxtags type (firstActivityUIID) + improvement in loading sequences for branching activity

  1. … 4 more files in changeset.
branching activity saves start/end connector coords

  1. … 4 more files in changeset.
Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

  1. … 12 more files in changeset.
Allow the master build to set the dbname, username and password in mysql-ds from the properties file.

    • -9
    • +9
    ./conf/unix/jboss/service/mysql-ds.xml
    • -9
    • +10
    ./conf/windows/jboss/service/mysql-ds.xml
LDEV-881: Another attempt to get rid of the java.lang.ArrayIndexOutOfBoundsException: 1 warning. This change should avoid many warnings coming out of Tomcat - not what we really wanted but we need to get rid of the "java.lang.ArrayIndexOutOfBoundsException: 1" warning as it really clutters the logs.