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

Bug #801393
Created Media Sources for both Vimeo.
Added Vimeo to supported sites list and name to language file.

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

Bug #802313

Regression introduced in 4eb7374f



global $USER was not added to some methods that needed it

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

There is now a new option in the settings for an institution to
confirm registrations. When this is set, a new user admitting
themselves to an institution is required to complete an extra step
during registration, where they must provide a "reason" for their
registration.

After email verification the user must wait until an administrator
approves or denies their registration before they can properly
access the site. For the administrator, this is done via a new
admin page under Institutions, called "Pending Registrations".

Change-Id: I2bd68e39a9f4ef89f350ac573d8232f342de6fdc
Author: Stacey Walker <stacey@catalyst-eu.net>
Signed-off-by: Brett Wilkins <brett@catalyst.net.nz>
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

When institutional admins try to add/edit users,
the default quota value passed in the form was a string
ie. 50MB

This fix changes it so that if institutionaloverride is disabled
and the user is not a site admin, then don't set the quota

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

Create new functions to add members, invite members, and decline
membership requests for an institution.  These functions check
appropriate institutional admin permissions and are callable by
the webservice api.

Also modifies the existing bulk insitution membership page to make
use of the new functions.

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

Bumps master version, and moves the upgrades that didn't happen
to the new bump, checking where nessesary if they have already been
applied

The new version bump is the date after the 1.4_STABLE branch
2011061100

Version numbers missed:
2011052400 - ctime in view access
2011053100 - default quota for institutions
2011053101 - group quota
2011060700 - retain view access on copy
2011060701 - set onlineuserssideblockmaxusers to 10, and add showonlineusers field to institutions

Bug #800917

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

Fixes upgrade bug introduced in
af0e933f


bug #793815

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

This reverts commit fb38dd95

.

It turns out that we do need the wwwroot to be in the database
because the code that sends forum posts via email runs in php
cli mode and is needs to get the hostname of the site to embed
in the headers.

While not specifically mentioned in bug #794490, it was spitting
out warnings in the logs.

Conflicts:

	htdocs/lib/db/upgrade.php
	htdocs/lib/version.php

Change-Id: I36b33ac72eee01f71056a45c706f2fc8674620ec
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Patch from Evonne Cheung

Change-Id: I2f8f93e159ebb0444f69c568d9686e88ca8f44d7
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Bug#799565
Changed Textbox Columns from 80 to 76.

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

If a user leaves an institution, update the lastinstitution
tag to show the name and display name

If a user joins an institution, remove the lastinstitution tag

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

Bug #800926

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

Adds a table to store user tags. These tags will be used
in the future for search queries, and the potential for
other uses

Bug #800926

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

Bug #800575

When pagination was used on the journals page, the user
could not select any page other than the current. An error
log occured if they did try.

This fix adds a requires clause to the json script that is used
by the pagination. Fixing this also brings up the issue in bug #795425

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

* changes:
  Allow plugins to add to admin menu (bug #799989)
  Use keys in admin menu arrays (bug #799989)

* changes:
  Remove institution sorting from admin user search page (bug #799617)
  Change query string interpretation in group member search (bug #799591)
  Move name search sql generation into separate function
  Change interpretation of admin user search query (bug #799591)

Logged-in user language preferences were broken in commit 9ca6bb55

.
This change removes caching on the session and config languages, which
are quick to retrieve anyway, but leaves it in place for the user
language preference and locale setting.

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

This change just removes the link allowing you to sort by institution
on admin user search when usersallowedmultipleinstitutions is turned
on.

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

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

This will be useful for group member searches, which should use the
same query string parsing and the same same constraints on searching
usernames, real names, and display names as are used in the general
user searches.

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

In admin user search, in the internal search plugin, use similar behaviour
to ordinary user searches: Join search terms by "AND", search quoted phrases
within a single field, respect the exact searches setting in the internal
search plugin configuration.

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

* changes:
  Show institution requests/invites on admin search page (bug #800020)
  Avoid sql error when logged-out & viewing public group page (bug #800024)

Institutional admins are supposed to see users with open institution
requests/invitations on the admin search screen.  This has been
broken since auto_escape was enabled in templates.

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