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

    • -2
    • +13
    ./org/lamsfoundation/lams/web/tag/UserTag.java
  1. … 161 more files in changeset.
Merge lams2_3 into head

  1. … 122 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
    • +22
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 17 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. … 20 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

  1. … 54 more files in changeset.
LDEV-2212 displaying the appropriate lessons in the course views only if the user has permission

  1. … 5 more files in changeset.
LDEV-2196 fix charset not set when get requests sent to integration xml servlets

LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

  1. … 39 more files in changeset.
LDEV-2205 Didnt commit all the required files for the group admin view

  1. … 5 more files in changeset.
LDEV-2208 - Prettying up interfaces for gradebook. Drastically reduced the size of the grids so they can fit in nice popups

  1. … 3 more files in changeset.
LDEV-2120 Adding links from index page to gradebook

  1. … 3 more files in changeset.
Fixing up DisplayGroupAction formatting

LDEV-2204 Adding learner views for gradebook

  1. … 6 more files in changeset.
LDEV-2173 Using an enum type to identify the view for gradebook so it is more re-usable

  1. … 10 more files in changeset.
LDEV-2173 Adding in an averageTime and an averageMark parameter to the abstract GradeBookGridRow class as it makes sense for all views to have these parameters

  1. … 5 more files in changeset.
LDEV-2173 Putting contants into GradeBookConstants as they should be

LDEV-2173 Fixing bug that caused updates to not work in gradebook

  1. … 1 more file in changeset.
LDEV-2187 Put time taken for activities and lessons in gradebook.

Adding in averaget time for activities for activity view in gradebook lesson monitor

  1. … 7 more files in changeset.
LDEV-2200 Making gradebook only available for ToolActivities

LDEV-2187 Put time taken for activities and lessons in gradebook.

Fixing up LearnerProgress.java so it stores both finish time and start time for all completed activities

  1. … 10 more files in changeset.
LDEV-2173 Standardising sorting and searching for GradeBookGridRows, now all can sort on name, id, mark and timeTaken (common properties for all types) and all can search on name

  1. … 2 more files in changeset.
LDEV-2187 - Adding in time columns for gradebook

  1. … 8 more files 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

  1. … 264 more files in changeset.
LDEV-2187 Adding time column to activities

and also, added tooltips to monitor view

  1. … 3 more files in changeset.
LDEV-2184 Created new Add Lesson wizard. Updated index page to load new add lesson.

    • -4
    • +8
    ./org/lamsfoundation/lams/web/HomeAction.java
  1. … 3 more files in changeset.
LDEV-2190 - Adding course-level view to gradebook

  1. … 12 more files in changeset.
LDEV-2041: Added full functionality of exporting to XLS/CSV to Daco tool.

  1. … 14 more files in changeset.
LDEV-2173 Adding monitor link for activities in the activity view

  1. … 4 more files in changeset.
LDEV-2150: adding lesson search icon/button

  1. … 3 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 116 more files in changeset.