Add a reminder for $config->version in lib/version.php

Change-Id: I9eb8f86332db783506ec3d70a0dc9c376701179c
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Merge "Add a reminder for $config->version in lib/version.php" into 1.5_STABLE
Bug#1012924: 'Copy page' should always copy to user's

portfolio not group pages

Change-Id: Id056d644afc3645fc781023336bf4ac3c1aff489
Signed-off-by: Liuba Kazakov <liuba@catalyst-au.net>
Merge "Bug#1012924: 'Copy page' should always copy to user's" into 1.5_STABLE
Insert fewer rows per query in MySQL textbox upgrade (bug #1018590)

The upgrade to convert textboxes to artefacts tries to insert 5000
rows at a time into the artefact table.  This is too much data for
MySQL's default max_allowed_packet setting.  Reducing the number of
rows inserted per query to 100 (or a bit larger, depending on
max_allowed_packet) fixes the upgrade problem.

See https://mahara.org/interaction/forum/topic.php?id=4474#post20477

Change-Id: I8335323e247abb570a434cd105d4590cad103018
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Merge "Insert fewer rows per query in MySQL textbox upgrade (bug #1018590)" into 1.5_STABLE
Add display_default_name dwoo plugin (bug #1009777)

This just html escapes the output of display_default_name.  Existing
calls are modified to avoid double escaping.

Change-Id: I117a748a4d4cdb3313377f3441bbd20567a88fcb
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Patch XSS vulnerability in Insert/Edit Image in Edit blog

Change-Id: Ia9df5e4eef4f3fb50ae1464540d777522179ac82
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>
Json-encode login form when injected by js (bug #1009784)

Change-Id: Ia81053332cfa9e0f79268031795af8d34b45ff78
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Change browserid login URL (Bug #1024255)

Login and verify url changed from https://browserid.org to https://login.persona.org

Change-Id: I3cd731650e43dda5e62dbc8fbe0ed5f24bc46a9d
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
Merge "Add display_default_name dwoo plugin (bug #1009777)" into 1.5_STABLE
Merge "Patch XSS vulnerability in Insert/Edit Image in Edit blog" into 1.5_STABLE
Merge "Json-encode login form when injected by js (bug #1009784)" into 1.5_STABLE
Sanitize links in links and resources menu (bug #1009774)

Links placed in the links and resources list have not been getting
checked and so have been displayed unfiltered to users and other
admins. These user-supplied links are now checked with sanitize_url
which has been extended to convert relative links to absolute.

Change-Id: I679627c4e33621df82705c39e77e7226ffef5a97
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Sanitize links in links and resources menu (bug #1009774)" into 1.5_STABLE
Version bump for 1.5.2

Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Version bump for 1.5.3testing

Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Change browserid login URL (Bug #1024255)" into 1.5_STABLE
Fix XML Security bug

Change-Id: I881842545772eebb2a3805e80db0d477ea4a001e
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Fix XML Security bug" into 1.5_STABLE