]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoRequire users to login to view attachments on private sites
Craig Andrews [Tue, 5 Jan 2010 22:47:37 +0000 (17:47 -0500)]
Require users to login to view attachments on private sites

Thank you jeff-themovie for this implementation!

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Tue, 5 Jan 2010 22:21:35 +0000 (23:21 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMove Authorization and Authentication plugin structures into core, instead of as...
Craig Andrews [Tue, 5 Jan 2010 18:56:22 +0000 (13:56 -0500)]
Move Authorization and Authentication plugin structures into core, instead of as plugins.

This move makes sense as you can addPlugin('Authentication') for example - these are abstract classes designed to be implemented, not used directly.

14 years agoFix auth plugin autoregistration issue.
Craig Andrews [Tue, 5 Jan 2010 18:42:15 +0000 (13:42 -0500)]
Fix auth plugin autoregistration issue.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Tue, 5 Jan 2010 17:55:57 +0000 (17:55 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoAdded adminprofileflag padding for Cloudy
Sarven Capadisli [Tue, 5 Jan 2010 17:54:51 +0000 (17:54 +0000)]
Added adminprofileflag padding for Cloudy

14 years agoTypo fix in the new default in-process cache; spewed notice warnings on deletion...
Brion Vibber [Tue, 5 Jan 2010 17:54:43 +0000 (09:54 -0800)]
Typo fix in the new default in-process cache; spewed notice warnings on deletion, breaking XHR responses.

14 years agoAdmin panel layout for Cloudy
Sarven Capadisli [Tue, 5 Jan 2010 17:51:29 +0000 (17:51 +0000)]
Admin panel layout for Cloudy

14 years agoRest of layout styles for Cloudy.
Sarven Capadisli [Tue, 5 Jan 2010 17:38:59 +0000 (17:38 +0000)]
Rest of layout styles for Cloudy.

14 years agoMore updates to Cloudy theme layout
Sarven Capadisli [Tue, 5 Jan 2010 17:06:12 +0000 (18:06 +0100)]
More updates to Cloudy theme layout

14 years agoUpdated Cloudy theme
Sarven Capadisli [Tue, 5 Jan 2010 16:49:30 +0000 (17:49 +0100)]
Updated Cloudy theme

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Tue, 5 Jan 2010 08:50:04 +0000 (22:50 -1000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
classes/Memcached_DataObject.php

14 years agofree some memory in createsim.php
Evan Prodromou [Tue, 5 Jan 2010 08:49:09 +0000 (22:49 -1000)]
free some memory in createsim.php

14 years agoUpdated default theme for geo
Sarven Capadisli [Tue, 5 Jan 2010 02:07:26 +0000 (03:07 +0100)]
Updated default theme for geo

14 years agoReuse cookie location_enabled before .change()
Sarven Capadisli [Tue, 5 Jan 2010 01:31:34 +0000 (01:31 +0000)]
Reuse cookie location_enabled before .change()

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Tue, 5 Jan 2010 01:16:48 +0000 (01:16 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoRetain the geo data when FormNoticeXHR is complete because form gets
Sarven Capadisli [Tue, 5 Jan 2010 01:15:08 +0000 (01:15 +0000)]
Retain the geo data when FormNoticeXHR is complete because form gets
reset

14 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Tue, 5 Jan 2010 01:14:54 +0000 (15:14 -1000)]
Merge branch 'master' into 0.9.x

Conflicts:
actions/publictagcloud.php
classes/Memcached_DataObject.php

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline
Evan Prodromou [Tue, 5 Jan 2010 01:11:04 +0000 (15:11 -1000)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline

14 years agoMerge branch 'batchlocation'
Evan Prodromou [Tue, 5 Jan 2010 01:10:43 +0000 (15:10 -1000)]
Merge branch 'batchlocation'

14 years agoRemove input geo data as well
Sarven Capadisli [Tue, 5 Jan 2010 00:37:53 +0000 (00:37 +0000)]
Remove input geo data as well

14 years agoIf user checked shared location but didn't enter their location, don't
Sarven Capadisli [Tue, 5 Jan 2010 00:15:26 +0000 (00:15 +0000)]
If user checked shared location but didn't enter their location, don't
show the checkbox

14 years agoRefactored NoticeLocationAttach(). It works better in UAs that don't
Sarven Capadisli [Mon, 4 Jan 2010 23:36:22 +0000 (23:36 +0000)]
Refactored NoticeLocationAttach(). It works better in UAs that don't
support Geolocation API.

14 years agoExclude process-specific link & result cache references from serialized Memcached_Dat...
Brion Vibber [Mon, 4 Jan 2010 22:38:56 +0000 (14:38 -0800)]
Exclude process-specific link & result cache references from serialized Memcached_Data_Object instances.
Should fix seemingly-random bugs due to destructor free()ing local resources by mistake.

cherry-pick from 0.9.x

14 years agoRevert "Take Memcached_DataObject destructor back out to check whether it might be...
Brion Vibber [Mon, 4 Jan 2010 22:37:39 +0000 (14:37 -0800)]
Revert "Take Memcached_DataObject destructor back out to check whether it might be causing some under-the-hood problems."

This reverts commit 89cca01259d71f3da961ef64def3647f86a01567.

14 years agoExclude process-specific link & result cache references from serialized Memcached_Dat...
Brion Vibber [Mon, 4 Jan 2010 22:24:16 +0000 (14:24 -0800)]
Exclude process-specific link & result cache references from serialized Memcached_Data_Object instances.
Should fix seemingly-random bugs due to destructor free()ing local resources by mistake.

14 years agoMerge branch 'locshunt2' into 0.9.x
Evan Prodromou [Mon, 4 Jan 2010 21:59:56 +0000 (11:59 -1000)]
Merge branch 'locshunt2' into 0.9.x

14 years agouser_id is a non-autoincrement pkey for user_location_prefs
Evan Prodromou [Mon, 4 Jan 2010 18:53:28 +0000 (08:53 -1000)]
user_id is a non-autoincrement pkey for user_location_prefs

14 years agodrop debug statement
Brion Vibber [Mon, 4 Jan 2010 21:02:41 +0000 (13:02 -0800)]
drop debug statement

14 years agoTicket 2141: bugs with weighted popularity lists across year boundary.
Brion Vibber [Mon, 4 Jan 2010 21:01:17 +0000 (13:01 -0800)]
Ticket 2141: bugs with weighted popularity lists across year boundary.

Consolidated several separate implementations of the same weighting algorithm into common_sql_weight() and fixed some bugs...
For MySQL, now using timestampdiff() instead of subtraction for the comparison, so we get sane results when the year doesn't match, and utc_timestamp() rather than now() so we don't get negative ages for recent items with local server timezone.
Unknown whether the same problems affect PostgreSQL, but note that it lacks the timestampdiff() SQL function.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 4 Jan 2010 20:55:21 +0000 (10:55 -1000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoXCachePlugin returns false value for cache miss
Evan Prodromou [Mon, 4 Jan 2010 20:12:19 +0000 (10:12 -1000)]
XCachePlugin returns false value for cache miss

14 years agocached id streams can be empty, compare against false
Evan Prodromou [Mon, 4 Jan 2010 20:03:57 +0000 (10:03 -1000)]
cached id streams can be empty, compare against false

14 years agocarefully compare cached settings against false for Config
Evan Prodromou [Mon, 4 Jan 2010 20:02:59 +0000 (10:02 -1000)]
carefully compare cached settings against false for Config

14 years agoMerge branch '2141' into 0.9.x
Brion Vibber [Mon, 4 Jan 2010 20:02:45 +0000 (12:02 -0800)]
Merge branch '2141' into 0.9.x

14 years agoMemcached_DataObject stores empty values in the cache
Evan Prodromou [Mon, 4 Jan 2010 20:00:17 +0000 (10:00 -1000)]
Memcached_DataObject stores empty values in the cache

There's great value in knowing that something doesn't exist. We
now cache this information, and carefully compare the results from
cache as $results !== false instead of !empty($results), since some
empty values (null, 0, empty array, empty string) are stored in the
cache.

Caching staticGet() and pkeyGet() now store DB misses in the cache,
and cachedQuery() checks for empty results from the cache.

14 years agodefault value for cache::get() changed from null to false
Evan Prodromou [Mon, 4 Jan 2010 19:59:47 +0000 (09:59 -1000)]
default value for cache::get() changed from null to false

14 years agoDifferentiate between empty values and cache misses in CacheLogPlugin
Evan Prodromou [Mon, 4 Jan 2010 19:57:48 +0000 (09:57 -1000)]
Differentiate between empty values and cache misses in CacheLogPlugin

14 years agoTicket 2141: bugs with weighted popularity lists across year boundary.
Brion Vibber [Mon, 4 Jan 2010 19:55:27 +0000 (11:55 -0800)]
Ticket 2141: bugs with weighted popularity lists across year boundary.

Consolidated several separate implementations of the same weighting algorithm into common_sql_weight() and fixed some bugs...
For MySQL, now using timestampdiff() instead of subtraction for the comparison, so we get sane results when the year doesn't match, and utc_timestamp() rather than now() so we don't get negative ages for recent items with local server timezone.
Unknown whether the same problems affect PostgreSQL, but note that it lacks the timestampdiff() SQL function.

14 years agoAdd 'takeOverLogin' parameter for a real SSO feel
Craig Andrews [Mon, 4 Jan 2010 19:43:05 +0000 (14:43 -0500)]
Add 'takeOverLogin' parameter for a real SSO feel

14 years agomake compression threshold and min savings config attrs for MemcachePlugin
Evan Prodromou [Mon, 4 Jan 2010 19:09:59 +0000 (09:09 -1000)]
make compression threshold and min savings config attrs for MemcachePlugin

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 4 Jan 2010 19:01:23 +0000 (09:01 -1000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoStop caching unfindable keys
Evan Prodromou [Mon, 4 Jan 2010 18:59:19 +0000 (08:59 -1000)]
Stop caching unfindable keys

There were some problems with the automated cache/uncache system
for data objects that made us cache unfindable keys (with null
attributes and sometimes null names). Fixed those problems and
refactored the encache() and decache() methods so they use a helper
to find the cache keys to use.

14 years agouser_id is a non-autoincrement pkey for user_location_prefs
Evan Prodromou [Mon, 4 Jan 2010 18:53:28 +0000 (08:53 -1000)]
user_id is a non-autoincrement pkey for user_location_prefs

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Mon, 4 Jan 2010 18:43:45 +0000 (10:43 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoDrop the overly-prominent link to checklibs display; it's unnecessary and just confus...
Brion Vibber [Mon, 4 Jan 2010 18:41:52 +0000 (10:41 -0800)]
Drop the overly-prominent link to checklibs display; it's unnecessary and just confuses people.
The ability's still there to aid in debugging, but it won't be tempting people to click on it.

14 years agoDon't spew notices when building tag cloud if there is no popularity sum to divide by.
Brion Vibber [Mon, 4 Jan 2010 18:39:11 +0000 (10:39 -0800)]
Don't spew notices when building tag cloud if there is no popularity sum to divide by.

14 years agoAllow an authentication plugin with the same provider_name other than the one that...
Craig Andrews [Mon, 4 Jan 2010 18:33:52 +0000 (13:33 -0500)]
Allow an authentication plugin with the same provider_name other than the one that actually checked the password to autoregister a user

Allows for SSO-type plugins that don't have any information about the user other than their username to do autoregistration

14 years agoFix for auto_increment parameter in auto-created tables via checkschema.
Brion Vibber [Mon, 4 Jan 2010 18:30:19 +0000 (10:30 -0800)]
Fix for auto_increment parameter in auto-created tables via checkschema.
Update FeedSub plugin for non-Plugin_DataObject setup and working checkschema updates.

14 years agoEnable memcache automatic compression, starting at 20k and only if compression gain...
Craig Andrews [Mon, 4 Jan 2010 17:49:25 +0000 (12:49 -0500)]
Enable memcache automatic compression, starting at 20k and only if compression gain is greater than 20%.

Allows storage of larger objects (over 1mb in size uncompressed), such as huge LDAP schemas.
Should also improve cache efficiency (allows more stuff to be stored in same memory) and reduce network latency (less data transfer)

(redo commit 1e9c03e1993b5d2978ac4c5213a8a64e0150b4a2 which was apparently lost during pluginization)

14 years agoRan NoticeLocationAttach() through jslint
Sarven Capadisli [Mon, 4 Jan 2010 13:44:32 +0000 (13:44 +0000)]
Ran NoticeLocationAttach() through jslint

14 years agoRemoved unneeded line-height
Sarven Capadisli [Mon, 4 Jan 2010 13:30:07 +0000 (13:30 +0000)]
Removed unneeded line-height

14 years agoRemoved comma
Sarven Capadisli [Mon, 4 Jan 2010 13:28:42 +0000 (13:28 +0000)]
Removed comma

14 years agoRelocated @title removal
Sarven Capadisli [Mon, 4 Jan 2010 12:44:48 +0000 (12:44 +0000)]
Relocated @title removal

14 years agoUpdated element id for notice_data-geo
Sarven Capadisli [Mon, 4 Jan 2010 12:43:56 +0000 (12:43 +0000)]
Updated element id for notice_data-geo

14 years agoRefactored geo location removal to removeNoticeDataGeo()
Sarven Capadisli [Mon, 4 Jan 2010 10:07:32 +0000 (10:07 +0000)]
Refactored geo location removal to removeNoticeDataGeo()

14 years agoAdded errorCallback() to geoCurrentPosition() i.e., if user doesn't
Sarven Capadisli [Mon, 4 Jan 2010 09:52:35 +0000 (09:52 +0000)]
Added errorCallback() to geoCurrentPosition() i.e., if user doesn't
grant permission, removes the Geo processing and (if any) existing geo
location data from notice form.

14 years agoTrim whitespace from label's textContent
Sarven Capadisli [Mon, 4 Jan 2010 09:29:41 +0000 (09:29 +0000)]
Trim whitespace from label's textContent

14 years agoUsing object value instead of inline string
Sarven Capadisli [Mon, 4 Jan 2010 09:14:14 +0000 (09:14 +0000)]
Using object value instead of inline string

14 years agoOpen geoname URL in a new window
Sarven Capadisli [Mon, 4 Jan 2010 09:10:21 +0000 (09:10 +0000)]
Open geoname URL in a new window

14 years agoRemove logging from default cache
Evan Prodromou [Sun, 3 Jan 2010 21:28:15 +0000 (11:28 -1000)]
Remove logging from default cache

14 years agoDebug utility to log cache access
Evan Prodromou [Sun, 3 Jan 2010 21:28:00 +0000 (11:28 -1000)]
Debug utility to log cache access

14 years agodon't try to set an expiry for XCache
Evan Prodromou [Sun, 3 Jan 2010 21:27:36 +0000 (11:27 -1000)]
don't try to set an expiry for XCache

14 years agoadd keyTypes() for User_greeting_count
Evan Prodromou [Sun, 3 Jan 2010 21:27:09 +0000 (11:27 -1000)]
add keyTypes() for User_greeting_count

14 years agoRevert "use keys() instead of keyTypes() so plugin data object work"
Evan Prodromou [Sun, 3 Jan 2010 21:24:05 +0000 (11:24 -1000)]
Revert "use keys() instead of keyTypes() so plugin data object work"

This reverts commit ec380887f71a1eadc75bad0289f9a0dbee7f2913.

14 years agoupdate SamplePlugin.php also
Evan Prodromou [Sun, 3 Jan 2010 21:18:26 +0000 (11:18 -1000)]
update SamplePlugin.php also

14 years agoExpand SamplePlugin to show other best practices
Evan Prodromou [Sun, 3 Jan 2010 21:02:36 +0000 (11:02 -1000)]
Expand SamplePlugin to show other best practices

I modified the SamplePlugin to show how to do some real processing,
adding a data class and an action class and modifying the main
menu to link to the new action. I added documentation comments to
all the methods and made sure the modules were PHPCS-clean.

14 years agouse keys() instead of keyTypes() so plugin data object work
Evan Prodromou [Sun, 3 Jan 2010 20:52:24 +0000 (10:52 -1000)]
use keys() instead of keyTypes() so plugin data object work

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Sun, 3 Jan 2010 16:38:55 +0000 (06:38 -1000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoFirst version of cache plugin for XCache variable cache
Evan Prodromou [Sun, 3 Jan 2010 16:38:15 +0000 (06:38 -1000)]
First version of cache plugin for XCache variable cache

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Sun, 3 Jan 2010 10:48:21 +0000 (11:48 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoadd LGPL
Evan Prodromou [Sun, 3 Jan 2010 08:46:50 +0000 (22:46 -1000)]
add LGPL

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Sun, 3 Jan 2010 07:35:46 +0000 (21:35 -1000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoAdd a caching plugin for APC variable cache
Evan Prodromou [Sun, 3 Jan 2010 07:34:15 +0000 (21:34 -1000)]
Add a caching plugin for APC variable cache

14 years agoFirst version of Memcache plugin
Evan Prodromou [Sun, 3 Jan 2010 07:16:59 +0000 (21:16 -1000)]
First version of Memcache plugin

14 years agoMake cache.php PHPCS-clean
Evan Prodromou [Sun, 3 Jan 2010 07:00:42 +0000 (21:00 -1000)]
Make cache.php PHPCS-clean

14 years agoinvert if for cache handling
Evan Prodromou [Sun, 3 Jan 2010 06:37:30 +0000 (20:37 -1000)]
invert if for cache handling

14 years agofix default array implementation checks
Evan Prodromou [Sun, 3 Jan 2010 06:32:56 +0000 (20:32 -1000)]
fix default array implementation checks

14 years agoMake caching a plugin system
Evan Prodromou [Sun, 3 Jan 2010 06:26:33 +0000 (20:26 -1000)]
Make caching a plugin system

14 years agoMerge branch '0.9.x' into cacheplugin
Evan Prodromou [Sun, 3 Jan 2010 05:47:56 +0000 (19:47 -1000)]
Merge branch '0.9.x' into cacheplugin

14 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Sun, 3 Jan 2010 05:47:34 +0000 (19:47 -1000)]
Merge branch 'master' into 0.9.x

Conflicts:
classes/Memcached_DataObject.php

14 years agoreturn false from Memcached_DataObject::staticGet() on not found, like DB_DataObject
Evan Prodromou [Sun, 3 Jan 2010 02:28:46 +0000 (16:28 -1000)]
return false from Memcached_DataObject::staticGet() on not found, like DB_DataObject

14 years agofixup memcache functions
Evan Prodromou [Sun, 3 Jan 2010 02:27:04 +0000 (16:27 -1000)]
fixup memcache functions

14 years agochange harmless check of to check of in Memcached_DataObject
Evan Prodromou [Sun, 3 Jan 2010 02:21:19 +0000 (16:21 -1000)]
change harmless check of  to check of  in Memcached_DataObject

14 years agoFix end tag
Sarven Capadisli [Sun, 3 Jan 2010 02:07:55 +0000 (02:07 +0000)]
Fix end tag

14 years agoButton should return false
Sarven Capadisli [Sun, 3 Jan 2010 02:00:12 +0000 (02:00 +0000)]
Button should return false

14 years agoMoved location container's buttons inside enabled state
Sarven Capadisli [Sun, 3 Jan 2010 01:48:41 +0000 (01:48 +0000)]
Moved location container's buttons inside enabled state

14 years agoReset location icon when container button.close is clicked
Sarven Capadisli [Sun, 3 Jan 2010 01:17:51 +0000 (01:17 +0000)]
Reset location icon when container button.close is clicked

14 years agoUpdated pin icon
Sarven Capadisli [Sun, 3 Jan 2010 01:13:42 +0000 (01:13 +0000)]
Updated pin icon

14 years agoAdded minimize functionality to selected location container
Sarven Capadisli [Sun, 3 Jan 2010 01:02:32 +0000 (01:02 +0000)]
Added minimize functionality to selected location container

14 years agoChanged location share representation to be more like the file
Sarven Capadisli [Sun, 3 Jan 2010 00:33:41 +0000 (00:33 +0000)]
Changed location share representation to be more like the file
attachment. Init UI. Probably a little buggy.

14 years agoincorrectly used empty() instead of isset() for a variable that could be 0
Evan Prodromou [Sat, 2 Jan 2010 18:36:47 +0000 (08:36 -1000)]
incorrectly used empty() instead of isset() for a variable that could be 0

14 years agoDon't need margin-bottom for share location option
Sarven Capadisli [Fri, 1 Jan 2010 22:49:42 +0000 (22:49 +0000)]
Don't need margin-bottom for share location option

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Fri, 1 Jan 2010 21:30:44 +0000 (11:30 -1000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline
Evan Prodromou [Fri, 1 Jan 2010 21:27:28 +0000 (11:27 -1000)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline

14 years agoRevert "add cleanup method to cleanup a single row"
Evan Prodromou [Fri, 1 Jan 2010 21:27:13 +0000 (11:27 -1000)]
Revert "add cleanup method to cleanup a single row"

This reverts commit b0527801d9c2b84408bbfdf82bbdc5b778f72cfc.

14 years agoMerge branch 'master' into batchlocation
Evan Prodromou [Fri, 1 Jan 2010 21:26:50 +0000 (11:26 -1000)]
Merge branch 'master' into batchlocation

14 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Fri, 1 Jan 2010 21:20:25 +0000 (11:20 -1000)]
Merge branch 'master' into 0.9.x

Conflicts:
classes/Memcached_DataObject.php

14 years agoIncluded geotag icon file separately
Sarven Capadisli [Fri, 1 Jan 2010 21:12:49 +0000 (21:12 +0000)]
Included geotag icon file separately

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Fri, 1 Jan 2010 21:12:22 +0000 (21:12 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x