group collections

(Bug #1033315)

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

Change-Id: I39bde5caee581f96f70ef9886470186591c796ef
Signed-off-by: Matthew Kolb <matt.kolb@yahoo.com>

* changes:
  Fix graphs of institution stats
  Add site option staffstats
  Allow viewing of institution statististics by staff

Remove call to group-count, as no groups in institution stats

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

Allows administrators to let institution staff view statistics for
their institution

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

Site staff can always view, institution staff can view if
staffstats config option is set

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

* changes:
  Reword institution statistics page when no institutions
  Change string for institution statistics

The default block title will then be called the
same as the block to avoid confusion.

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

Change-Id: I10ac8fc0c53a66eabb2a7f558f4111f3a2d5e61a
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>

Change-Id: I15a9e60e7d4e80f2354ba6ad4495c881ea562a8f
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>

* changes:
  Sanitize links in links and resources menu (bug #1009774)
  Json-encode login form when injected by js (bug #1009784)

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>

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

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

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>

Change-Id: I2042eccf6c162e8e427b99328035fb9032190a7d
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>

page

Bug #1023668

The config values 'resizeuploaduseroption' and
'resizeonuploaduserdefault'
must be set when using filebrowser pieform

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

A warning message when you delete the picture from the "Profile
pictures" 
area under "Content" if the profile picture is used in a page like 
it happens for any other file. Otherwise, no warning is given

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

This patch moves form elements array to the separate function.

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

These strings do not require new IDs as the
meaning doesn't change.

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

Bug #1028685

Also requires the following to be added to all the RewriteRule's
&%{QUERY_STRING}

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