Bump the version string to 1.6.0dev

Change-Id: I71ba6bf076e56ced5c72f4b4a33328a31d69c57f
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Merge "Bump the version string to 1.6.0dev"
Add the links for "privacy" and "topics" and fix lang strings (Bug 960816)

The links for "privacy" and "topics" were missing in the
lang strings - new strings were created. Minor capitalization
changes were made that did not warrant new strings.

Change-Id: Ic2db7dd4ff26df63e8b5c6e684a9fd36c28b1547
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Merge "Add the links for "privacy" and "topics" and fix lang strings (Bug 960816)"
Change postgres requirement to version 8.3+

Earlier versions of postgres are now unsupported, and this change will
fix the upgrade failure in bug #961728.

Change-Id: I2b7ea46515142d0d3fc601cf8ec99e15a85bc933
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
String "Retain view access" to include collection (Bug 964322)

Append the string to include "collection" as these
can be copied as well. The description for this option
is already correct and does not need to change.

Change-Id: I021e5dc13bc074f1acfc7c65deea1d1201843b26
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Improve the instructions for enabling plpgsql (bug #960631)

Modifies the message to include a link to a wiki page.

See the comments on https://reviews.mahara.org/1108

Change-Id: I370fa2584943849ccf70a1a60a3aa64c78a06972
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Fix overly permissive SafeIframeRegexp in htmlpurifier (bug #922360)

Dots in the list of safe iframe sources are not escaped before use in
the regular expression passed to htmlpurifier, but they should be
because of their special meaning inside patterns.  This will prevent
people from registering domains like 'www-youtube.com' and
'playerxvimeo.com' and embedding iframes from those sites in their
pages.

Change-Id: I94ceedd77172cbb6650efad0ab7edfae92f5f7e8
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Merge "Fix overly permissive SafeIframeRegexp in htmlpurifier (bug #922360)"
Display a message when plpgsql cannot be created (bug #960631)

The upgrade to 1.5 requires that the plpgsql language is available in
postgres, but sometimes (e.g. versions of postgres < 8.3), the
database owner doesn't have permission to create the language, and the
admin will have to do it manually.

During the attempt to issue the CREATE LANGUAGE command, an sql
exception can be thrown when the db user has insufficient privileges,
so a generic 'nonrecoverable error occured' message is displayed
instead of the useful message instructing the admin to create plpgsql.
Catching the sql exception fixes this problem.

Change-Id: I176bdd1eee2247426ceedc6f165156d33eefbb42
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Merge "Improve the instructions for enabling plpgsql (bug #960631)"
Merge "Display a message when plpgsql cannot be created (bug #960631)"
Merge "Change postgres requirement to version 8.3+"
Add a new lang string on choosetemplate.php (Bug 964283)

Add the string "copyvieworcollection" for the title
of the page to read "Copy a page or collection" as
both can be copied from choosetemplate.php.

Change-Id: I0d1c7bd7da089e884eaea98a572f4f8403377223
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Show useful message on install/upgrade without triggers (bug #967001)

If the MySQL user doesn't have trigger permission, an SQLException was
thrown along with an unhelpful generic error message.  This privilege
is now checked before beginning the install/upgrade, and the message
is now informative.

Change-Id: If35750610cdc84e97bf8f2974d496dea43b8b991
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Fix capitalization (Bug 892959)

No change to the lang strings as no re-translation
is necessary.

Change-Id: I63876d60f4c5084d8058639b3a5309e262422aac
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Update the help file for Google Apps block (Bug 958791)

The instructions for making documents available
needed to be changed. Now only presentations seem
to show the old interface at times.

Change-Id: I730c2121b4699411ba6dad7638dbe538ef65747f
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Fix get_string calls for duplicate remote username message (bug #968697)

When uploading users from a csv file, the remote usernames given in
the file are checked for duplicates.  When a duplicate is found,
get_string is called to generate the error message using the string
key 'uploadcsverrorremoteusertaken', but in two of three instances, it
is called with too few arguments to sprintf.  Sometimes this results
in no error being reported to the user at all.

The error is fixed here by creating a new string without the second
argument for the first call, and by passing the additional argument in
the second call.

Change-Id: Iff93385dee206394c74b1d6b1ad9484e90026dd4
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
'Query:' string in selfsearch.tpl hard coded Bug#959090

Updated selfsearch.tpl
'Query' -> {str tag="query"}

Change-Id: I4d4ab2cbe8b2927ecb1739d4fb0581e76258d85a
Signed-off-by: Son Nguyen <ngson2000@yahoo.com>
Correct spelling mistake (Bug 892959)

Change-Id: Idfc079a7ebb950c488a7078ec1c48d370fedb398
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>