Change-Id: I04bca3f7d628c3c8f297846ab6bbc086c44f7954
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

Bug #618634 Explanatory text explains what the enabling/disabling is
and explains that artefact plugin types stop the blockstypes showing.

Change-Id: I0e657ab965e66ab40fdf70676f2ef34161131ae8
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

For more details see:
https://bugs.launchpad.net/mahara/+bug/646713/comments/11



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

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

Bug #661596 Based on a patch by Eugene Venter

Change-Id: If64a3436bb3ac1735ac952fe116133a3af74f952
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Change-Id: I491260b9c710df4e61814b7675e7bb55fadb176c
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

The artefacts that are just referenced from the template view
need to be made accessible in the new view. This is done through the
view_artefact table.

bug #725192

Change-Id: I046bef99819c1868335a706df4c7fd4e6159fb36
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

Change-Id: I5ca8a11d5e43072c2427d5d70d9f40222f92d14b
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Bug #692784 Based on patch by Sean Brennan.

Change-Id: I9511e95547f5be9e3ee1a7e1a8d6f199678204c1
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Change-Id: I82bf229fc0ed47c847644be376296c115de596bc
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Bug #731064

Change-Id: Icedb749c3c5495685f341bc22fb5854a03bca606
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

http://wiki.creativecommons.org/CC_REL



Bug #771576

Change-Id: Ibb139c13546bbc461763640261d0ca2f1ac8409f
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Change-Id: I946d2b084d2292141b0e9ffdc8b5dd1c956e6d45
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

This reverts commit a6475339.

Now that we support avatars over HTTPS (4902e46d

)
the HTTPS part of this check is unnecessary.

The other part of the check which used curl was bogus. The fact that the
server cannot reach Gravatar doesn't necessarily mean that clients won't
be able to. It could just be that the server is firewalled off. Since we
don't have a reliable way to detect fully separated networks, we may as
well opt for the solution with less code.

Conflicts:

	htdocs/lib/db/upgrade.php
	htdocs/lib/upgrade.php
	htdocs/lib/version.php

Change-Id: I29d61c41469c826555c15642b5b5a92b2e823947
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Bug #650931

Change-Id: Ib502899193c211f0ab80447734ca90f072e0fe73
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Change-Id: I88deb431234cc70e7d5b79d0ba2c8bd3c20ac48d
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

Change-Id: Ie794ff5881fbc4e8701d41376835bd8413114fc0
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

Change-Id: I1153b94bd7a24f3b0e5696bde0a81aebd5746322
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

Change-Id: I060e5d45d334391bee09f1dd1e239e5a278453fe
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>

* changes:
  Updating XML Feed Parser README.Mahara with changes and commit IDs
  Use XPath to find <link> elements (ignore atom:link) (bug #750815) (cherry picked from commit e662d5d9)
  Patching XML Feed Reader 1.0.4 - adding $suppressWarnings fix (bug #750815) (cherry picked from commit 48b8953c)
  Patch from 1.0.3 to 1.0.4 (Bug #750815)
  Upgrade Image_Canvas - 0.3.2 to 0.3.3 (bug #750815)
  Upgrade Archive_Tar - 1.3.3 to 1.3.7 (bug #750815)
  Upgrade PEAR.php - 1.9.0 to 1.9.2 (bug #750815)

Change-Id: I8575a507b4ce7a204047993104892d9c311a0787
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>