Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixing a failed merge

LDEV-1513 - single user progress traverses all user progress, finished and tested on sharepoint demo server, all good.

Also added in handling for when the user has no userporgrass, they havent started the lesson for instance.

LDEV-1569: Validation for number of groups no longer does comparison if (max) number of groups = 0 as this was causing problems in Live Edit. When it is set to 0, it implies that there can be any number of groups.

  1. … 2 more files in changeset.
LDEV-1633 add check for empty username, removed commented out code

LDEV-1649: Adding a new servlet to support copying tool content in a batch. This will be used when copying complex activities in authoring.

    • -0
    • +118
    ./lamsfoundation/lams/authoring/web/CopyMultipleToolContentServlet.java
  1. … 1 more file in changeset.
LDEV-1675: Changed insertLearningDesign permissions to handle the Live Edit case

LDEV-1670 unordered lessons used to be appended in a non-guaranteed order (HashMap backed collection); switched to TreeMap, and prepend unordered lessons so that new lessons appear at the top of the list by default.

    • -2
    • +4
    ./lamsfoundation/lams/util/IndexUtils.java
  1. … 1 more file in changeset.
LDEV-1352: Sets the order id for child activities in a sequence activity to match the transitions. Progress engine uses the transitions, but the IMSLD export looks for order id. So we might as well get both right.

LDEV-1246

Renamed lams:out attribute escapeXml to escapeHtml

Code cleanup.

LDEV-1644: Any activity with negative co-ords gets forced to (10,10)

LDEV-1633 switch join method to a separate thread, and return immediately (only returns lesson id now)

LDEV-1633 fix incorrect comment

LDEV-1633 add constants for new LessonManagerServlet.addUsersToLesson; reordered some constants to group different types together

LDEV-1633 added 'join' method to be called when adding a class of learners and staff to a lesson; fixed type error in 'delete' method; removed commented out code; call static constants from HttpServletRequest class, not instance.

LDEV-1611 Fixup for uniquecontentfolder stuff

  1. … 2 more files in changeset.
Fixed missing import statement causing lams-cruise to fail

  1. … 1 more file in changeset.
LDEV-1611 Learners now able to access unique content folder per session

  1. … 3 more files in changeset.
Small changes for forgot password for validation

    • -18
    • +32
    ./lamsfoundation/lams/web/ForgotPasswordServlet.java
  1. … 2 more files in changeset.
Added in audit log for changing password through forgot password module

[LDEV-273] Forgot password cahnges to make password searchable on username or email

    • -73
    • +110
    ./lamsfoundation/lams/web/ForgotPasswordServlet.java
  1. … 4 more files in changeset.
LDEV-273 resolved

added in the page validation

    • -22
    • +43
    ./lamsfoundation/lams/web/ForgotPasswordServlet.java
  1. … 5 more files in changeset.
LDEV-273 Password Reset

All the code for the forgot your login stuff, still needs validation and some comsmetics to be finished

    • -0
    • +67
    ./lamsfoundation/lams/util/Emailer.java
    • -0
    • +240
    ./lamsfoundation/lams/web/ForgotPasswordServlet.java
  1. … 10 more files in changeset.
LDEV-1598 Added four new configuration items for setting screen sizes of authoring, monitor, learner and system admin.

  1. … 11 more files in changeset.
fix bug with lesson names not incrementing if lesson name didn't contain a space.

LDEV-1399: We think the problem with toolkit icons not loading might be due to how Flash handles a critical error on createUniqueContentFolder(). So change this call to return a normal error (which the Flash logic can cope with) rather than a critical error.

LDEV-1569: Groups were not being deleted from db when deleted in authoring.

LDEV-1005: Added lesson name to headings, added help button, improved layout, improved browser compatibility on the page sizing, added scrolling to the iframe, hide the branches that the user isn't doing, adding support for the jump ahead in preview.

    • -1
    • +3
    ./lamsfoundation/lams/web/HomeAction.java
    • -4
    • +14
    ./lamsfoundation/lams/web/tag/HelpTag.java
  1. … 21 more files in changeset.
LDEV-1005: Implementing a non-Flash learner interface

    • -0
    • +93
    ./lamsfoundation/lams/web/tag/ConfigurationTag.java
  1. … 51 more files in changeset.
LDEV-1563: Allow sites to set up a custom tab.

    • -0
    • +5
    ./lamsfoundation/lams/web/IndexAction.java
  1. … 10 more files in changeset.
Adding LessonJoin xml web service that allows a learner to join a lesson, based on a learning design id - creates new lesson as necessary based on given max class size.

    • -0
    • +332
    ./lamsfoundation/lams/webservice/xml/LessonJoinServlet.java
  1. … 4 more files in changeset.