• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 to head (continuing...)

  1. … 50 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 212 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 18 more files in changeset.
LDEV-2142 Support activities's progress now update on normal progress update (as learner progresses through the sequence)

  1. … 1 more file in changeset.
LDEV-2142 Support activities's progress now update on normal progress update (as learner progresses through the sequence)

  1. … 1 more file in changeset.
PresenceChat fixed for no IM

update Learning struts and web config.

Committed last changed from HEAD to 2.3 branch

  1. … 96 more files in changeset.
LDEV-2254

Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

  1. … 159 more files in changeset.
Merged latest changes for PresenceChat and VideoRecorder to 2.3 branch

  1. … 85 more files in changeset.
LDEV-2005

VideoRecorder tool and FCKEditor video recorder updated

LDEV-2197

PresenceChat fixed for IE7/IE8

Better user management/no more status messages onConnect and onDisconnect

  1. … 19 more files in changeset.
Removing lams_learner.swd as it was checked it by accident (aparently -ask Mitch otherwise :-)

LDEV-2027 LDEV-2235 Separated notes into a lesson segmented list. Unknown heading label for empty ' ' external signatures.

  1. … 7 more files in changeset.
file lams_learner.swd was initially added on branch lams2_3.

Merging latest changes from HEAD to 2.3 branch

See MAIN:paulg:20090417074901 for details

Also, Video Recorder tool project was replaced completely given that it didn't exist in the 2.3 branch yet

  1. … 237 more files in changeset.
LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated

- export portfolio fixed

- export fck recordings fixed

- conditions added

- preview images are now produced and displayed

- more feedback for rating

- instructions highlighted

- clicking delete button does not trigger viewing of recording

- timer display corrected

- prompt validation

- misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • -0
    • +136
    ./WEB-INF/tags/TextSearch.tag
  1. … 45 more files in changeset.
LDEV-1790 show tick when completed previewing a branch; ticks already added for optional/optional sequences by Luke for LDEV-1784

LDEV-2197 Presence Chat

- Added a scrollbar to Presence user listings

- Changed css

- Scrolling better, still a bit iffy

  1. … 1 more file in changeset.
- Updated jQuery core to v1.3.2

- Updated jQuery UI to v1.7.1

- Classic Wizard now has checkbox visible to enable Presence Chat

- Learner no longer has a Presence box

- Presence Chat committed

    • -0
    • +76
    ./includes/presence.css
    • -0
    • +117
    ./includes/presenceChat.jsp
  1. … 259 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

    • -109
    • +109
    ./WEB-INF/struts/struts-config.xml
  1. … 117 more files in changeset.
file applicationContext.xml was initially added on branch lams2_3_spring_jboss_tune.

    • -0
    • +0
    ./WEB-INF/applicationContext.xml
  1. … 3 more files in changeset.
LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

    • -109
    • +109
    ./WEB-INF/struts/struts-config.xml
  1. … 29 more files in changeset.
LDEV-1782 Complex boxes now closing properly on progress update

  1. … 3 more files in changeset.
LDEV-1841 Fixed haywire issue

  1. … 3 more files in changeset.
Oopps... it was UTF-8

Reverting wrong commit

LDEV-2152: adding next activity icon tto system activities

LDEV-2150: added icons to save/cancel buttons

  1. … 23 more files in changeset.
LDEV-2054: Added a column name containing group members.

  1. … 2 more files in changeset.
LDEV-2054: Added support for �viewStudentsBeforeSelection� option.

  1. … 10 more files in changeset.