• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
file GetFedServerGroupsServlet.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/web/GetFedServerGroupsServlet.java
add 2 servlets at /servlet/getFedServerGroups and /servlet/getFedServerLessons for flash to use

    • -0
    • +40
    ./lams/web/GetFedServerGroupsServlet.java
    • -0
    • +40
    ./lams/web/GetFedServerLessonsServlet.java
  1. … 2 more files in changeset.
branching activity saves start/end connector coords

  1. … 4 more files in changeset.
file FedRegistryUpdateServlet.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/web/FedRegistryUpdateServlet.java
change update registry url from struts action to servlet so that it falls outside of web security context.

    • -0
    • +43
    ./lams/web/FedRegistryUpdateServlet.java
    • -41
    • +0
    ./lams/web/FederationRegistryAction.java
  1. … 2 more files in changeset.
Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

    • -4
    • +32
    ./lams/authoring/ObjectExtractor.java
  1. … 2 more files in changeset.
Branching: Wasn't updating the branch link when we copied the branch mappings (when copying a design).

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

    • -15
    • +14
    ./lams/authoring/ObjectExtractor.java
  1. … 12 more files in changeset.
remove 'name' from struts actions that have no actionform - causes struts warnings like "WARN [org.apache.struts.util.RequestUtils] No FormBeanConfig found under 'AuthoringAction"

    • -3
    • +2
    ./lams/authoring/web/AuthoringAction.java
update lams:help tag with style attribute, mainly for lams_admin to display properly

  1. … 16 more files in changeset.
LDEV-1257: Tweaking the collection tests when copying the groups - need to check that they aren't null as Hibernate may not have created empty groups yet.

LDEV-1257: Added support for Groups to be created in authoring (so that the names can be entered) and the mapping table to map groups to a sequence activity (ala branch) for a Group based branching activity.

    • -57
    • +144
    ./lams/authoring/ObjectExtractor.java
    • -12
    • +33
    ./lams/authoring/service/AuthoringService.java
  1. … 17 more files in changeset.
merge with lams2_0_3 tag on HEAD

    • -8
    • +13
    ./lams/security/LDAPAuthenticator.java
    • -6
    • +8
    ./lams/security/UniversalLoginModule.java
    • -8
    • +7
    ./lams/webservice/LearningDesignRepositorySoapBindingImpl.java
  1. … 7 more files in changeset.
merge with lams2_0_3 tag on HEAD

    • -55
    • +138
    ./lams/authoring/ObjectExtractor.java
    • -7
    • +411
    ./lams/authoring/service/AuthoringService.java
    • -1
    • +51
    ./lams/authoring/service/IAuthoringService.java
    • -1
    • +23
    ./lams/authoring/web/AuthoringAction.java
    • -2
    • +1
    ./lams/authoring/web/AuthoringConstants.java
    • -0
    • +0
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 87 more files in changeset.
adding branch activity to sequence - basic model/dto changes and packet handling

    • -3
    • +19
    ./lams/authoring/ObjectExtractor.java
  1. … 9 more files in changeset.
file FederationRegistryAction.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/web/FederationRegistryAction.java
update list of federation servers from registry

    • -0
    • +41
    ./lams/web/FederationRegistryAction.java
  1. … 8 more files in changeset.
Stop null pointer exception from appearing in logs when user with no roles logs in.

    • -7
    • +5
    ./lams/security/UniversalLoginModule.java
monitor update to change to locked view when another users is currently editing the lesson/design

    • -0
    • +12
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 6 more files in changeset.
reload window if user clicks live edit and call returns unavailable (false)

    • -1
    • +1
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 3 more files in changeset.
LDEV-1187 sysadmin can login as any user, LoginAsAction provides the user/pass and login.jsp handles the automatic login

    • -0
    • +120
    ./lams/web/LoginAsAction.java
  1. … 2 more files in changeset.
LDEV-1228 replace UserDTO when user updates their profile

Replaced hard coded strings with constants.

LDEV-1181: Check the wddx packet to make sure it really is a wddx packet before importing, and cleaned up the look of the error messages.

  1. … 2 more files in changeset.
Merging RAMS and Edit On Fly changes from branch to the head.

    • -56
    • +140
    ./lams/authoring/ObjectExtractor.java
    • -7
    • +411
    ./lams/authoring/service/AuthoringService.java
    • -0
    • +99
    ./lams/authoring/service/EditOnFlyProcessor.java
    • -1
    • +51
    ./lams/authoring/service/IAuthoringService.java
    • -1
    • +23
    ./lams/authoring/web/AuthoringAction.java
    • -2
    • +1
    ./lams/authoring/web/AuthoringConstants.java
    • -0
    • +153
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 64 more files in changeset.
fixed grouping parsing/extracting - problem with changing grouping type and identifier conflict (LDEV-1172)

remove pointless debug statement

    • -2
    • +1
    ./lams/security/LDAPAuthenticator.java
LDEV-1216 make ssl parameters optional

    • -8
    • +14
    ./lams/security/LDAPAuthenticator.java
  1. … 2 more files in changeset.
Added xml based services for LearningDesignRepository and LessonManager

    • -0
    • +357
    ./lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -0
    • +348
    ./lams/webservice/xml/LessonManagerServlet.java
  1. … 2 more files in changeset.
Added a new configuration item - server url context. This should be either "lams" or "rams". Used by the FCKEditor upload servlet code to generate the appropriate paths to the images.

Removed any other hardcoded "lams" I could find in the path for the FCKEditor handling.

    • -2
    • +1
    ./lams/authoring/web/AuthoringConstants.java