Commit Graph

10371 Commits

Author SHA1 Message Date
Brion Vibber
873b832827 Merge branch 'master' into testing
Conflicts:
	plugins/Blacklist/BlacklistPlugin.php
2010-03-29 15:14:25 -07:00
Brion Vibber
a8d92dad5e Renamed HTTPResponse class to StatusNet_HTTPResponse to avoid conflict with 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-29 15:07:15 -07:00
Brion Vibber
d44e5ac935 Add $config['db']['annotate_queries'] option to include caller ID comments 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-29 13:14:11 -07:00
Zach Copley
03f6706468 RSSCloudPlugin's onRouterInitialized() should expect pass by value instead of reference 2010-03-28 17:01:16 -07:00
Sarven Capadisli
21a835596c Revert "Remove console debug line"
This reverts commit 06ffb8bf02.
2010-03-28 23:50:25 +02:00
Sarven Capadisli
06ffb8bf02 Remove console debug line 2010-03-28 23:49:10 +02:00
Brion Vibber
bf468e2a8d Remove debug line that crept into a commit a while back, breaking realtime when Firebug wasn't present 2010-03-28 14:41:31 -07:00
Evan Prodromou
f0d905112e Merge branch 'master' into 0.9.x
Conflicts:
	lib/attachmentlist.php
2010-03-28 15:25:02 -04:00
Evan Prodromou
482faf6614 don't try to get to database at initialize time 2010-03-28 15:17:44 -04:00
Evan Prodromou
642adc3b00 add an option to run a command as the site owner 2010-03-28 14:38:07 -04:00
Evan Prodromou
65766a0ebe continue deleting even if user profile record is missing 2010-03-28 11:58:16 -04:00
Evan Prodromou
ddc71b6637 update README and version number 2010-03-28 11:39:56 -04:00
Evan Prodromou
29566c5d4b move check for bad IDs from activityobject to activity and make simpler 2010-03-27 22:44:10 -04:00
Evan Prodromou
8a9e664014 reverse order of activity parse test arguments 2010-03-27 22:43:18 -04:00
Zach Copley
5b7b38ab66 Some fixes to make the twitterstatusfetcher behave better in a multi-site configuration 2010-03-27 23:43:05 +00:00
Zach Copley
8fc390e5cb Some fixes to make the twitterstatusfetcher behave better in a multi-site configuration 2010-03-27 23:36:05 +00:00
Siebrand Mazeland
53ccb1c94b Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-27 18:47:38 +01:00
Nick Holliday
260f00d60b Multiple file upload handling. 2010-03-26 18:28:54 -04:00
Nick Holliday
92ded7c6cb Fixes problem with IRC URLs showing as attachments 2010-03-26 18:16:44 -04:00
Craig Andrews
1bf27de9b9 if there is oembed data for a file/link, consider that link to have an attachment 2010-03-26 18:13:45 -04:00
Zach Copley
15736ea435 Really make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format. 2010-03-26 19:59:05 +00:00
Zach Copley
60009227f7 Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required. 2010-03-26 19:58:59 +00:00
Zach Copley
c9a3916c34 Really make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format. 2010-03-26 19:58:26 +00:00
Zach Copley
b82e55356d Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required. 2010-03-26 19:58:15 +00:00
Zach Copley
f609d49aea Really make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format. 2010-03-26 19:55:16 +00:00
Zach Copley
a9b130fc00 Revert "Make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format"
This reverts commit 419c38cc0b.
2010-03-26 19:48:07 +00:00
Zach Copley
419c38cc0b Make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format 2010-03-26 19:41:52 +00:00
Zach Copley
379df1ce3e Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required. 2010-03-26 18:51:01 +00:00
Brion Vibber
766cf99f21 Drop debug statements on every regex match from Blacklist plugin; filling the logs a little faster than ops likes. :) 2010-03-26 10:47:12 -07:00
Brion Vibber
c905d7e9a0 Drop debug statements on every regex match from Blacklist plugin; filling the logs a little faster than ops likes. :) 2010-03-26 10:46:36 -07:00
James Walker
3227122ac3 move base64_url_(encode|decode) to static functions in Magicsig 2010-03-26 10:43:41 -07:00
James Walker
c6c4510192 move base64_url_(encode|decode) to static functions in Magicsig 2010-03-26 13:37:46 -04:00
Sarven Capadisli
4484c63ff4 Fix for XHR more text behaviour on conversation pages 2010-03-26 14:57:33 +01:00
Sarven Capadisli
94f904bf66 Fix for XHR more text behaviour on conversation pages 2010-03-26 14:56:15 +01:00
Evan Prodromou
e3a46d2b83 Merge branch '0.9.x' into 1.0.x 2010-03-26 09:18:07 -04:00
Evan Prodromou
36a8e8e8a3 Merge branch 'testing' into 0.9.x 2010-03-26 09:17:47 -04:00
Evan Prodromou
75b2bf2a4e Do ostatus queue first
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-26 08:45:23 -04:00
Brion Vibber
e91bf2b8a9 Tweak to OStatus long message cropping: use original source notice URL for 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-25 16:08:09 -07:00
Brion Vibber
013647f0ba Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup. 2010-03-25 23:11:06 +01:00
Brion Vibber
511a164c99 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-25 14:32:28 -07:00
Brion Vibber
e174a7211d Restore lost addition of inline HTML attachment display. 2010-03-25 14:31:22 -07:00
Evan Prodromou
46655eb3ca version number and codename 2010-03-25 17:25:26 -04:00
Evan Prodromou
cbf321eeb3 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-25 17:24:10 -04:00
Sarven Capadisli
c066e5285c If indenting is disabled on the output, this fixes the entity_tags crop 2010-03-25 22:20:59 +01:00
Sarven Capadisli
353659764b Fix for processing indicator for aside 2010-03-25 22:20:50 +01:00
Sarven Capadisli
ec84c6acee Updated biz theme to use realtime icons from core 2010-03-25 22:20:43 +01:00
Sarven Capadisli
2bd75d0f5b A lot of updates to keep the themes current (at least in functionality) 2010-03-25 22:20:36 +01:00
Sarven Capadisli
aeab594d32 location -> label class for cloudy 2010-03-25 22:20:27 +01:00
Sarven Capadisli
b4a4438abd Using unique @for, @id pair for jabber and sms options in subscriptions 2010-03-25 22:20:20 +01:00
Sarven Capadisli
5e79ef58e4 Using hCard label instead of location. Matches userprofile. 2010-03-25 22:20:14 +01:00