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
This commit is contained in:
commit
53f390a074
27
README
27
README
@ -621,14 +621,10 @@ not visible to non-logged-in users. This might be useful for
|
||||
workgroups who want to share a microblogging site for project
|
||||
management, but host it on a public server.
|
||||
|
||||
Note that this is an experimental feature; total privacy is not
|
||||
guaranteed or ensured. Also, privacy is all-or-nothing for a site; you
|
||||
can't have some accounts or notices private, and others public.
|
||||
Finally, the interaction of private sites with OStatus is
|
||||
undefined. Remote users won't be able to subscribe to users on a
|
||||
private site, but users of the private site may be able to subscribe
|
||||
to users on a remote site. (Or not... it's not well tested.) The
|
||||
"proper behaviour" hasn't been defined here, so handle with care.
|
||||
Total privacy is not guaranteed or ensured. Also, privacy is
|
||||
all-or-nothing for a site; you can't have some accounts or notices
|
||||
private, and others public. The interaction of private sites
|
||||
with OStatus is undefined.
|
||||
|
||||
Access to file attachments can also be restricted to logged-in users only.
|
||||
1. Add a directory outside the web root where your file uploads will be
|
||||
@ -693,10 +689,10 @@ instructions; read to the end first before trying them.
|
||||
reversed. YOU CAN EASILY DESTROY YOUR SITE WITH THIS STEP. Don't
|
||||
do it without a known-good backup!
|
||||
|
||||
If your database is at version 0.7.4, you can run a special upgrade
|
||||
script:
|
||||
If your database is at version 0.8.0 or above, you can run a
|
||||
special upgrade script:
|
||||
|
||||
mysql -u<rootuser> -p<rootpassword> <database> db/074to080.sql
|
||||
mysql -u<rootuser> -p<rootpassword> <database> db/08to09.sql
|
||||
|
||||
Otherwise, go to your StatusNet directory and AFTER YOU MAKE A
|
||||
BACKUP run the rebuilddb.sh script like this:
|
||||
@ -761,10 +757,17 @@ Configuration options
|
||||
|
||||
The main configuration file for StatusNet (excepting configurations for
|
||||
dependency software) is config.php in your StatusNet directory. If you
|
||||
edit any other file in the directory, like lib/common.php (where most
|
||||
edit any other file in the directory, like lib/default.php (where most
|
||||
of the defaults are defined), you will lose your configuration options
|
||||
in any upgrade, and you will wish that you had been more careful.
|
||||
|
||||
Starting with version 0.9.0, a Web based configuration panel has been
|
||||
added to StatusNet. The preferred method for changing config options is
|
||||
to use this panel.
|
||||
|
||||
A command-line script, setconfig.php, can be used to set individual
|
||||
configuration options. It's in the scripts/ directory.
|
||||
|
||||
Starting with version 0.7.1, you can put config files in the
|
||||
/etc/statusnet/ directory on your server, if it exists. Config files
|
||||
will be included in this order:
|
||||
|
@ -367,8 +367,8 @@ body[id$=adminpanel] #site_nav_local_views {
|
||||
position:relative;
|
||||
z-index:9;
|
||||
float:right;
|
||||
margin-right:18.65%;
|
||||
width:14.25%;
|
||||
margin-right:10.65%;
|
||||
width:22.25%;
|
||||
}
|
||||
body[id$=adminpanel] #site_nav_local_views li {
|
||||
width:100%;
|
||||
|
Loading…
Reference in New Issue
Block a user