GitLab

Break xbImportNode.js and geometa.js back out of util.js; the Makefile in js has been updated to combine them with util.js source when building util.min.js
Revert "combine our standard scripts into one big script"

This reverts parts of commit 0c5ca46b.

When queueing is off, restore runs immediately. Indicate that we've already finished processing on the success page in this case; otherwise continue to show the 'will take a few minutes' message.

Don't trust text/xml mime types; generic content detection gives useless stuff like that on SVG images! Todo: replace the extension check in this case with better content-based checks.

This reverts commit 3e82000d.

* avoid PHP notice from using wrong variable
* show a visible error instead of blank screen if no file submitted with restore form
* avoid PHP strict warning from using calling "non-static" DOMDocument::loadXML statically
* suppress PHP warning from XML parse errors

http://translatewiki.net/wiki/StatusNet:Cb5746be52330331844dea750bf452c0618aecb3-All_Rights_Reserved/pt-br

http://translatewiki.net/wiki/StatusNet:08b929b29496be84ff75d266b5e60b426cff449f-Hey,_1$s._Someone_just_entered/ca

Conflicts:
	plugins/OStatus/classes/FeedSub.php

Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config.

Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke

Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke

Add 6 new events to make it easier to override the type of an activity object.

Sort indexing fix for profile sidebar: add group_member_profile_id_created_idx to group_member table, streamlines sorting of your group memberships in the sidebar

Sorting index fix for role lookups: adds profile_role_role_created_profile_id_idx index on profile_role

Update sorting for conversation views: adds notice_conversation_created_id_idx index on notice, replacing more limited notice_conversation_idx

see: http://groups.google.com/group/twitter-api-announce/msg/34b013f4d092737f

Update sorting on api/statuses/retweets_of_me; was and remains poorly indexed, but will use updated sorting method.

Update sorting on api/statuses/retweets: adds notice_repeat_of_created_id_idx index to replace notice_repeatof_idx

work around borkage in statuses/repeats -- tries to check an offset var that's not there. use the limit var which is there instead