lams_learning

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2481 merged from branch

LDEV-2486 Mergin with head

translation update

  1. … 31 more files in changeset.
LDEV-2420 Removing uneccessary data structures and tables from the db, as well as implementing the same theme settings for flash themes

  1. … 47 more files in changeset.
LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

Updating Japanese

  1. … 22 more files in changeset.
LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

  1. … 96 more files in changeset.
Updating Japanese

  1. … 14 more files in changeset.
merge lams2_3 to head

  1. … 19 more files in changeset.
Updating Greek, English, Spanish, Japanese, Norwegian

  1. … 19 more files in changeset.
Merge lams2_3 to head (continuing...)

  1. … 48 more files in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

  1. … 82 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)

    • -92
    • +92
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +13
    ./web/WEB-INF/tags/ProgressOutput.tag
  1. … 159 more files in changeset.
Added missing library and fixed classpaths - changes needed after code merge.

  1. … 17 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-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. … 158 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.
Updating Greek, English, Spanish, Norwegian

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

    • -92
    • +92
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -9
    • +0
    ./web/WEB-INF/tags/ExportPortOutput.tag
    • -13
    • +1
    ./web/WEB-INF/tags/ProgressOutput.tag
    • -0
    • +136
    ./web/WEB-INF/tags/TextSearch.tag
    • -117
    • +226
    ./web/includes/presence.js
  1. … 43 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

Updating Greek and Maori

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. … 9 more files in changeset.
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.
LDEV-2187 - Adding in time columns for gradebook

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

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

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

  1. … 3 more files in changeset.
Updating Norwegian

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

  1. … 3 more files in changeset.