• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 2 more files in changeset.
split into two calls for setting up live edit

Replaced the hardcoded mode parameter in the method 'getFolderContentsExcludeHome' with the mode value supplied by the web service call 'getLearningDesigns'

Redoing change from head that had been lost in the merge. Related to the login change done for 2.0.1

    • -2
    • +2
    ./org/lamsfoundation/lams/web/HomeAction.java
capture null ptr exception

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

new login method for shib users, looking at possible ways to store customised shib headers

  1. … 1 more file in changeset.
new login servlet for shib users

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

    • -0
    • +0
    ./org/lamsfoundation/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

    • -2
    • +18
    ./org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +8
    ./org/lamsfoundation/lams/web/IndexOrgBean.java
  1. … 230 more files in changeset.
Merged 2.0.1 release changes from HEAD.

    • -7
    • +3
    ./org/lamsfoundation/lams/web/tag/CssTag.java
  1. … 121 more files in changeset.
Merged 2.0.1 release changes from HEAD.

    • -2
    • +8
    ./org/lamsfoundation/lams/web/HomeAction.java
    • -2
    • +18
    ./org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +8
    ./org/lamsfoundation/lams/web/IndexOrgBean.java
  1. … 226 more files in changeset.
added check editonfly cond for obj extractor

Fixing up todo comment

Remove the tool sessions related to any non-grouped activity which is deleted via edit on fly. Doesn't apply to grouped activities as their tool sessions aren't "pre-initialised" when the lesson is started.

  1. … 2 more files in changeset.
edit on the fly (author) loaded within monitor frame and when done with changes reloads monitor

    • -1
    • +11
    ./org/lamsfoundation/lams/web/HomeAction.java
  1. … 10 more files in changeset.
moved some funct to monitor (setting up edit on fly) and author just opens the design in the correct mode + few fixes for new system gate + finish edit on fly lock and gate release

    • -1
    • +9
    ./org/lamsfoundation/lams/web/HomeAction.java
  1. … 9 more files in changeset.
modify RegisterService to be more flexible

LDEV-1112: Login was always going to the index page, and not straight to the lesson page for the launch lesson url. The JspRedirectStrategy code was forcing it to the index page. Now it lets it go to whatever page was requested initially for "normal" requests.

Had to change HomeAction to go to the index page, rather than direct to the login page as to make the change to JspRedirectStrategy - otherwise it would try to go to the login page straight after the login page!

    • -2
    • +2
    ./org/lamsfoundation/lams/web/HomeAction.java
  1. … 1 more file in changeset.
file EditOnFlyServlet.java was initially added on branch editonfly_branching.

    • -0
    • +0
    ./org/lamsfoundation/lams/authoring/web/EditOnFlyServlet.java
change to use servlet for edit on fly setup + added lesson lock + added design edit check + wizard fix to show full name of users

  1. … 9 more files in changeset.
don't list the subgroup if user is not a member/group admin/group manager/sysadmin

    • -2
    • +8
    ./org/lamsfoundation/lams/web/IndexAction.java
LDEV-1107 extserver classes are created as subgroups, not groups; make extuser a member of the group as well as the subgroup; don't give extusers group manager role as they don't need it, especially in a subgroup

  1. … 1 more file in changeset.