GitLab

Bug #805780

Adds a logo field to the institution edit form.  On upload, the file
is saved as a 'profileicon' artefact, to ensure that it's publicly
visible, and can be requested in multiple sizes by thumb.php.

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

Bug #805780

If set, the value refers to an artefact id of an image owned by the
institution

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

Bug #805742

Also ensures the profileicon field is cleared when the artefact
it points to gets deleted.

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

Change-Id: I70c7ad8eac47aa4dfbddfc5ae2d3a4713842a86f
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

Bug #803657

Change-Id: I7d90dbb59523c6a5476868f70613a4c51e89f79d
Author: Rich Trott <Richard.Trott@ucsf.edu>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Change-Id: Iecdbb28023dff83a897e53f6058d6e1136cf5c6b
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>

On the share page, change error message on Access Date/Time input fields
from Unrecognised date format to Use the format YYYY/MM/DD HH:MM

Change-Id: I8719694ce88e06db03b2fe59d53cb6600d19a432
Signed-off-by: Mikael Mrozik <mikael@catalyst.net.nz>

In thumb.php, display the no_userphoto.png image from the current theme
instead of the site theme.

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

The pager was displayed erroneously when the total number
of items was equal to the limit per page

Change-Id: I93f01f7a3a3b80a46487a35aaf232680a4e67752
Signed-off-by: Mikael Mrozik <mikael@catalyst.net.nz>

Bug #801082

Change-Id: I2bfafb56a9b9ce0af8b4f5d13d69c88cc51d9a78
Signed-off-by: Chris Wharton <chrisw@catalyst.net.nz>

Commit d807b4ac

 introduced a bug when
deleting comments where the first one was deleted, whether the user
chose the first one or not.

The root cause was the change to an image submit, which changes what
variables are included in the POST.

Change-Id: I8897e246d6e46017ed84e30b66ff41bed5b7ecf2
Signed-off-by: Darryl Hamilton <darrylh@catalyst.net.nz>

See bug #799617

This change fixes the pagination on the admin user search page for
institutional admins with more than one institution when users can
belong to multiple institutions.

As part of the fix, the behaviour of the page has been changed so
that requested and invited users are no longer displayed.

Institutional admins are already able to find users with open requests
on the institution members page, and will soon be able to find invited
users on that page too.

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

This change adds 'invited users' to the institution members screen,
and allows the institutional admin to revoke invitations that have
already been sent out.

See bug #799617.

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

Add a checkbox beside each user in admin user search, select all/none
links, and a button to submit all the selected users to the bulk user
actions page.  Checkboxes are reset on each new search query, but not
when changing the page or order of results.

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

This page takes a list of user ids, filters it using the admin's
institutions (if institutional admin), and displays the list.

The admin can then either download the list as a CSV file, or suspend,
delete or change the auth instance of all the users in the list at once.

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

Change column configuration to use a 'sort' option instead of 'nosort'
Allow columns to specify html to appear in the column header

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

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

This makes the order more consistent when changing the sort column

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

This was especially important in ActivityTypeInstitutionmessage where it
was trying to mail to deleted users from $institution->addRequestFromUser().

Change-Id: I719bd2b86af76d2cc139a4354615a2d0383f8cfb
Signed-off-by: Piers Harding <piers@catalyst.net.nz>

bug #801081

Change-Id: I88f594d2c5dcf7d42aa17d069adb2eb59d9a69e1
Signed-off-by: Stacey Walker <stacey@catalyst-eu.net>
Signed-off-by: Paul Walker <paul.walker@catalyst-eu.net>

This is related to Bug #802338, removing the vague expression entirely.

I have also taken the liberty of modifying this to always use iframes,
as to better support devices without flash support.

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

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

When a user registers, they either join the institution
direct, or request joining. Set the default quota if they join direct
either by the institution config allowing them to, or the institutional
adminstrator approving their registration.

If they only request membership because of the way the institution config
is setup, then just use the default sitewide quota

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

Add a param so that the URL goes directly to the institution
with pending registrations

Change-Id: I11959f3aaa16e2757ee9a4f367edcc4e8135e306
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>

The search query is tested against user tags as well now

This search query only works for the following pages:
- Institutions -> Members

For example, one can search for
lastinstitution:Foo Bar Institution
and the results would be all the users that were in the
Foo Bar Institution for their last insitution

Change-Id: I2af823911346af5b9fdc8ae64b92d329f03dff5c
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>

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>