Fix the watched group/institution page errors (Bug #1099811)

Get the correct owner info of a watched view in cases of group or
institution pages

Change-Id: I144f969a1cbe464892cc20a33fa6336928373278
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>
Add a new embed source for viewing google files (Bug 1287350)

The format of a share link for a google file:
https://drive.google.com/file/d/<FILE_ID>/<action>?usp=sharing

Change-Id: I420ac6ade6eb3e9e31f5418c83d584e6cb07c23a
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>
Allow the feeds with lastupdate = null to update also (#Bug 1284878)

Due to bug introduced in commit 70f75a2d75af47aa11aa93ee5b587d41caf957e9

Change-Id: I2249bf1ba8a03092b3ea0b89b6845b048794049b
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Use iframe to embed Prezi presentations (Bug #1239928)

Also upgrades the old <object> syntax to use iframes

Change-Id: I1d58c1a42ddf0e3db52a19c185ff64242f926cd2
Signed-off-by: Jono Mingard <jonom@catalyst.net.nz>
Getting mysql not to use CAST() (bug #1081947)

In the 1.8+ codebase there are only two places where both mysql and
postgres use CAST(). So I've tried altering the calls so that mysql
doens't need to use CAST().

This will probably need to be tested with a large data mysql db site
to see if any speed gains are made, and also the calls are still
working correctly.

All other places it is being used by postgres only
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Change-Id: I9eaf196d062ef2a62bfdae0df179281f3411c392
Check that account is valid before logging in via password reset

Bug1284876: Without this, a suspended user can log in via a password
reset email

Change-Id: I5cb8f2978cdc2c6c0a6975a3fbfd2dfdc1d9bcc5
Adding Mahara 1.7 README file.

Bug 1234487

1.7 was released on April 19, 2013. So the system requirements are taken
from the snapshot of the system requirements wiki page on that date:
https://wiki.mahara.org/index.php?title=System_Administrator%27s_Guide/Requirements&oldid=4245

Change-Id: I03f69abe4a4b0c7fb25a321f178c860f713e5047
Pass original filename to file_mime_type()

Bug 1249858: When being called for file uploads, file_mime_type()
is getting the PHP temp upload file's filename, and so the attempt
to check the file extension is always unsuccessful because those
temp file names are gibberish

Change-Id: I631ca8c80316919b6aefc9712b68017d752ba942
Allow users to specify magicdb location (or use PHP's default)

Bug 1249858

Change-Id: I0dd741dad20bc17b33fb6d1a3bb9cf3d845d28df
Prefer fileinfo detected mimetype over browser-supplied mimetype (Bug #1249858)

Browsers can get the their mimetypes for certain things mixed up if
they visit badly written websites. So we should trust magicdb over
what the browser tells us.

Change-Id: I477580d55a70f7e2d03385897a6ec02166506908
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
Autodetect the location of the magicdb

Bug 1249858

Change-Id: I795fe6540e3ef8d6fcca97303c7217455eedd038
Merge "Prefer fileinfo detected mimetype over browser-supplied mimetype (Bug #1249858)" into 1.7_STABLE
Merge "Use iframe to embed Prezi presentations (Bug #1239928)" into 1.7_STABLE
Merge "Getting mysql not to use CAST() (bug #1081947)" into 1.7_STABLE
Merge "Check that account is valid before logging in via password reset" into 1.7_STABLE
Bug1075760: reporting objectional material with no message doesn't get sent to admin with digest emails

Email digest table has a not null contraint for the message field:
1. Force the user to enter something in the objectionable comment.
2. Other areas: if a user enteres a message (i.e. in a forum)
which is made up of html (i.e. a smiley face),
the message gets 'cleaned' by stripping html tags.
This leaves it empty and fails when trying to insert into the
email digest table.
Clean the message with html2text instead of str_shorten_html.
3. As a last resort, before inserting into the email digest table,
make sure there is at least a space in the message field (if it's empty).

Change-Id: I05a77e0682017839b34e74241eefb98fb788eab5
Signed-off-by: Ghada El-Zoghbi <ghada@catalyst-au.net>
Version bump for 1.7.5

Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
Version bump for 1.7.6testing

Signed-off-by: Aaron Wells <aaronw@catalyst.net.nz>
Merge branch '1.7_STABLE' of git://gitorious.org/mahara/mahara into sdc_17
Update the profile icon when copying a profile info block-bug 1306365

Change-Id: Id3f8cef503512cb81c6a2391dcc5134b38af7fbc
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>