GitLab

Add a link to the profile sideblock that says where you came from if you're an MNET user, and gives you the ability to jump back there.

Conflicts:

	htdocs/auth/xmlrpc/lang/en.utf8/auth.xmlrpc.php

This was only causing noise, there was no breakage caused because of it.

Add an option - usersuniquebyusername - that allows users from multiple institutions to SSO in to one Mahara account. Tentative fix for #2243.

If this option is turned on (only in config.php), then when users SSO in from any XMLRPC authentication instance, they will be considered the same user if they have the same username. This differs from current behaviour, in that if the users' authinstances are different then they are considered different users.

If this option is turned on, no institution in the system is allowed to have self registration turned on. Also, users must be able to belong to multiple institutions.

This option added thanks to Howard Miller/Glasgow University.

This happened if you weren't an admin, so I missed it the first time around.

Conflicts:

	htdocs/lib/version.php

Set some defaults for XMLRPC auth correctly. This prevents 'updateuserinfoonlogin' being set by default.

Unfortunately defaults seem to be set in two places, causing endless confusion. Will deal with this later perhaps.

Just a convenience thing, as most people will copy from the URL bar in their browsers most likely.

The old logic I had there was clearly wrong. We need to check the auth_remote_user table for the username for the remote authinstance, and the usr table for users for the local authinstance.

This bug fixed thanks to Howard Miller/Glasgow University.

If users do not have an e-mail address in LDAP, they will be required to set one when they log in.

This bug fixed thanks to Howard Miller and Glasgow University.

This makes the French translation make more sense.

This is quite an expensive operation. I guess one day large installs will have problems with it, but it can probably be re-implemented in a more performant manner when needed.

Conflicts:

	htdocs/lib/version.php

This gives them some room to actually upload something useful.

Move the 'edit this view' link to where the artefacts in a view are listed on My Views. Fixes #2317.

It might not be perfect, but it's better than current.

Correct the query for obtaining the institution list in the case where there are deleted institution staff and administrators.

(cherry picked from commit 6a7a548b)

Otherwise, the user sees the message no matter what when forced to change their password, which looks stupid.

Remove the last remnants of the myportfolio theme, and fix a bug that causes a crash when choosing themes without a config.php

Now it is expected that all themes have a config.php.
(cherry picked from commit ed48e680)

This at least gives admins the chance of doing this if they want to.

(cherry picked from commit 879f456e)

It's much less ambiguous. Should help with users confused as to what it does.
(cherry picked from commit 15cfe974)

This makes it easy to tell when you are doing this on all pages - not just on pages where the sidebar is visible.
(cherry picked from commit ba080c55)

Fixed 'viewreleased{subject,message}' broken language strings in notifications. Part of the fix for #2271.
(cherry picked from commit 0a7f07f0)

There's no need to reveal this information, as the Mahara version is not revealed elsewhere.
(cherry picked from commit fb830d75)

(cherry picked from commit ea02642a)

Take into account the install subdirectory when redirecting users because of access denied. Fixes #2259.
(cherry picked from commit c93adecb)

The previous patch to that part of the code instead made it so you couldn't kick anyone out if the group ID equaled the group ID, which of course it always does.
(cherry picked from commit bec4d579)