eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Brion Vibber 2010-03-04 11:01:09 -08:00
parent 89833ce1ff 96c06dd75d
commit 16e2399885
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README
View File

@ -78,7 +78,8 @@ New this version
================ ================
This is a major feature release since version 0.8.3, released Feb 1 This is a major feature release since version 0.8.3, released Feb 1
2010. It is the final release version of 0.9.0. 2010. It is the final release version of 0.9.0, replacing any beta
versions.
Notable changes this version: Notable changes this version:
@ -952,7 +953,7 @@ queue_basename: a root name to use for queues (stomp only). Typically
multiple instances on the same server, make sure that multiple instances on the same server, make sure that
either this setting or $config['site']['nickname'] are either this setting or $config['site']['nickname'] are
unique for each site to keep them separate. unique for each site to keep them separate.
stomp_username: username for connecting to the stomp server; defaults stomp_username: username for connecting to the stomp server; defaults
to null. to null.
stomp_password: password for connecting to the stomp server; defaults stomp_password: password for connecting to the stomp server; defaults
@ -1229,10 +1230,6 @@ profile
Profile management. Profile management.
banned: an array of usernames and/or profile IDs of 'banned' profiles.
The site will reject any notices by these users -- they will
not be accepted at all. (Compare with blacklisted users above,
whose posts just won't show up in the public stream.)
biolimit: max character length of bio; 0 means no limit; null means to use biolimit: max character length of bio; 0 means no limit; null means to use
the site text limit default. the site text limit default.

2
plugins/OStatus/theme/base/css/ostatus.css
View File

@ -46,6 +46,7 @@ position:relative;
.section .entity_actions { .section .entity_actions {
margin-bottom:0; margin-bottom:0;
margin-right:7px;
} }
#entity_remote_subscribe .dialogbox { #entity_remote_subscribe .dialogbox {
@ -70,5 +71,4 @@ background-color:transparent;
background-position:0 -1183px; background-position:0 -1183px;
padding:0 0 0 23px; padding:0 0 0 23px;
border:0; border:0;
} }