Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Francois Marier <francois@catalyst.net.nz>
(cherry picked from commit e7c24004)

http://flowplayer.org/plugins/streaming/audio.html



Signed-off-by: Francois Marier <francois@catalyst.net.nz>
(cherry picked from commit 80f8771d)

http://flowplayer.org/download/index.html



Signed-off-by: Francois Marier <francois@catalyst.net.nz>
(cherry picked from commit bea63ab8)

(Will be useful for bug #547773 if we want to throw exceptions from purifier before timing out)

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

enclosures in a leap2a export.

Signed-off-by: Adrian Schlegel <adrian@liip.ch>

Corrected the relationship value "is_supported_by" to "supported_by". Since this typo has already been introduced with the first LEAP2A implementation, the import had to be adapted to allow both versions for backwards compatibility.

Signed-off-by: Adrian Schlegel <adrian@liip.ch>

Signed-off-by: Adrian Schlegel <adrian@liip.ch>

Prevent an empty 'type' attribute being added to a 'content' element in a leap2a export if the content type is not specified.

Signed-off-by: Adrian Schlegel <adrian@liip.ch>

Signed-off-by: Penny Leach <penny@mjollnir.org>

Signed-off-by: Penny Leach <penny@mjollnir.org>

    * Choosing of either image inserting method disables another one.
    * When editing existing image, the correct method is used (ether URL
      substituted or image choosen from dropdown list)
    * Image description (alt) is taken from attached image description if one
      is avialable.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Reset block config array indices when deleting artefacts to avoid failure in id rewriting in leap export

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Conflicts:
	htdocs/artefact/file/blocktype/filedownload/theme/raw/filedownload.tpl

This merge had a conflict with some theme changes by evonne disagreeing
with what I had changed, removing WWWROOT from the file download
template.  All leap2 related stuff merged clean

is supported by Mahara.

Signed-off-by: Adrian Schlegel <adrian@liip.ch>

Trying to get property of boolean variable if $postrecords is empty.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>

Signed-off-by: Penny Leach <penny@mjollnir.org>

Signed-off-by: Penny Leach <penny@mjollnir.org>

instead of manually checking the source attribute of the content

Signed-off-by: Penny Leach <penny@mjollnir.org>

so it can be used by other places that also use create_file on the same
class.

Signed-off-by: Penny Leach <penny@mjollnir.org>

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>

Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>