Evan Prodromou [Mon, 26 Apr 2010 06:40:36 +0000 (02:40 -0400)]
Give users more control over URL shortening
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.
Squashed commit of the following:
commit
d136b390115829c4391b3666bb1967f190a0de35
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:39:00 2010 -0400
use site and user settings to determine when to shorten URLs
commit
1e1c851ff3cb2da5e0dc3a0b06239a9d9c618488
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:38:40 2010 -0400
add a method to force shortening URLs
commit
4d29ca0b91201f6df42940297ed5b64b070efe49
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:37:41 2010 -0400
static method for getting best URL shortening service
commit
a9c6a3bace0af44bcf38d1c790425a7be9c72147
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:37:11 2010 -0400
allow 0 in numeric entries in othersettings
commit
767ff2f7ecfd7e76e8418fc79d45e61898f09382
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:36:46 2010 -0400
allow 0 or blank string in inputs
commit
1e21af42a685f600f4a53f49a194013e78b12f20
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:01:11 2010 -0400
add more URL-shortening options to othersettings
commit
869a6be0f5779aff69018d02f9ac0273946040d9
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 14:22:51 2010 -0400
move url shortener superclass to lib from plugin
commit
9c0c9863d532942b99184f14e923fc3c050f8177
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 14:20:28 2010 -0400
documentation and whitespace on UrlShortenerPlugin
commit
7a1dd5798f0fcf2c03d1257a18ddcb9008879de0
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 14:05:46 2010 -0400
add defaults for URL shortening
commit
d259c37ad231ca0010c60e5cfd397bb1732874a4
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 13:40:10 2010 -0400
Add User_urlshortener_prefs
Add a table for URL shortener prefs, a corresponding class, and the
correct mumbo-jumbo in statusnet.ini to make everything work.
Evan Prodromou [Wed, 7 Apr 2010 14:47:29 +0000 (10:47 -0400)]
Merge branch '0.9.x' into 1.0.x
Evan Prodromou [Wed, 7 Apr 2010 14:46:54 +0000 (10:46 -0400)]
Merge branch 'testing' into 0.9.x
Evan Prodromou [Wed, 7 Apr 2010 14:46:23 +0000 (10:46 -0400)]
Merge branch 'master' into 0.9.x
Evan Prodromou [Wed, 7 Apr 2010 14:45:44 +0000 (10:45 -0400)]
Merge branch 'master' into testing
Evan Prodromou [Wed, 7 Apr 2010 14:44:00 +0000 (10:44 -0400)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Evan Prodromou [Wed, 7 Apr 2010 14:43:14 +0000 (10:43 -0400)]
show PEAR_Error message, not the object
Brion Vibber [Tue, 6 Apr 2010 23:32:04 +0000 (23:32 +0000)]
Handle attempt to subscribe a local user via their remote webfinger reference more gracefully.
The ensure* family of functions will now return an OStatusShadowException in this case, which gives us a pleasant error message instead of a giant exception backtrace when you do 'sub somebody@this.local.server'.
Can be extended later to allow actually using the local profile, since we could figure it out.
Brion Vibber [Tue, 6 Apr 2010 23:32:04 +0000 (23:32 +0000)]
Handle attempt to subscribe a local user via their remote webfinger reference more gracefully.
The ensure* family of functions will now return an OStatusShadowException in this case, which gives us a pleasant error message instead of a giant exception backtrace when you do 'sub somebody@this.local.server'.
Can be extended later to allow actually using the local profile, since we could figure it out.
Siebrand Mazeland [Tue, 6 Apr 2010 23:14:31 +0000 (01:14 +0200)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans
* add Afrikaans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Siebrand Mazeland [Tue, 6 Apr 2010 22:57:55 +0000 (00:57 +0200)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Siebrand Mazeland [Tue, 6 Apr 2010 22:46:03 +0000 (00:46 +0200)]
Follow-up
3ac3bc32fc48508deab171019e3539ece9bd72ff: change po to pot so that exporting from translatewiki.net works.
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Brion Vibber [Tue, 6 Apr 2010 22:22:23 +0000 (15:22 -0700)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Tue, 6 Apr 2010 22:19:10 +0000 (15:19 -0700)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Brion Vibber [Tue, 6 Apr 2010 22:14:28 +0000 (15:14 -0700)]
Set a default 2-second timeout on Geonames web service lookups. After a failure, further lookups in the same process will be skipped for the next 60 seconds (also configurable).
Makes a Geonames outage much less disruptive to site operations.
Brion Vibber [Tue, 6 Apr 2010 21:36:21 +0000 (14:36 -0700)]
Merge branch 'master' into testing
Brion Vibber [Tue, 6 Apr 2010 21:07:46 +0000 (14:07 -0700)]
Allow Meteor plugin to be configurable via configuration database or file.
As there's no admin control panel yet, this is mainly meant for batch administration and using setconfig.php
Brion Vibber [Tue, 6 Apr 2010 19:21:42 +0000 (12:21 -0700)]
Add a User-Agent fragment blacklist to MobileProfile: sticking iPad on the regular theme, which works better on its larger screen (was tripped on 'mobile' in the UA though we had no explicit check for 'ipad' previously)
Brion Vibber [Tue, 6 Apr 2010 19:13:54 +0000 (12:13 -0700)]
Comment out unreachable code spewing notices due to use of undefined variables in MobileProfile.
This needs some cleanup...
Brion Vibber [Mon, 5 Apr 2010 20:19:16 +0000 (13:19 -0700)]
Some localization cleanup and doc to aid in customization:
* added locale/en/LC_MESSAGES/statusnet.po to make it easier to start customizing English texts
* added notes to locale/README about customizing and how to disable languages you haven't customized
* renamed PO templates from *.po to *.pot to match general conventions and reduce confusion for people trying to find which file they're supposed to edit
Siebrand Mazeland [Mon, 5 Apr 2010 19:00:16 +0000 (21:00 +0200)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Siebrand Mazeland [Mon, 5 Apr 2010 18:53:53 +0000 (20:53 +0200)]
* move TRANS comment from
ea99855b350b326f81bda0ea42be6dff8919b527 down to right before the line with the message, otherwise gettext does not pick it up.
* add another TRANS comment
Zach Copley [Mon, 5 Apr 2010 18:31:41 +0000 (11:31 -0700)]
The translators were having trouble with the wording of the subtitle
for the list of groups a user is a member of. I've changed the
wording and added a // TRANS: comment to hopefully make it more
clear.
Brion Vibber [Mon, 5 Apr 2010 18:20:35 +0000 (11:20 -0700)]
Clean up and clarify output on fix-shadow.php
Brion Vibber [Mon, 5 Apr 2010 18:20:35 +0000 (11:20 -0700)]
Clean up and clarify output on fix-shadow.php
Brion Vibber [Mon, 5 Apr 2010 17:42:41 +0000 (10:42 -0700)]
Merge branch 'master' into testing
Siebrand Mazeland [Mon, 5 Apr 2010 15:20:25 +0000 (17:20 +0200)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Evan Prodromou [Mon, 5 Apr 2010 15:18:03 +0000 (11:18 -0400)]
use nofollow for subscribers list
Evan Prodromou [Mon, 5 Apr 2010 15:17:51 +0000 (11:17 -0400)]
use nofollow for group members list
Evan Prodromou [Mon, 5 Apr 2010 15:17:36 +0000 (11:17 -0400)]
use homepage link attributes method for peopletaglist
Evan Prodromou [Mon, 5 Apr 2010 15:17:06 +0000 (11:17 -0400)]
make profilelist homepage link attributes overrideable
Evan Prodromou [Mon, 5 Apr 2010 15:04:47 +0000 (11:04 -0400)]
Merge branch 'nofollow'
Evan Prodromou [Mon, 5 Apr 2010 15:03:14 +0000 (11:03 -0400)]
nofollow for peopletag pages
Evan Prodromou [Mon, 5 Apr 2010 14:47:07 +0000 (10:47 -0400)]
override linkAttributes() method for groupmembersminilist
Evan Prodromou [Mon, 5 Apr 2010 14:46:55 +0000 (10:46 -0400)]
override linkAttributes() method for subscribersminilist
Evan Prodromou [Mon, 5 Apr 2010 14:46:38 +0000 (10:46 -0400)]
override linkAttributes() method for profileminilist
Evan Prodromou [Mon, 5 Apr 2010 14:46:26 +0000 (10:46 -0400)]
add linkAttributes() method for profilelist
Evan Prodromou [Mon, 5 Apr 2010 14:24:22 +0000 (10:24 -0400)]
lib/default.php has nofollow group
Evan Prodromou [Mon, 5 Apr 2010 14:22:54 +0000 (10:22 -0400)]
breakout subscribers minilist
Evan Prodromou [Mon, 5 Apr 2010 14:14:45 +0000 (10:14 -0400)]
balance brackets on profileminilist
Evan Prodromou [Mon, 5 Apr 2010 14:12:40 +0000 (10:12 -0400)]
add an event for subscribers minilist
Evan Prodromou [Mon, 5 Apr 2010 14:12:27 +0000 (10:12 -0400)]
add an event for group members minilist
Brion Vibber [Sat, 3 Apr 2010 17:26:43 +0000 (10:26 -0700)]
Ticket #2272: Block confirmation form should let enter trigger the 'yes' button
Setting focus into the form to make it easier to submit by keyboard. Enter or space will now trigger the button right off without having to mouse around to find the button after we've clicked into the conf form, and keyboarders can also get to the 'no' button more easily.
Brion Vibber [Sat, 3 Apr 2010 17:26:43 +0000 (10:26 -0700)]
Ticket #2272: Block confirmation form should let enter trigger the 'yes' button
Setting focus into the form to make it easier to submit by keyboard. Enter or space will now trigger the button right off without having to mouse around to find the button after we've clicked into the conf form, and keyboarders can also get to the 'no' button more easily.
Brion Vibber [Sat, 3 Apr 2010 17:15:03 +0000 (10:15 -0700)]
Merge branch '0.9.x' into 1.0.x
Brion Vibber [Sat, 3 Apr 2010 17:14:03 +0000 (10:14 -0700)]
Merge branch 'testing' into 0.9.x
Brion Vibber [Sat, 3 Apr 2010 17:08:13 +0000 (10:08 -0700)]
Ticket #2273: Fix bookmarklet with URls with special characters
The tartget page's URL was not being URL-escaped when passed as a parameter into the query string. Result was that any URL-encoded bytes in the link would be unescaped and interpreted as raw UTF-8 when our bookmarklet post target page reads its parameters; this would break 8-bit high characters (eg a Latin-1 %FC turning into a corrupt UTF-8 byte) or reserved chars that needed to be kept escaped (eg a %3F turning into literal ?)
Unfortunately as this was a bug in the original bookmarklet's JS code, this'll only fix it for people who grab a fresh copy of the bookmarklet.
Brion Vibber [Sat, 3 Apr 2010 17:08:13 +0000 (10:08 -0700)]
Ticket #2273: Fix bookmarklet with URls with special characters
The tartget page's URL was not being URL-escaped when passed as a parameter into the query string. Result was that any URL-encoded bytes in the link would be unescaped and interpreted as raw UTF-8 when our bookmarklet post target page reads its parameters; this would break 8-bit high characters (eg a Latin-1 %FC turning into a corrupt UTF-8 byte) or reserved chars that needed to be kept escaped (eg a %3F turning into literal ?)
Unfortunately as this was a bug in the original bookmarklet's JS code, this'll only fix it for people who grab a fresh copy of the bookmarklet.
Siebrand Mazeland [Sat, 3 Apr 2010 13:32:12 +0000 (15:32 +0200)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
Brion Vibber [Fri, 2 Apr 2010 22:56:25 +0000 (15:56 -0700)]
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
Brion Vibber [Fri, 2 Apr 2010 22:48:39 +0000 (15:48 -0700)]
Merge branch 'testing' into 0.9.x
Brion Vibber [Fri, 2 Apr 2010 22:48:17 +0000 (15:48 -0700)]
Merge branch 'master' into testing
Brion Vibber [Fri, 2 Apr 2010 22:45:03 +0000 (15:45 -0700)]
Don't save duplicate messages into a user's packed inbox. We've already got the packed box loaded at insert time, so we can simply unpack it and check before doing the update query.
Should help with dupes that come in when inbox distrib jobs die and get restarted, etc.
Conflicts:
classes/Inbox.php
Looks like this was implemented on master recently and not copied up to testing. Merging to my version on testing as I've added some doc comments and extracted a couple functions for future ease of use.
Brion Vibber [Fri, 2 Apr 2010 22:39:43 +0000 (15:39 -0700)]
Don't save duplicate messages into a user's packed inbox. We've already got the packed box loaded at insert time, so we can simply unpack it and check before doing the update query.
Should help with dupes that come in when inbox distrib jobs die and get restarted, etc.
Brion Vibber [Fri, 2 Apr 2010 16:32:03 +0000 (09:32 -0700)]
Ticket 2271: extra whitespace in underlined link for username in notice lists
Switching to a raw() output for the <span> of the nickname removes the extra whitespace and fixes display.
Brion Vibber [Fri, 2 Apr 2010 16:32:03 +0000 (09:32 -0700)]
Ticket 2271: extra whitespace in underlined link for username in notice lists
Switching to a raw() output for the <span> of the nickname removes the extra whitespace and fixes display.
Evan Prodromou [Thu, 1 Apr 2010 19:53:17 +0000 (15:53 -0400)]
ProfileMiniListItem does same events as ProfileListItem
Brion Vibber [Thu, 1 Apr 2010 18:09:45 +0000 (11:09 -0700)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Thu, 1 Apr 2010 17:15:40 +0000 (10:15 -0700)]
Temporary hack until notice_profile_id_idx is updated
to (profile_id, id) instead of (profile_id, created, id).
It's been falling back to PRIMARY instead, which is really
very inefficient for a profile that hasn't posted in a few
months. Even though forcing the index will cause a filesort,
it's usually going to be better. Even for large profiles it
seems much faster than the badly-indexed query.
Brion Vibber [Thu, 1 Apr 2010 17:15:40 +0000 (10:15 -0700)]
Temporary hack until notice_profile_id_idx is updated
to (profile_id, id) instead of (profile_id, created, id).
It's been falling back to PRIMARY instead, which is really
very inefficient for a profile that hasn't posted in a few
months. Even though forcing the index will cause a filesort,
it's usually going to be better. Even for large profiles it
seems much faster than the badly-indexed query.
Evan Prodromou [Thu, 1 Apr 2010 16:58:06 +0000 (12:58 -0400)]
Revert "Revert "if user allows location sharing but turned off browser location use profile location""
This reverts commit
8b24ad8a9c681585e95612084eb629df8b364b74.
Evan Prodromou [Thu, 1 Apr 2010 16:57:52 +0000 (12:57 -0400)]
Revert "Revert "don't insert the same notice twice into an inbox""
This reverts commit
a09b27ff41df41a86fdb0abae14239907d5ee6ec.
Evan Prodromou [Thu, 1 Apr 2010 16:52:26 +0000 (12:52 -0400)]
Revert "don't insert the same notice twice into an inbox"
This reverts commit
650074c648d98f81674c6e2b0ebf052c473ada6e.
Evan Prodromou [Thu, 1 Apr 2010 16:52:12 +0000 (12:52 -0400)]
Revert "if user allows location sharing but turned off browser location use profile location"
This reverts commit
4b80ce0be89fe50eabec1a19dbf4a0c26a413423.
Evan Prodromou [Thu, 1 Apr 2010 16:09:33 +0000 (12:09 -0400)]
if user allows location sharing but turned off browser location use profile location
Craig Andrews [Thu, 1 Apr 2010 03:18:40 +0000 (23:18 -0400)]
add missing semicolon
Evan Prodromou [Wed, 31 Mar 2010 19:54:35 +0000 (15:54 -0400)]
don't insert the same notice twice into an inbox
Brion Vibber [Wed, 31 Mar 2010 19:48:24 +0000 (12:48 -0700)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Wed, 31 Mar 2010 19:47:42 +0000 (12:47 -0700)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Wed, 31 Mar 2010 19:20:16 +0000 (15:20 -0400)]
use Subscription::cancel() to cancel all subscriptions on block
Evan Prodromou [Wed, 31 Mar 2010 19:02:19 +0000 (15:02 -0400)]
do complete unsubscribe process when deleting a user
Sarven Capadisli [Wed, 31 Mar 2010 09:00:22 +0000 (11:00 +0200)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Wed, 31 Mar 2010 08:57:20 +0000 (10:57 +0200)]
Revert "Multiple file upload handling."
This reverts commit
260f00d60bc83ac641d6fbe465e70aec33ccd9be.
As mentioned in
http://gitorious.org/statusnet/mainline/commit/
260f00d60bc83ac641d6fbe465e70aec33ccd9be#comment_8367
Reverting this merge until the bugs are fixed and there is a general
agreement on the need for this enhancement.
Brion Vibber [Wed, 31 Mar 2010 00:35:27 +0000 (17:35 -0700)]
Ticket #1281: JID validation now more or less follows spec instead of calling e-mail validator
Basic splitting/validation code submitted via http://status.net/wiki/XMPP/JID_validation -- Copyright 2009 Patrick Georgi <patrick@georgi-clan.de> Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
Added PEAR Net_IDNA package to extlib to handle IDN normalization (also used by Validate's email verifier if present).
* added test suite, supplemented my own test cases with JID validation and normalization test cases from libpurple
* follows XMPP rules for validation of name part
* fixes for normalization with non-ASCII names
* will do domain checks if $config['email']['check_domain'] is on, checking for an XMPP-server SRV record or any lookup. (We don't actually need to ping those direct though.)
* some more obscure stringprep validation rules aren't quite followed yet, but we err on the side of permissiveness.
* we still don't actually let you save your address with a resource on it, as we strip resources when looking up users who've sent us presence or message updates. I would recommend saving the outgoing resource as a separate field if/when we add that..?
Brion Vibber [Tue, 30 Mar 2010 19:19:25 +0000 (12:19 -0700)]
Shared cache key option for Geonames plugin, lets multi-instance sites share their cached geoname lookups.
Example:
unset($config['plugins']['default']['Geonames']);
addPlugin('Geonames', array('cachePrefix' => 'statusnet:shared'));
Brion Vibber [Tue, 30 Mar 2010 19:19:25 +0000 (12:19 -0700)]
Shared cache key option for Geonames plugin, lets multi-instance sites share their cached geoname lookups.
Example:
unset($config['plugins']['default']['Geonames']);
addPlugin('Geonames', array('cachePrefix' => 'statusnet:shared'));
Brion Vibber [Tue, 30 Mar 2010 18:57:31 +0000 (11:57 -0700)]
Update call for renamed OStatus functions -- installer now no longer fails with a PHP fatal error when trying to set up the subscription to update@status.net.
Zach Copley [Sat, 27 Mar 2010 23:36:04 +0000 (23:36 +0000)]
Some fixes to make the twitterstatusfetcher behave better in a multi-site configuration
Brion Vibber [Tue, 30 Mar 2010 18:47:23 +0000 (11:47 -0700)]
Fix for error output on invalid user ID to api groups list
Brion Vibber [Tue, 30 Mar 2010 18:47:23 +0000 (11:47 -0700)]
Fix for error output on invalid user ID to api groups list
Brion Vibber [Tue, 30 Mar 2010 18:44:13 +0000 (11:44 -0700)]
Fixes for apigrouplist - notice spew from undefined var, notice spew from missing escape in sprintf format
Brion Vibber [Tue, 30 Mar 2010 18:07:01 +0000 (11:07 -0700)]
Quick fixes for grouplistall:
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
Brion Vibber [Tue, 30 Mar 2010 18:44:13 +0000 (11:44 -0700)]
Fixes for apigrouplist - notice spew from undefined var, notice spew from missing escape in sprintf format
Brion Vibber [Tue, 30 Mar 2010 18:07:01 +0000 (11:07 -0700)]
Quick fixes for grouplistall:
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
Brion Vibber [Tue, 30 Mar 2010 00:53:31 +0000 (17:53 -0700)]
Fix to profile location in FOAF output: longitude was repeating the latitude by mistake
Brion Vibber [Tue, 30 Mar 2010 00:53:31 +0000 (17:53 -0700)]
Fix to profile location in FOAF output: longitude was repeating the latitude by mistake
Brion Vibber [Mon, 29 Mar 2010 23:27:50 +0000 (16:27 -0700)]
Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8.
Brion Vibber [Mon, 29 Mar 2010 23:27:50 +0000 (16:27 -0700)]
Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8.
Brion Vibber [Mon, 29 Mar 2010 22:46:41 +0000 (15:46 -0700)]
Tweak to Eugene Crosser's patch to make transactions and acks configurable; disabling them gets basic message delivery working under MorbidQ, and may help with RabbitMQ etc.
I swapped the settings from negative to positive ($config['queue']['stomp_transactions'] = false rather than $config['queue']['stomp_no_transactions'] = true), gave them defaults (both on for best ActiveMQ experience), and added notes to the README about configuring them.
Eugene Crosser [Mon, 29 Mar 2010 11:25:57 +0000 (15:25 +0400)]
Make stomp queue manager work with basic servers
Signed-off-by: Eugene Crosser <crosser@average.org>
Brion Vibber [Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)]
Merge branch '0.9.x' into 1.0.x
Brion Vibber [Mon, 29 Mar 2010 22:15:41 +0000 (15:15 -0700)]
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Brion Vibber [Mon, 29 Mar 2010 22:15:11 +0000 (15:15 -0700)]
Merge branch 'testing' into 0.9.x
Brion Vibber [Mon, 29 Mar 2010 22:14:25 +0000 (15:14 -0700)]
Merge branch 'master' into testing
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
Brion Vibber [Mon, 29 Mar 2010 22:07:15 +0000 (15:07 -0700)]
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.
Brion Vibber [Mon, 29 Mar 2010 19:57:16 +0000 (12:57 -0700)]
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 ....
Zach Copley [Mon, 29 Mar 2010 00:00:33 +0000 (17:00 -0700)]
RSSCloudPlugin's onRouterInitialized() should expect pass by value instead of reference
Sarven Capadisli [Sun, 28 Mar 2010 21:50:25 +0000 (23:50 +0200)]
Revert "Remove console debug line"
This reverts commit
06ffb8bf02b4c05f8eccd14a9ec2ddbba7ae21c5.
Sarven Capadisli [Sun, 28 Mar 2010 21:49:10 +0000 (23:49 +0200)]
Remove console debug line
Brion Vibber [Sun, 28 Mar 2010 21:41:31 +0000 (14:41 -0700)]
Remove debug line that crept into a commit a while back, breaking realtime when Firebug wasn't present