• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
only display 'change my password' link if user is a local user (i.e. uses lams-db as their authentication method)

  1. … 1 more file in changeset.
little odds and ends

    • -10
    • +23
    ./lams/web/ShibLoginServlet.java
  1. … 3 more files in changeset.
configure shibboleth attribute header names in lams_configuration table

  1. … 6 more files in changeset.
error message on login page when shib username is already taken by a non-shib user

  1. … 1 more file in changeset.
Updating the define later and run offline flags when live edit completes.

Schedule any new schedule gates - which requires a call across to monitoringService (grrr).

fixed single act design (+ live edit) issue caused by null pointer exception

added error handling and isLearningDesignAval check

    • -15
    • +21
    ./lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 2 more files in changeset.
split into two calls for setting up live edit

    • -119
    • +105
    ./lams/authoring/service/AuthoringService.java
    • -3
    • +8
    ./lams/authoring/web/EditOnFlyServlet.java
Replaced the hardcoded mode parameter in the method 'getFolderContentsExcludeHome' with the mode value supplied by the web service call 'getLearningDesigns'

    • -8
    • +7
    ./lams/webservice/LearningDesignRepositorySoapBindingImpl.java
Redoing change from head that had been lost in the merge. Related to the login change done for 2.0.1

capture null ptr exception

    • -111
    • +114
    ./lams/authoring/service/AuthoringService.java
When a design is edited using live edit, we may have added activities on the end. So if anyone has the lesson marked as completed in their learner progress, the completed flag will need to be reset.

  1. … 4 more files in changeset.
fixed incorrect x-coord assignment for (activity == null) case

setting position of inserted system gate

    • -11
    • +28
    ./lams/authoring/service/AuthoringService.java
new login method for shib users, looking at possible ways to store customised shib headers

    • -13
    • +13
    ./lams/security/UniversalLoginModule.java
  1. … 1 more file in changeset.
new login servlet for shib users

    • -0
    • +106
    ./lams/web/ShibLoginServlet.java
  1. … 2 more files in changeset.
file ShibLoginServlet.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./lams/web/ShibLoginServlet.java
merged changes

When the system gates are removed, we need to remove the references to them in any learner's progress records.

remove temp system gate

Merging 2.0.1 changes from the HEAD

    • -8
    • +3
    ./lams/security/JspRedirectStrategy.java
    • -0
    • +4
    ./lams/web/tag/LAMSMultiLinesTextareaTag.java
    • -7
    • +111
    ./lams/webservice/RegisterServiceSoapBindingImpl.java
    • -2
    • +119
    ./lams/webservice/RegisterServiceSoapBindingSkeleton.java
  1. … 230 more files in changeset.
Merged 2.0.1 release changes from HEAD.

    • -5
    • +2
    ./lams/notebook/web/StoreNBEntryServlet.java
    • -8
    • +3
    ./lams/security/JspRedirectStrategy.java
    • -0
    • +0
    ./lams/web/tag/LAMSMultiLinesTextareaTag.java
    • -6
    • +7
    ./lams/web/tag/MultiLinesTextareaTag.java
    • -33
    • +122
    ./lams/webservice/RegisterServiceSoapBindingImpl.java
    • -4
    • +124
    ./lams/webservice/RegisterServiceSoapBindingSkeleton.java
  1. … 121 more files in changeset.
Merged 2.0.1 release changes from HEAD.

  1. … 226 more files in changeset.