]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoFix error logging
Craig Andrews [Wed, 10 Mar 2010 02:26:12 +0000 (21:26 -0500)]
Fix error logging

14 years agoMerge branch 'testing' into 0.9.x
Brion Vibber [Tue, 9 Mar 2010 22:20:50 +0000 (14:20 -0800)]
Merge branch 'testing' into 0.9.x

14 years agoCheck for invalid and reserved usernames for the admin user at install time.
Brion Vibber [Tue, 9 Mar 2010 22:15:55 +0000 (14:15 -0800)]
Check for invalid and reserved usernames for the admin user at install time.

14 years agoAdded a checkbox for subscribing the admin of a StatusNet instance to
Sarven Capadisli [Tue, 9 Mar 2010 16:08:21 +0000 (11:08 -0500)]
Added a checkbox for subscribing the admin of a StatusNet instance to
update@status.net. Checked by default. Subscription optional.

14 years agoAdded scripts/command.php, can be used to run commands such as subscription on behalf...
Brion Vibber [Tue, 9 Mar 2010 21:41:05 +0000 (13:41 -0800)]
Added scripts/command.php, can be used to run commands such as subscription on behalf of users.
This includes whatever support for extended command parsing plugins may have added.

Example:
  ./scripts/command.php -nbrionv sub update@status.net

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Tue, 9 Mar 2010 21:07:52 +0000 (13:07 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'commands' into testing
Brion Vibber [Tue, 9 Mar 2010 21:05:51 +0000 (13:05 -0800)]
Merge branch 'commands' into testing

14 years agoCommand input processing now has centralized places for looking up notice, user/profi...
Brion Vibber [Mon, 8 Mar 2010 22:01:43 +0000 (14:01 -0800)]
Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
OStatus plugin overrides these to allow using webfinger (user@example.com), profile URL (http://example.com/user) and bare profile URL (example.com/user) as arguments.

14 years agoMerge branch 'testing' into 0.9.x
Brion Vibber [Tue, 9 Mar 2010 19:27:53 +0000 (11:27 -0800)]
Merge branch 'testing' into 0.9.x

14 years agoMerge commit 'origin/master' into testing
Brion Vibber [Tue, 9 Mar 2010 19:27:30 +0000 (11:27 -0800)]
Merge commit 'origin/master' into testing

14 years agoOStatus: fix exception thrown on HTTP error during feed discovery
Brion Vibber [Tue, 9 Mar 2010 18:56:33 +0000 (10:56 -0800)]
OStatus: fix exception thrown on HTTP error during feed discovery

14 years agoAdded a checkbox for subscribing the admin of a StatusNet instance to
Sarven Capadisli [Tue, 9 Mar 2010 16:08:21 +0000 (11:08 -0500)]
Added a checkbox for subscribing the admin of a StatusNet instance to
update@status.net. Checked by default. Subscription optional.

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline
Evan Prodromou [Tue, 9 Mar 2010 15:57:38 +0000 (10:57 -0500)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline

14 years agoa script to flush site
Evan Prodromou [Tue, 9 Mar 2010 15:55:48 +0000 (10:55 -0500)]
a script to flush site

14 years agoUse canonical URL for notification in RSSCloud plugin
Zach Copley [Tue, 9 Mar 2010 11:06:08 +0000 (11:06 +0000)]
Use canonical URL for notification in RSSCloud plugin

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline
Zach Copley [Tue, 9 Mar 2010 11:07:42 +0000 (11:07 +0000)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline

14 years agoUse canonical URL for notification in RSSCloud plugin
Zach Copley [Tue, 9 Mar 2010 11:06:08 +0000 (11:06 +0000)]
Use canonical URL for notification in RSSCloud plugin

14 years agoUse canonical URL for notification in RSSCloud plugin
Zach Copley [Tue, 9 Mar 2010 11:06:08 +0000 (11:06 +0000)]
Use canonical URL for notification in RSSCloud plugin

14 years agowrong param order to strpos()
James Walker [Tue, 9 Mar 2010 06:24:21 +0000 (01:24 -0500)]
wrong param order to strpos()

14 years agoOn the OpenID settings page, allow users to remove trustroots.
Craig Andrews [Tue, 9 Mar 2010 02:43:09 +0000 (21:43 -0500)]
On the OpenID settings page, allow users to remove trustroots.

14 years agomake common_copy_args() work when the post/get request includes arrays (form elements...
Craig Andrews [Tue, 9 Mar 2010 02:42:17 +0000 (21:42 -0500)]
make common_copy_args() work when the post/get request includes arrays (form elements with names ending in [] having multiple values)

14 years agoOnly allow RSSCloud subs to canonical RSS2 profile feeds
Zach Copley [Mon, 8 Mar 2010 22:53:43 +0000 (22:53 +0000)]
Only allow RSSCloud subs to canonical RSS2 profile feeds

14 years agoOnly allow RSSCloud subs to canonical RSS2 profile feeds
Zach Copley [Mon, 8 Mar 2010 22:53:43 +0000 (22:53 +0000)]
Only allow RSSCloud subs to canonical RSS2 profile feeds

14 years agoan otp is a real login
Evan Prodromou [Mon, 8 Mar 2010 23:06:21 +0000 (18:06 -0500)]
an otp is a real login

14 years agoOnly allow RSSCloud subs to canonical RSS2 profile feeds
Zach Copley [Mon, 8 Mar 2010 22:53:43 +0000 (22:53 +0000)]
Only allow RSSCloud subs to canonical RSS2 profile feeds

14 years agoAdded Memcached plugin (using pecl/memcached versus pecl/memcache)
Craig Andrews [Thu, 4 Mar 2010 23:24:32 +0000 (18:24 -0500)]
Added Memcached plugin (using pecl/memcached versus pecl/memcache)

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Mon, 8 Mar 2010 21:48:27 +0000 (22:48 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Mon, 8 Mar 2010 21:39:46 +0000 (13:39 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoCentOS 5.4 still has bad PCRE in stock (though all bets off for PHP packages, since...
Brion Vibber [Mon, 8 Mar 2010 21:38:59 +0000 (13:38 -0800)]
CentOS 5.4 still has bad PCRE in stock (though all bets off for PHP packages, since you'd need a version update anyway...)

14 years agoRevert "CentOS 5.4 still bogus on a stock install." - bad debug lines crept in
Brion Vibber [Mon, 8 Mar 2010 21:38:26 +0000 (13:38 -0800)]
Revert "CentOS 5.4 still bogus on a stock install." - bad debug lines crept in

This reverts commit 7e7d88831cf8b3e8876499b86890da2e63b08c97.

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Mon, 8 Mar 2010 21:37:45 +0000 (13:37 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoCentOS 5.4 still bogus on a stock install.
Brion Vibber [Mon, 8 Mar 2010 21:32:18 +0000 (13:32 -0800)]
CentOS 5.4 still bogus on a stock install.

14 years agoFix ticket #2208: regression in XMPP sending when server != host
Brion Vibber [Mon, 8 Mar 2010 20:19:06 +0000 (12:19 -0800)]
Fix ticket #2208: regression in XMPP sending when server != host

The upstream class sets $this->basejid with host unconditionally, which wasn't previously an issue as the fulljid would always be filled in by the server at connect time before sending messages. With the new queued messaging, we need to make sure we've filled out $this->fulljid correctly without making a connection.
Now using $server if provided to build $this->basejid and $this->fulljid in the queued XMPP proxy class, so queued messages are sent correctly.

14 years agoXMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access...
Brion Vibber [Mon, 8 Mar 2010 18:32:40 +0000 (10:32 -0800)]
XMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access to undefined member variable

14 years agoFixed warning messages when auto-registering a new LDAP user.
Jeffery To [Mon, 8 Mar 2010 07:31:16 +0000 (15:31 +0800)]
Fixed warning messages when auto-registering a new LDAP user.

On my test system (without memcache), while testing the LDAP
authentication plugin, when I sign in for the first time, triggering
auto-registration, I get these messages in the output page:

Warning: ksort() expects parameter 1 to be array, null given in /home/jeff/Documents/code/statusnet/classes/Memcached_DataObject.php  on line 219

Warning: Invalid argument supplied for foreach() in /home/jeff/Documents/code/statusnet/classes/Memcached_DataObject.php on line 224

Warning: assert() [function.assert]: Assertion failed in /home/jeff/Documents/code/statusnet/classes/Memcached_DataObject.php on line 241

(plus two "Cannot modify header information..." messages as a result of
the above warnings)

This change appears to fix this (although I can't really explain exactly
why).

14 years agoldap_get_connection() to return null when passed a config with bad user/pw.
Jeffery To [Fri, 5 Mar 2010 09:54:53 +0000 (17:54 +0800)]
ldap_get_connection() to return null when passed a config with bad user/pw.

This mainly affects login; before if the user enters a valid username
but invalid password, ldap_get_connection() throws an
LDAP_INVALID_CREDENTIALS error. Now the user sees the regular
"Incorrect username of password" error message.

14 years agomake API realm configurable
Evan Prodromou [Mon, 8 Mar 2010 17:36:03 +0000 (12:36 -0500)]
make API realm configurable

14 years agoAlignment fix for IE6
Sarven Capadisli [Mon, 8 Mar 2010 16:08:03 +0000 (16:08 +0000)]
Alignment fix for IE6

14 years agoMerge branch 'master' of git@gitorious.org:statusnet/mainline
Evan Prodromou [Mon, 8 Mar 2010 04:42:46 +0000 (23:42 -0500)]
Merge branch 'master' of git@gitorious.org:statusnet/mainline

14 years agoadd a script to import Twitter atom feed as notices
Evan Prodromou [Mon, 8 Mar 2010 04:41:55 +0000 (23:41 -0500)]
add a script to import Twitter atom feed as notices

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Sat, 6 Mar 2010 23:54:04 +0000 (00:54 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
14 years agoRemove unused variables, update Twitter ones
Zach Copley [Sat, 6 Mar 2010 01:05:00 +0000 (17:05 -0800)]
Remove unused variables, update Twitter ones

14 years agoRemove unused variables, update Twitter ones
Zach Copley [Sat, 6 Mar 2010 01:05:00 +0000 (17:05 -0800)]
Remove unused variables, update Twitter ones

14 years agoNo need to pass in $this->limit and $this-tag
Zach Copley [Sat, 6 Mar 2010 00:52:15 +0000 (16:52 -0800)]
No need to pass in $this->limit and $this-tag

14 years agoNo need to pass in $this->limit and $this-tag
Zach Copley [Sat, 6 Mar 2010 00:52:15 +0000 (16:52 -0800)]
No need to pass in $this->limit and $this-tag

14 years agoNo need to pass in $this->limit and $this-tag
Zach Copley [Sat, 6 Mar 2010 00:52:15 +0000 (16:52 -0800)]
No need to pass in $this->limit and $this-tag

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Sat, 6 Mar 2010 00:43:21 +0000 (16:43 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Fixed problem causing 500 error on notices containing a non-existent group

14 years agoFix undefined variable error and some other cleanup
Zach Copley [Sat, 6 Mar 2010 00:40:35 +0000 (16:40 -0800)]
Fix undefined variable error and some other cleanup

14 years agoUserRSS Didn't Use the Tag Propery.
Christopher Vollick [Thu, 11 Feb 2010 16:19:50 +0000 (11:19 -0500)]
UserRSS Didn't Use the Tag Propery.

This meant that server.com/user/tag/TAG/rss just returned all user data.
That was incorrect.

14 years agoFix undefined variable error and some other cleanup
Zach Copley [Sat, 6 Mar 2010 00:40:35 +0000 (16:40 -0800)]
Fix undefined variable error and some other cleanup

14 years agoFixed problem causing 500 error on notices containing a non-existent group
Ciaran Gultnieks [Sat, 6 Mar 2010 00:30:15 +0000 (00:30 +0000)]
Fixed problem causing 500 error on notices containing a non-existent group

14 years agoUserRSS Didn't Use the Tag Propery.
Christopher Vollick [Thu, 11 Feb 2010 16:19:50 +0000 (11:19 -0500)]
UserRSS Didn't Use the Tag Propery.

This meant that server.com/user/tag/TAG/rss just returned all user data.
That was incorrect.

14 years agoFix for blank RSS1 tag feeds
Zach Copley [Sat, 6 Mar 2010 00:20:33 +0000 (16:20 -0800)]
Fix for blank RSS1 tag feeds

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Sat, 6 Mar 2010 00:21:55 +0000 (16:21 -0800)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

* '0.9.x' of gitorious.org:statusnet/mainline:
  Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoFix for blank RSS1 tag feeds
Zach Copley [Sat, 6 Mar 2010 00:20:33 +0000 (16:20 -0800)]
Fix for blank RSS1 tag feeds

14 years agoOpenID fix:
Brion Vibber [Fri, 5 Mar 2010 23:00:27 +0000 (15:00 -0800)]
OpenID fix:
- avoid notice on insert (missing sequenceKeys())
- avoid cache corruption on delete (user_id was missing from keys list, cache not cleared for user_id lookups)

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Fri, 5 Mar 2010 22:41:51 +0000 (23:41 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
14 years agoInitial install-time test for PCRE compiled without Unicode properties, which causes...
Brion Vibber [Fri, 5 Mar 2010 19:27:48 +0000 (11:27 -0800)]
Initial install-time test for PCRE compiled without Unicode properties, which causes corruption in feeds and other linking problems.
Error message links to help info at http://status.net/wiki/Red_Hat_Enterprise_Linux#PCRE_library

14 years agoticket #697: merge two dupe config bits in config.php.sample
Brion Vibber [Fri, 5 Mar 2010 20:21:30 +0000 (12:21 -0800)]
ticket #697: merge two dupe config bits in config.php.sample

14 years agoOStatus fix: send the feed's root element, not the DOM document, down to low-level...
Brion Vibber [Fri, 5 Mar 2010 18:55:07 +0000 (10:55 -0800)]
OStatus fix: send the feed's root element, not the DOM document, down to low-level feed processing as entry context on PuSH input.

14 years agoAnother typo
root [Wed, 3 Mar 2010 06:09:52 +0000 (22:09 -0800)]
Another typo

14 years agoFix a few typos
Rasmus Lerdorf [Wed, 3 Mar 2010 00:07:35 +0000 (16:07 -0800)]
Fix a few typos

14 years agoimplement mail headers
Dave Hall [Thu, 4 Mar 2010 06:07:40 +0000 (17:07 +1100)]
implement mail headers

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Fri, 5 Mar 2010 03:56:04 +0000 (03:56 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoA better way to safely delete Foreign_links
Zach Copley [Fri, 5 Mar 2010 03:14:40 +0000 (03:14 +0000)]
A better way to safely delete Foreign_links

14 years agoFix for errant deletion of all Twitter foreign_links
Zach Copley [Fri, 5 Mar 2010 02:27:01 +0000 (02:27 +0000)]
Fix for errant deletion of all Twitter foreign_links

14 years agoA better way to safely delete Foreign_links
Zach Copley [Fri, 5 Mar 2010 03:14:40 +0000 (03:14 +0000)]
A better way to safely delete Foreign_links

14 years agoFix for errant deletion of all Twitter foreign_links
Zach Copley [Fri, 5 Mar 2010 02:27:01 +0000 (02:27 +0000)]
Fix for errant deletion of all Twitter foreign_links

14 years agofix ver ref in upgrade instructions
Brion Vibber [Thu, 4 Mar 2010 22:45:55 +0000 (14:45 -0800)]
fix ver ref in upgrade instructions

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Brion Vibber [Thu, 4 Mar 2010 22:44:38 +0000 (14:44 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Thu, 4 Mar 2010 19:19:02 +0000 (11:19 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  Updated note on geo location and added a note on user roles
  Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.)

14 years agoMake indenting consistent in README
Zach Copley [Thu, 4 Mar 2010 19:18:30 +0000 (11:18 -0800)]
Make indenting consistent in README

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Thu, 4 Mar 2010 19:16:30 +0000 (20:16 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

Added Breton.

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
14 years agoUpdated note on geo location and added a note on user roles
Sarven Capadisli [Thu, 4 Mar 2010 19:11:18 +0000 (14:11 -0500)]
Updated note on geo location and added a note on user roles

14 years agoAdd Breton to language.php
Siebrand Mazeland [Thu, 4 Mar 2010 19:04:44 +0000 (20:04 +0100)]
Add Breton to language.php

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Brion Vibber [Thu, 4 Mar 2010 19:01:09 +0000 (11:01 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Thu, 4 Mar 2010 19:00:40 +0000 (20:00 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
14 years agoSet up subscription to update@status.net for admin user on new installation, if OStat...
Brion Vibber [Thu, 4 Mar 2010 19:00:02 +0000 (11:00 -0800)]
Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.)

14 years agoNormalize whitespace in the README -- all tabs to (4) spaces
Zach Copley [Thu, 4 Mar 2010 18:57:35 +0000 (10:57 -0800)]
Normalize whitespace in the README -- all tabs to (4) spaces

14 years agonote betas are obsolete now
Evan Prodromou [Thu, 4 Mar 2010 18:56:02 +0000 (13:56 -0500)]
note betas are obsolete now

14 years agoMerge commit 'gitorious/testing' into testing
Evan Prodromou [Thu, 4 Mar 2010 18:53:13 +0000 (13:53 -0500)]
Merge commit 'gitorious/testing' into testing

14 years agoRemove reference to $config['profile']['banned'] -- superceded by blacklist
Zach Copley [Thu, 4 Mar 2010 18:48:37 +0000 (10:48 -0800)]
Remove reference to $config['profile']['banned'] -- superceded by blacklist

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Thu, 4 Mar 2010 18:46:05 +0000 (13:46 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agobanned no longer supported
Evan Prodromou [Thu, 4 Mar 2010 18:45:31 +0000 (13:45 -0500)]
banned no longer supported

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Sarven Capadisli [Thu, 4 Mar 2010 18:43:49 +0000 (13:43 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoSlight right alignment for remote button in minilists
Sarven Capadisli [Thu, 4 Mar 2010 18:43:28 +0000 (13:43 -0500)]
Slight right alignment for remote button in minilists

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Brion Vibber [Thu, 4 Mar 2010 18:41:25 +0000 (10:41 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoupdates to queue info in readme
Brion Vibber [Thu, 4 Mar 2010 18:41:07 +0000 (10:41 -0800)]
updates to queue info in readme

14 years agoMerge branch 'testing' of gitorious.org:statusnet/mainline into testing
Zach Copley [Thu, 4 Mar 2010 18:34:46 +0000 (10:34 -0800)]
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline:
  some more editorial on README
  Increased admin navigation width to handle longer text length

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Thu, 4 Mar 2010 18:34:13 +0000 (13:34 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoFix link to StatusNet bug tracker in README
Zach Copley [Thu, 4 Mar 2010 18:34:12 +0000 (10:34 -0800)]
Fix link to StatusNet bug tracker in README

14 years agosome more editorial on README
Evan Prodromou [Thu, 4 Mar 2010 18:34:05 +0000 (13:34 -0500)]
some more editorial on README

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Sarven Capadisli [Thu, 4 Mar 2010 18:32:25 +0000 (13:32 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoIncreased admin navigation width to handle longer text length
Sarven Capadisli [Thu, 4 Mar 2010 18:31:49 +0000 (13:31 -0500)]
Increased admin navigation width to handle longer text length

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Thu, 4 Mar 2010 18:29:41 +0000 (13:29 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Evan Prodromou [Thu, 4 Mar 2010 18:29:25 +0000 (13:29 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoadd blacklist and throttle plugin notes
Evan Prodromou [Thu, 4 Mar 2010 18:29:09 +0000 (13:29 -0500)]
add blacklist and throttle plugin notes

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Sarven Capadisli [Thu, 4 Mar 2010 18:28:53 +0000 (13:28 -0500)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

14 years agoAnother update to admin navigation alignment
Sarven Capadisli [Thu, 4 Mar 2010 18:28:26 +0000 (13:28 -0500)]
Another update to admin navigation alignment

14 years agoMerge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Brion Vibber [Thu, 4 Mar 2010 18:24:42 +0000 (10:24 -0800)]
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing