summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-29Merge branch '0.9.x' into 1.0.xBrion Vibber
2010-03-29Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.xBrion Vibber
2010-03-29Merge branch 'testing' into 0.9.xBrion Vibber
2010-03-29Merge branch 'master' into testingBrion Vibber
Conflicts: plugins/Blacklist/BlacklistPlugin.php
2010-03-29Renamed HTTPResponse class to StatusNet_HTTPResponse to avoid conflict with ↵Brion Vibber
PECL HTTP extension. The class isn't referenced by name by any other code I can see so this should have no side effects.
2010-03-29Add $config['db']['annotate_queries'] option to include caller ID comments ↵Brion Vibber
into queries. Comment can then be seen in process list, slow query logs on the server, aiding in tracking down unexpected slow queries. SELECT /* queuedaemon.php Ostatus_profile->processPost */ * FROM notice WHERE ( notice.uri = 'http://stormcloud.local/mublog2/notice/479' ) INSERT /* POST Notice::saveNew */ INTO notice (profile_id , content ....
2010-03-28RSSCloudPlugin's onRouterInitialized() should expect pass by value instead ↵Zach Copley
of reference
2010-03-28Revert "Remove console debug line"Sarven Capadisli
This reverts commit 06ffb8bf02b4c05f8eccd14a9ec2ddbba7ae21c5.
2010-03-28Remove console debug lineSarven Capadisli
2010-03-28Remove debug line that crept into a commit a while back, breaking realtime ↵Brion Vibber
when Firebug wasn't present
2010-03-28Merge branch 'master' into 0.9.xEvan Prodromou
Conflicts: lib/attachmentlist.php
2010-03-28don't try to get to database at initialize timeEvan Prodromou
2010-03-28add an option to run a command as the site ownerEvan Prodromou
2010-03-28continue deleting even if user profile record is missingEvan Prodromou
2010-03-28update README and version number0.9.1Evan Prodromou
2010-03-27move check for bad IDs from activityobject to activity and make simplerEvan Prodromou
2010-03-27reverse order of activity parse test argumentsEvan Prodromou
2010-03-27Some fixes to make the twitterstatusfetcher behave better in a multi-site ↵Zach Copley
configuration
2010-03-27Some fixes to make the twitterstatusfetcher behave better in a multi-site ↵Zach Copley
configuration
2010-03-27Localisation updates for !StatusNet from !translatewiki.net !sntransSiebrand Mazeland
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-26Multiple file upload handling.Nick Holliday
2010-03-26Fixes problem with IRC URLs showing as attachmentsNick Holliday
2010-03-26if there is oembed data for a file/link, consider that link to have an ↵Craig Andrews
attachment
2010-03-26Really make sure we return 'true' and 'false' strings for boolean vals in ↵Zach Copley
api/statusnet/config.:format.
2010-03-26Return an http auth error, when a client sends in an invalid auth user, even ↵Zach Copley
when http auth is not required.
2010-03-26Really make sure we return 'true' and 'false' strings for boolean vals in ↵Zach Copley
api/statusnet/config.:format.
2010-03-26Return an http auth error, when a client sends in an invalid auth user, even ↵Zach Copley
when http auth is not required.
2010-03-26Really make sure we return 'true' and 'false' strings for boolean vals in ↵Zach Copley
api/statusnet/config.:format.
2010-03-26Revert "Make sure we return 'true' and 'false' strings for boolean vals in ↵Zach Copley
api/statusnet/config.:format" This reverts commit 419c38cc0bf3f2649be9ad18e983b9f0ac8dfec0.
2010-03-26Make sure we return 'true' and 'false' strings for boolean vals in ↵Zach Copley
api/statusnet/config.:format
2010-03-26Return an http auth error, when a client sends in an invalid auth user, even ↵Zach Copley
when http auth is not required.
2010-03-26Drop debug statements on every regex match from Blacklist plugin; filling ↵Brion Vibber
the logs a little faster than ops likes. :)
2010-03-26Drop debug statements on every regex match from Blacklist plugin; filling ↵Brion Vibber
the logs a little faster than ops likes. :)
2010-03-26move base64_url_(encode|decode) to static functions in MagicsigJames Walker
2010-03-26move base64_url_(encode|decode) to static functions in MagicsigJames Walker
2010-03-26Fix for XHR more text behaviour on conversation pagesSarven Capadisli
2010-03-26Fix for XHR more text behaviour on conversation pagesSarven Capadisli
2010-03-26Merge branch '0.9.x' into 1.0.xEvan Prodromou
2010-03-26Merge branch 'testing' into 0.9.xEvan Prodromou
2010-03-26Do ostatus queue firstEvan Prodromou
We do the OStatus queue first, so if we're sending a notice to the same server twice (e.g., with OMB), our richer and more featureful notice comes in first.
2010-03-25Tweak to OStatus long message cropping: use original source notice URL for ↵0.9.1rc1Brion Vibber
the link in the text version, don't shorten the link for the HTML so we can append params to it in JS. Conflicts: plugins/OStatus/classes/Ostatus_profile.php
2010-03-25Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents ↵Brion Vibber
to make it easier to extract without getting extra markup.
2010-03-25Merge branch 'master' of git@gitorious.org:statusnet/mainlineBrion Vibber
2010-03-25Restore lost addition of inline HTML attachment display.Brion Vibber
2010-03-25version number and codenameEvan Prodromou
2010-03-25Merge branch 'master' of git@gitorious.org:statusnet/mainlineEvan Prodromou
2010-03-25If indenting is disabled on the output, this fixes the entity_tags cropSarven Capadisli
2010-03-25Fix for processing indicator for asideSarven Capadisli
2010-03-25Updated biz theme to use realtime icons from coreSarven Capadisli
2010-03-25A lot of updates to keep the themes current (at least in functionality)Sarven Capadisli