GitLab

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

Also add in default quota for each institution

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

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

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

* changes:
  Add 'My institutions' filter drop-down to find friends page
  Add institutions filter to pagination links in search results
  Add institutions filter to user search query
  Add institution filter parameter to user search page

Bug #789719

Before the data was imported, but there was an error log, and now
the data imports but with no error log.

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

When a user changes their language preference, this change ensures
that the session language is also updated at the same time.

This means the user language is retained when the user logs out,
and in the case where they remove their language preference
altogether, the session language (which is normally used in
preference to the site default) is cleared too.

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

This fix makes it only update access if there is something
to update

Bug #788457

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

Slideshare is a service for hosting and sharing slideshows
More at http://www.slideshare.net



Change-Id: I35f3aa138da4833a7f230d767730cecf03a11d18
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>

Most of these get_string calls were not using a section
name. This patch fixes this by adding these strings to
each section responsible.

Bug #787866

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

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

When the myinstitutions filter option is passed to build_userlist_html,
make sure the filter is propagated to the query string in the pagination
links at the bottom of the search results.

Also removes unused variables from the smarty template.

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

If the 'myinstitutions' option is passed to search_user(), add an
institution subselect to the query so that only users sharing an
institution with the logged-in user are returned.

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

On find friends page and associated json script, take a 'filter' param
and pass it through to both the search function and the pagination
builder.

The only valid options will be 'myinstitutions' (to filter results by
users who are in one or more of the logged-in user's institutions),
and 'all', to search everyone on the site.

The new parameter defaults to 'all' when the logged-in user is not in
any institutions.

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

When not configured, it doesn't use the default values

Bug #787444

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

Bug #788124

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

Bug #788460

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

Bug #785760

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