* '0.9.x' of gitorious.org:statusnet/mainline: (102 commits)
Fix for ticket #3010: blocks are now applied against the original poster of repeats.
Fix XML API output for several profile update methods that returned a <user> entry but didn't set namespaces, causing XML parse failures.
Fix for ticket #3007: .bmp avatar uploads weren't being properly converted to PNG in all cases
Bookmark saving robustness fixes
remove boilerplate from NewMenuPlugin
Localisation updates from http://translatewiki.net.
L10n consistency updates in wording and punctuation. Translator documentation added/updated. Superfluous whitespace removed.
Add translator documentation Fix L10n issues Remove superfluous whitespace
Add correct punctuation for client exceptions.
Add correct punctuation for client exception.
Add correct punctuation for client exception.
Add email field to Twitter registration form; needed when RequireValidatedEmail plugin is present.
Add email field on openid registration; needed to register if RequireValidatedEmail plugin is also present.
Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms)
Event hook points needed to run Recaptcha on Twitter registration
Fix inconsistent use of 'name' vs 'fullname' in tw_fields member variable
Add Start/EndRegistrationData event hooks in finishopenidlogin: allows recaptcha to add its captcha display to the form (checked since addition of StartRegistrationTry)
Ticket #2999: RequireValidatedEmail plugin now also prevents group creation by unvalidated users.
Localisation updates from http://translatewiki.net.
Translator comments added L10n updates Remove superfluous whitespace Number parameters in message when two or more are used ClientException and ServerException should end with a period
...
Previously, if someone you subscribe to repeats a notice by someone you've blocked, you got the message and had to just roll your eyes.
Now blocks are checked against both the current notice's posting profile, and the poster of the original if it's a repeat.
Part of the reported issue was previuosly fixed by dc497ed0 (smaller size images being blanked).
This commit fixes the remaining bug with original-size avatars being left as BMP (which could include the 96px size for instance, which could cause problems in browsers not supporting BMP natively)
Added ImageFile::copyTo() as a convenient alias for resizeTo() when not resizing; this performs the BMP/XPM/XBM->PNG conversion if needed, or copies the original file.
Copying instead of using move_uploaded_file() is fine here since:
a) the files are cleaned up on script completion anyway (vs moving to remove it)
b) we're already performing getimagesize() and possibly load/resize on the file before this point (vs needing to move the file into a usable area to work with open_basedir restrictions that prevent working directly with uploaded files in the temp dir; since this would fail anyway, we lose nothing)
ImageFile::preferredType() now works on $this->type instead of asking for one, to make it handier to use from outside. (This is still needed in order for calling code to generate a target filename.)
Recommended for future:
* additional consolidation between the various ways of uploading avatars (touched avatarsettings, grouplogo, and apiaccountupdateprofileimage with similar minor changes)
* consolidate type checks and file naming into Avatar class
L10n updates
Remove superfluous whitespace
Number parameters in message when two or more are used
ClientException and ServerException should end with a period
* 'testing' of gitorious.org:statusnet/mainline: (63 commits)
Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
fix wrong datatypes (saving string instead of array) in AtomPub notice processing
Account moving is a background activity
return a 409 Conflict when subscription already exists
OStatusPlugin does discovery in Profile::fromURI()
considerably more logging and error checking in AccountMover
add a log method to AccountMover
normalize accounts and check for return in HTTP for moving
move account-moving classes to their own libraries
execution protection on discovery.php
PHPCS discovery.php
Move discovery library from OStatus plugin to core
Revert "Revert "0.9.7alpha1""
first example of moving a user
Parse properties of links in XRD files
Add the Atom username to the XRD output
preserve activities in object
let callers pass in an XMLOutputter to output to
execution protection on discovery.php
PHPCS linkheader.php
...
