lamsfoundation

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

    • -0
    • +9
    ./lams/common/dictionary/XMLDictionary.as
    • -0
    • +5
    ./lams/common/ui/components/VideoDisplay.mxml
  1. … 48 more files in changeset.
VideoRecorder tool and FCKEditor plugin now correctly detect if a webcam is available or not. Should help a lot in Linux. Other misc bugs.

    • -15
    • +28
    ./lams/common/util/VideoDisplayUtil.as
  1. … 3 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

    • -70
    • +63
    ./lams/common/ui/components/VideoDisplay.mxml
    • -1
    • +1
    ./lams/common/util/NetStreamScreenShotter.as
  1. … 161 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

    • -7
    • +8
    ./lams/common/ui/components/VideoDisplay.mxml
    • -0
    • +46
    ./lams/common/util/ComponentScreenShotter.as
    • -1
    • +1
    ./lams/common/util/NetStreamScreenShotter.as
    • -0
    • +26
    ./lams/common/util/ScreenShotterEvent.as
  1. … 17 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

    • -3
    • +5
    ./lams/common/ui/components/SeekSlider.mxml
    • -43
    • +78
    ./lams/common/ui/components/VideoDisplay.mxml
    • -0
    • +150
    ./lams/common/util/NetStreamScreenShotter.as
    • -0
    • +26
    ./lams/common/util/NetStreamScreenShotterEvent.as
    • -1
    • +8
    ./lams/common/util/VideoDisplayUtil.as
  1. … 50 more files in changeset.
LAMS Ajax Overlay Manager updated

    • -34
    • +189
    ./lams/common/managers/LamsAjaxOverlayManager.as
LDEV-2184 Created new Add Lesson wizard.

  1. … 19 more files in changeset.
LDEV-2184 Created new Add Lesson wizard. Updated WDDX, and using 3rd party Date Time control.

    • -0
    • +38
    ./lams/common/util/WDDXParser.as
    • -0
    • +72
    ./lams/common/util/WDDXUtil.as
  1. … 7 more files in changeset.
LDEV-2184 Updated common XMLDictionary (flex) to use data binding using addition *Registry AS class.

    • -4
    • +7
    ./lams/common/dictionary/XMLDictionary.as
    • -0
    • +57
    ./lams/common/dictionary/XMLDictionaryRegistry.as
removed leftover debugging line

    • -3
    • +1
    ./lams/common/dictionary/XMLDictionary.as
LDEV-2005 VideoRecorder tool and FCKEditor video recorder updated

    • -0
    • +93
    ./lams/common/managers/LamsAjaxOverlayManager.as
    • -1
    • +1
    ./lams/common/ui/components/SeekSlider.mxml
    • -3
    • +5
    ./lams/common/ui/components/VideoDisplay.mxml
  1. … 48 more files in changeset.
VideoRecorder Flex Common stuff

    • -0
    • +17
    ./lams/common/managers/LamsPopUpManager.as
    • -0
    • +106
    ./lams/common/popups/DebugPopUp.mxml
    • -0
    • +140
    ./lams/common/ui/components/SeekSlider.mxml
    • -2
    • +2
    ./lams/common/ui/components/SortButton.as
    • -9
    • +109
    ./lams/common/ui/components/VideoDisplay.mxml
    • -6
    • +14
    ./lams/common/util/VideoDisplayUtil.as
LDEV-2115 updated to use set dictionary complete event.

    • -1
    • +1
    ./lams/common/dictionary/XMLDictionary.as
LDEV-2005 - Voice recording tool - FCKEditor plugin present - Changes to configuration file for Red5 settings - Updates to VideoRecorderForFCK (Flex)

    • -35
    • +32
    ./lams/common/ui/components/VideoDisplay.mxml
    • -0
    • +31
    ./lams/common/util/ArgumentsToRendererFactory.as
    • -0
    • +5
    ./lams/common/util/VideoDisplayUtil.as
  1. … 74 more files in changeset.
LDEV-2005 VideoRecorder Latest Flex and AS code

    • -0
    • +40
    ./lams/common/conn/ImageService.as
    • -0
    • +57
    ./lams/common/dictionary/XMLDictionary.as
    • -0
    • +13
    ./lams/common/dictionary/XMLDictionaryEvent.as
    • -0
    • +24
    ./lams/common/ui/components/ResizeableTextArea.mxml
    • -0
    • +135
    ./lams/common/ui/components/SortButton.as
    • -0
    • +78
    ./lams/common/ui/components/SortButtonGroup.as
    • -0
    • +27
    ./lams/common/ui/components/SortEvent.as
    • -0
    • +556
    ./lams/common/ui/components/VideoDisplay.mxml
    • -0
    • +27
    ./lams/common/ui/components/VideoDisplayEvent.as
    • -0
    • +28
    ./lams/common/util/LAMSStringUtil.as
    • -0
    • +82
    ./lams/common/util/VideoDisplayUtil.as
  1. … 42 more files in changeset.