Change pending registration expiry time to 2 weeks

Also adds a message to the email sent to admins to that effect

This is a temporary fix for bug #952625 until a new feature can
be introduced to add a config option for this time limit.

Change-Id: I898759db8e5eb4cfb8c1eead8b7ac006c6f97197
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>
Change class from "message" to "message delete" for group deletion warning message

Bug#916691

Change-Id: Ibb5e368fe8a130404e72aba627b5f88560851954
Signed-off-by: Son Nguyen <ngson2000@yahoo.com>
Merge "Change class from "message" to "message delete" for group deletion warning message"
Update all themes for 1.5

Small fixes to the 1.5 themes from Evonne.

These fix various alignment issues and eye sores.

Change-Id: Id7f5bbb9b8017ce3fcb497542d300e77f7ba04e0
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Add two buttons (privacy and topics) to the dashboard

The "Control your privacy" button isn't actually new, it was a
non-button previously.

The link to forum topics is new however.

This brings all themes up to date with the expanded dashboard
that is part of the primaryschool theme (bug #949804).

Change-Id: I392cfa284cea7d2dff3e3f46428fbe2edc507009
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
theme/primaryschool: add new theme for younger students

Bug #949804

Change-Id: I9ea5578b4a2cb9c3b7f30078f5953da93d9a0232
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Merge "Change pending registration expiry time to 2 weeks"
Remove call-time pass by reference

This was deprecated in PHP 5.3 and has been removed in 5.4:

  http://nz.php.net/manual/en/migration54.incompatible.php

Change-Id: I715588f5a24eeeacb803af3ac9b68f8bb3b4d751
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Merge changes I9ea5578b,I392cfa28,Id7f5bbb9

* changes:
  theme/primaryschool: add new theme for younger students
  Add two buttons (privacy and topics) to the dashboard
  Update all themes for 1.5
Merge "Remove call-time pass by reference"
xmlrpc: remove deprecated "session_unregister" call

This function was deprecated in PHP 5.3 and removed in 5.4.

Change-Id: I234417a3ffcc7e958279aea09fa0180159d34254
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Merge "xmlrpc: remove deprecated "session_unregister" call"
Fix tests following string fixes for bug (bug #892959)

String fixing commit was ba10ffdc65a3b973d9a356efe8e8c1bf8763546d
and afterwards, the tests were comprehensively broken.

Change-Id: If0060dc5621af1ca87ab231ad4bc745c8cfbc2fb
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Fix tests following string fixes for bug (bug #892959)"
Fix "Creating default object from empty value" errors

PHP 5.4 doesnt like creating objects on the fly.

Change-Id: Ia2ba74bcf454d58e7b526fa0c1aff64f2ad71f59
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>
Merge "Fix "Creating default object from empty value" errors"
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)"