Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline: default to private sites
This commit is contained in:
commit
10c1ea67f9
@ -53,7 +53,7 @@ $default =
|
||||
'broughtbyurl' => null,
|
||||
'closed' => false,
|
||||
'inviteonly' => false,
|
||||
'private' => false,
|
||||
'private' => true,
|
||||
'ssl' => 'never',
|
||||
'sslserver' => null,
|
||||
'shorturllength' => 30,
|
||||
@ -301,12 +301,14 @@ $default =
|
||||
array('disabled' => true),
|
||||
'plugins' =>
|
||||
array('default' => array('Geonames' => null,
|
||||
'Mapstraction' => null,
|
||||
'OStatus' => null,
|
||||
'WikiHashtags' => null,
|
||||
'RSSCloud' => null,
|
||||
'ClientSideShorten' => null,
|
||||
'StrictTransportSecurity' => null,
|
||||
'Bookmark' => null,
|
||||
'Event' => null,
|
||||
'Poll' => null,
|
||||
'QnA' => null,
|
||||
'SearchSub' => null,
|
||||
'TagSub' => null,
|
||||
'OpenID' => null),
|
||||
'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
|
||||
'server' => null,
|
||||
|
Loading…
Reference in New Issue
Block a user