Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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. … 18 more files in changeset.
branching activity saves start/end connector coords

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

  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

  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"

update lams:help tag with style attribute, mainly for lams_admin to display properly

    • -1
    • +25
    ./org/lamsfoundation/lams/web/tag/HelpTag.java
  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.

  1. … 17 more files in changeset.
adding branch activity to sequence - basic model/dto changes and packet handling

  1. … 9 more files in changeset.
Stop null pointer exception from appearing in logs when user with no roles logs in.

monitor update to change to locked view when another users is currently editing the lesson/design

  1. … 6 more files in changeset.
reload window if user clicks live edit and call returns unavailable (false)

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

    • -0
    • +153
    ./org/lamsfoundation/lams/authoring/web/EditOnFlyServlet.java
    • -0
    • +18
    ./org/lamsfoundation/lams/web/HomeAction.java
  1. … 229 more files in changeset.
fixed grouping parsing/extracting - problem with changing grouping type and identifier conflict (LDEV-1172)

remove pointless debug statement

LDEV-1216 make ssl parameters optional

  1. … 2 more files in changeset.
Added xml based services for LearningDesignRepository and LessonManager

    • -0
    • +348
    ./org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  1. … 2 more files in changeset.
Replaced the hardcoded mode parameter in the method 'getFolderContentsExcludeHome' with the mode value supplied by the web service call 'getLearningDesigns'

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!

    • -1
    • +1
    ./org/lamsfoundation/lams/web/HomeAction.java
  1. … 1 more file 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.
Reset the optional parameters - if they aren't reset and the jsp page doesn't specify them, then they are reused in all instances of this tag on the page. This resulted in one answer being used for all questions on a q&a page where more than one question is displayed at a time (ie combined mode).

make reading user.changePassword more robust

    • -2
    • +4
    ./org/lamsfoundation/lams/web/IndexAction.java