GitLab

Conflicts:
	actions/apioauthauthorize.php
	lib/apioauthstore.php

request tokins with OAuth client applications and profiles.

Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.

* moved some translator comments that were not directly above the line with the message to the correct location.
* i18n for UI text.
* superfluous whitespace removed.

Fix for ticket #2845: singleuser nickname configuration was being overridden by site owner in router setup.

I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.

Setting $config['singleuser']['nickname'] should now work again as expected.

back to (profile_id, application_id). I think we can get away without
a DB change by only issuing one anonymous access token per user.

* add translator documentation.

* translator documentation updated/added.
* superfluous whitespace removed.

small DB tweak.  Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).

http://status.net/open-source/issues/2761

This should also make it possible to have multiple access tokens
per application.

http://status.net/open-source/issues/2788

Fix PHP notice when submitting 'design' admin panel on a browser that doesn't support file uploads such as Mobile Safari

Quick fix for bad message in en_GB (#2790) -- fixed upstream at http://translatewiki.net/w/i.php?title=StatusNet:A3894b1256ab040ed20a35eedeece8829c62d5ab-Direct_message_to_s_sent./en-gb&diff=2403802&oldid=1930996

allow custom schemes like mustard:// etc.