• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 into head

  1. … 159 more files in changeset.
LDEV-2184 Fixed encoding issue for characters, using xml dictionary rather than flashvar param.

  1. … 2 more files in changeset.
Merge lams2_3_jboss5 changes into lams2_3

  1. … 99 more files in changeset.
LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

  1. … 10 more files in changeset.
LDEV-2360 Fixed time chart learner ID bug.

Merge presence monitoring stuff from HEAD

LDEV-2310 Make time zone index param optional and rely on user's timezone setting for scheduling from Monitor.

LDEV-2310 Schedule validation now also based on selected time zone. Fixed minute max increment value.

  1. … 10 more files in changeset.
LDEV-2310 New custom Time Zone settings in Advanced tab of Wizard for scheduling lessons to a particular timezone, pre-selected to user's timezone from profile settings. Added common methods for timezone conversion to DateUtil. Using these methods to alternate Date times between client and server, and formatting for how they're presented to users based on locale/timezone.

LDEV-2310 New custom Time Zone settings in Advanced tab of Wizard for scheduling lessons to a particular timezone, pre-selected to user's timezone from profile settings. Added common methods for timezone conversion to DateUtil. Using these methods to alternate Date times between client and server, and formatting for how they're presented to users based on locale/timezone.

  1. … 12 more files in changeset.
LDEV-2310 Stored schedule datetimes in db adjusted to server's timezone, formatted string reads in Monitor in the user's timezone (by their profile settings).

LDEV-2310 Put time zone date change inside if statement (null).

LDEV-2310 Applied user timezone to presented User DTO start and schedule dates, shown in Monitor.

Monitoring now allows IM to be enabled

  1. … 4 more files in changeset.
LDEV-2250 Fixed encoding bug.

  1. … 2 more files in changeset.
LDEV-2240 Alert shown when no learner progress data available - no completed activities.

  1. … 2 more files in changeset.
LDEV-2240 Alert shown when no learner progress data available. Updated flex apps css to have white background (removed grey gradient).

  1. … 10 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

  1. … 7 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

  1. … 7 more files in changeset.
LDEV-2184 Created new Add Lesson wizard. Updated dictionary xml action to provide labels.

Fixing up monitoringAction code format

merging improvements from lams2_3_spring_jboss_tune branch

  1. … 117 more files in changeset.
LDEV-2184 Updated monitoring service (lesson class servlet) - to handle default lesson class when receiving null or (empty) users in wddx packet.

  1. … 4 more files in changeset.
LDEV-2174:

Merged "context.tool" and "context.central" due to Locator inheritance bug in Spring.

Removed redundant Quartz Scheduler.

  1. … 25 more files in changeset.
LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

  1. … 30 more files in changeset.
LDEV-2115 New flex application Time Chart (using Mate framework). Fixed timeChart path (should be /timeChart.jsp).

LDEV-2115 New flex application Time Chart (using Mate framework). Fixed timeChart path.

LDEV-2115 New flex application Time Chart (using Mate framework).

  1. … 33 more files in changeset.
LDEV-2115 Timestamp (current date time) added to completed activity record (table: lams_progress_completed)

  1. … 11 more files in changeset.
LDEV-2036: LanguageXML messages added for ViewMode and Branching instructions